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 /networking/telnetd.c | |
| 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 'networking/telnetd.c')
| -rw-r--r-- | networking/telnetd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/telnetd.c b/networking/telnetd.c index 13c36aa46..2fbdc3bb3 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
| @@ -496,12 +496,12 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv) | |||
| 496 | INIT_G(); | 496 | INIT_G(); |
| 497 | 497 | ||
| 498 | /* -w NUM, and implies -F. -w and -i don't mix */ | 498 | /* -w NUM, and implies -F. -w and -i don't mix */ |
| 499 | IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:w+:i--w:w--i";) | 499 | IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:i--w:w--i";) |
| 500 | /* Even if !STANDALONE, we accept (and ignore) -i, thus people | 500 | /* Even if !STANDALONE, we accept (and ignore) -i, thus people |
| 501 | * don't need to guess whether it's ok to pass -i to us */ | 501 | * don't need to guess whether it's ok to pass -i to us */ |
| 502 | opt = getopt32(argv, "f:l:Ki" | 502 | opt = getopt32(argv, "f:l:Ki" |
| 503 | IF_FEATURE_TELNETD_STANDALONE("p:b:F") | 503 | IF_FEATURE_TELNETD_STANDALONE("p:b:F") |
| 504 | IF_FEATURE_TELNETD_INETD_WAIT("Sw:"), | 504 | IF_FEATURE_TELNETD_INETD_WAIT("Sw:+"), |
| 505 | &G.issuefile, &G.loginpath | 505 | &G.issuefile, &G.loginpath |
| 506 | IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr) | 506 | IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr) |
| 507 | IF_FEATURE_TELNETD_INETD_WAIT(, &sec_linger) | 507 | IF_FEATURE_TELNETD_INETD_WAIT(, &sec_linger) |