diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-06 21:58:02 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-07-06 21:58:02 +0200 |
| commit | 237bedd499c58034a1355484d6d4d906f0180308 (patch) | |
| tree | 42a789f8867ba3bc6ef0cea30fb18f5553d447a0 /loginutils | |
| parent | 0844b5afe2cd60d46b7f2ad0fac8c2818d0780b3 (diff) | |
| download | busybox-w32-237bedd499c58034a1355484d6d4d906f0180308.tar.gz busybox-w32-237bedd499c58034a1355484d6d4d906f0180308.tar.bz2 busybox-w32-237bedd499c58034a1355484d6d4d906f0180308.zip | |
getopt32: add new syntax of 'o:+' and 'o:*' for -o NUM and -o LIST
In many cases, this aqllows to drop use of opt_complementary.
Approximately -400 bytes:
function old new delta
getopt32 1423 1502 +79
opt_string 17 18 +1
OPT_STR 24 25 +1
uniq_main 416 406 -10
timeout_main 279 269 -10
sulogin_main 270 260 -10
readprofile_main 1825 1815 -10
ps_main 543 533 -10
pidof_main 245 235 -10
pgrep_main 611 601 -10
od_main 2600 2590 -10
mkfs_minix_main 2684 2674 -10
mkfs_ext2_main 2603 2593 -10
microcom_main 712 702 -10
makemime_main 315 305 -10
ionice_main 282 272 -10
inetd_main 2074 2064 -10
ifplugd_main 1144 1134 -10
halt_main 353 343 -10
getopt_main 636 626 -10
fdisk_main 2854 2844 -10
env_main 206 196 -10
dmesg_main 319 309 -10
conspy_main 1214 1204 -10
awk_main 981 971 -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220) Total: -139 bytes
text data bss dec hex filename
919373 906 14060 934339 e41c3 busybox_old
918969 906 14060 933935 e402f busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/cryptpw.c | 4 | ||||
| -rw-r--r-- | loginutils/getty.c | 4 | ||||
| -rw-r--r-- | loginutils/sulogin.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 23a1884f4..9f5f40686 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c | |||
| @@ -111,8 +111,8 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv) | |||
| 111 | opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; | 111 | opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; |
| 112 | opt_S = NULL; | 112 | opt_S = NULL; |
| 113 | /* at most two non-option arguments; -P NUM */ | 113 | /* at most two non-option arguments; -P NUM */ |
| 114 | opt_complementary = "?2:P+"; | 114 | opt_complementary = "?2"; |
| 115 | getopt32(argv, "sP:S:m:a:", &fd, &opt_S, &opt_m, &opt_m); | 115 | getopt32(argv, "sP:+S:m:a:", &fd, &opt_S, &opt_m, &opt_m); |
| 116 | argv += optind; | 116 | argv += optind; |
| 117 | 117 | ||
| 118 | /* have no idea how to handle -s... */ | 118 | /* have no idea how to handle -s... */ |
diff --git a/loginutils/getty.c b/loginutils/getty.c index b10bdbdbf..162c1697e 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c | |||
| @@ -131,7 +131,7 @@ struct globals { | |||
| 131 | //usage: "\n" | 131 | //usage: "\n" |
| 132 | //usage: "\nBAUD_RATE of 0 leaves it unchanged" | 132 | //usage: "\nBAUD_RATE of 0 leaves it unchanged" |
| 133 | 133 | ||
| 134 | static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:wn"; | 134 | static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:+wn"; |
| 135 | #define F_INITSTRING (1 << 0) /* -I */ | 135 | #define F_INITSTRING (1 << 0) /* -I */ |
| 136 | #define F_LOCAL (1 << 1) /* -L */ | 136 | #define F_LOCAL (1 << 1) /* -L */ |
| 137 | #define F_FAKEHOST (1 << 2) /* -H */ | 137 | #define F_FAKEHOST (1 << 2) /* -H */ |
| @@ -179,7 +179,7 @@ static void parse_args(char **argv) | |||
| 179 | char *ts; | 179 | char *ts; |
| 180 | int flags; | 180 | int flags; |
| 181 | 181 | ||
| 182 | opt_complementary = "-2:t+"; /* at least 2 args; -t N */ | 182 | opt_complementary = "-2"; /* at least 2 args; -t N */ |
| 183 | flags = getopt32(argv, opt_string, | 183 | flags = getopt32(argv, opt_string, |
| 184 | &G.initstring, &G.fakehost, &G.issue, | 184 | &G.initstring, &G.fakehost, &G.issue, |
| 185 | &G.login, &G.timeout | 185 | &G.login, &G.timeout |
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index f32469551..6befea933 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c | |||
| @@ -43,8 +43,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv) | |||
| 43 | logmode = LOGMODE_BOTH; | 43 | logmode = LOGMODE_BOTH; |
| 44 | openlog(applet_name, 0, LOG_AUTH); | 44 | openlog(applet_name, 0, LOG_AUTH); |
| 45 | 45 | ||
| 46 | opt_complementary = "t+"; /* -t N */ | 46 | getopt32(argv, "t:+", &timeout); |
| 47 | getopt32(argv, "t:", &timeout); | ||
| 48 | argv += optind; | 47 | argv += optind; |
| 49 | 48 | ||
| 50 | if (argv[0]) { | 49 | if (argv[0]) { |