diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-26 02:23:58 +0300 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-26 02:23:58 +0300 |
| commit | 6f1713f216fef686a68db5ee02232bc67e525c7d (patch) | |
| tree | 256adc75a88723a4b247c32e692d721d65243a82 /libbb | |
| parent | 394eebed6656dfc2e56a79500b602023000ac415 (diff) | |
*: intrduce and use safe_gethostname. By Tito <farmatito AT tiscali.it>
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
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/Kbuild | 1 | ||||
| -rw-r--r-- | libbb/lineedit.c | 6 | ||||
| -rw-r--r-- | libbb/login.c | 14 | ||||
| -rw-r--r-- | libbb/obscure.c | 13 |
4 files changed, 13 insertions, 21 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild index 515368de7..aab016e85 100644 --- a/libbb/Kbuild +++ b/libbb/Kbuild @@ -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 diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 9aab63702..c6aa45c93 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -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 '$': diff --git a/libbb/login.c b/libbb/login.c index d1f5d6498..a711a5437 100644 --- a/libbb/login.c +++ b/libbb/login.c @@ -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 */ diff --git a/libbb/obscure.c b/libbb/obscure.c index 5cc906235..1841b27d6 100644 --- a/libbb/obscure.c +++ b/libbb/obscure.c @@ -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++) { |