emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: intrduce and use safe_gethostname. By Tito <farmatito AT tiscali.it>

Browse Source 
safe_gethostname                                       -      48     +48
glob3                                                 35      37      +2
timestamp_and_log                                    314     315      +1
udhcp_send_kernel_packet                             234     231      -3
scan_tree                                            275     271      -4
passwd_main                                         1074    1070      -4
print_login_prompt                                    68      58     -10
obscure                                              392     377     -15
syslogd_main                                         882     866     -16
print_login_issue                                    516     478     -38
hostname_main                                        278     223     -55
parse_and_put_prompt                                 825     756     -69
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 2/9 up/down: 51/-214)          Total: -163 bytes
   text    data     bss     dec     hex filename
 798791     728    7484  807003   c505b busybox_old
 798631     728    7484  806843   c4fbb busybox_unstripped
This commit is contained in:
Denis Vlasenko
2008-02-25 23:23:58 +00:00
parent 394eebed66
commit 6f1713f216
8 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libbb/Kbuild
View File

@@ -73,6 +73,7 @@ lib-y += recursive_action.o
lib-y += remove_file.o
lib-y += restricted_shell.o
lib-y += run_shell.o
lib-y += safe_gethostname.o
lib-y += safe_poll.o
lib-y += safe_strncpy.o
lib-y += safe_write.o

6
libbb/lineedit.c
View File

@@ -1203,11 +1203,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
break;
#endif
case 'h':
pbuf = free_me = xzalloc(256);
if (gethostname(pbuf, 255) < 0) {
pbuf[0] = '?';
pbuf[1] = '\0';
}
pbuf = free_me = safe_gethostname();
*strchrnul(pbuf, '.') = '\0';
break;
case '$':

14
libbb/login.c
View File

@@ -50,6 +50,7 @@ void print_login_issue(const char *issue_file, const char *tty)
outbuf = uts.sysname;
break;
case 'n':
case 'h':
outbuf = uts.nodename;
break;
case 'r':
@@ -72,10 +73,6 @@ void print_login_issue(const char *issue_file, const char *tty)
case 't':
strftime(buf, sizeof(buf), fmtstr_t, localtime(&t));
break;
case 'h':
gethostname(buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
break;
case 'l':
outbuf = tty;
break;
@@ -91,13 +88,12 @@ void print_login_issue(const char *issue_file, const char *tty)
void print_login_prompt(void)
{
char buf[MAXHOSTNAMELEN+1];
if (gethostname(buf, MAXHOSTNAMELEN) == 0)
fputs(buf, stdout);
char *hostname = safe_gethostname();
fputs(hostname, stdout);
fputs(LOGIN, stdout);
fflush(stdout);
free(hostname);
}
/* Clear dangerous stuff, set PATH */

13
libbb/obscure.c
View File

@@ -93,7 +93,7 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
/* Add 2 for each type of characters to the minlen of password */
int size = CONFIG_PASSWORD_MINLEN + 8;
const char *p;
char hostname[255];
char *hostname;
/* size */
if (!new_p || (length = strlen(new_p)) < CONFIG_PASSWORD_MINLEN)
@@ -108,12 +108,11 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
return "similar to gecos";
}
/* hostname as-is, as sub-string, reversed, capitalized, doubled */
if (gethostname(hostname, 255) == 0) {
hostname[254] = '\0';
if (string_checker(new_p, hostname)) {
return "similar to hostname";
}
}
hostname = safe_gethostname();
i = string_checker(new_p, hostname);
free(hostname);
if (i)
return "similar to hostname";
/* Should / Must contain a mix of: */
for (i = 0; i < length; i++) {