diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:09:09 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:09:09 +0000 |
commit | 1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2 (patch) | |
tree | 7ec8969fc2b07a2b7dc37f96435e5eddf7daf7fd /loginutils/sulogin.c | |
parent | 62a90cdd7435f09f4bb8673e8b7b213067f9d5cc (diff) | |
download | busybox-w32-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.tar.gz busybox-w32-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.tar.bz2 busybox-w32-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.zip |
*: shrink: use Vladimir's "o+" specifier instead of xatou(opt_param)
function old new delta
getopt32 1370 1385 +15
sulogin_main 490 494 +4
realpath_main 84 86 +2
sleep_main 76 77 +1
mt_main 256 257 +1
printenv_main 75 74 -1
fdformat_main 546 545 -1
usleep_main 44 42 -2
setlogcons_main 77 75 -2
ed_main 2654 2649 -5
deallocvt_main 69 64 -5
addgroup_main 373 368 -5
mkfs_minix_main 2989 2982 -7
tail_main 1221 1213 -8
sv_main 1254 1241 -13
du_main 348 328 -20
tftp_main 325 302 -23
split_main 581 558 -23
nc_main 1000 977 -23
diff_main 891 868 -23
arping_main 1797 1770 -27
ls_main 893 847 -46
od_main 2797 2750 -47
readprofile_main 1944 1895 -49
tcpudpsvd_main 1973 1922 -51
udhcpc_main 2590 2513 -77
grep_main 824 722 -102
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/22 up/down: 23/-560) Total: -537 bytes
text data bss dec hex filename
796973 658 7428 805059 c48c3 busybox_old
796479 662 7420 804561 c46d1 busybox_unstripped
Diffstat (limited to 'loginutils/sulogin.c')
-rw-r--r-- | loginutils/sulogin.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index caa1a8335..17bb15efa 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c | |||
@@ -19,7 +19,6 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
19 | { | 19 | { |
20 | char *cp; | 20 | char *cp; |
21 | int timeout = 0; | 21 | int timeout = 0; |
22 | char *timeout_arg; | ||
23 | struct passwd *pwd; | 22 | struct passwd *pwd; |
24 | const char *shell; | 23 | const char *shell; |
25 | #if ENABLE_FEATURE_SHADOWPASSWDS | 24 | #if ENABLE_FEATURE_SHADOWPASSWDS |
@@ -31,9 +30,8 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
31 | logmode = LOGMODE_BOTH; | 30 | logmode = LOGMODE_BOTH; |
32 | openlog(applet_name, 0, LOG_AUTH); | 31 | openlog(applet_name, 0, LOG_AUTH); |
33 | 32 | ||
34 | if (getopt32(argv, "t:", &timeout_arg)) { | 33 | opt_complementary = "t+"; /* -t N */ |
35 | timeout = xatoi_u(timeout_arg); | 34 | getopt32(argv, "t:", &timeout); |
36 | } | ||
37 | 35 | ||
38 | if (argv[optind]) { | 36 | if (argv[optind]) { |
39 | close(0); | 37 | close(0); |
@@ -43,6 +41,7 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
43 | dup(0); | 41 | dup(0); |
44 | } | 42 | } |
45 | 43 | ||
44 | /* Malicious use like "sulogin /dev/sda"? */ | ||
46 | if (!isatty(0) || !isatty(1) || !isatty(2)) { | 45 | if (!isatty(0) || !isatty(1) || !isatty(2)) { |
47 | logmode = LOGMODE_SYSLOG; | 46 | logmode = LOGMODE_SYSLOG; |
48 | bb_error_msg_and_die("not a tty"); | 47 | bb_error_msg_and_die("not a tty"); |