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 /runit | |
| parent | 0844b5afe2cd60d46b7f2ad0fac8c2818d0780b3 (diff) | |
| download | busybox-237bedd499c58034a1355484d6d4d906f0180308.tar.gz | |
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 'runit')
| -rw-r--r-- | runit/chpst.c | 4 | ||||
| -rw-r--r-- | runit/sv.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runit/chpst.c b/runit/chpst.c index 7fe5151db..3769af25e 100644 --- a/runit/chpst.c +++ b/runit/chpst.c @@ -300,8 +300,8 @@ int chpst_main(int argc UNUSED_PARAM, char **argv) // FIXME: can we live with int-sized limits? // can we live with 40000 days? // if yes -> getopt converts strings to numbers for us - opt_complementary = "-1:a+:c+:d+:f+:l+:m+:o+:p+:r+:s+:t+"; - opt = getopt32(argv, "+a:c:d:f:l:m:o:p:r:s:t:u:U:e:" + opt_complementary = "-1"; + opt = getopt32(argv, "+a:+c:+d:+f:+l:+m:+o:+p:+r:+s:+t:+u:U:e:" IF_CHPST("/:n:vP012"), &limita, &limitc, &limitd, &limitf, &limitl, &limitm, &limito, &limitp, &limitr, &limits, &limitt, diff --git a/runit/sv.c b/runit/sv.c index 2a256a6b4..37df9a929 100644 --- a/runit/sv.c +++ b/runit/sv.c @@ -474,8 +474,8 @@ int sv_main(int argc UNUSED_PARAM, char **argv) x = getenv("SVWAIT"); if (x) waitsec = xatou(x); - opt_complementary = "w+:vv"; /* -w N, -v is a counter */ - getopt32(argv, "w:v", &waitsec, &verbose); + opt_complementary = "vv"; /* -w N, -v is a counter */ + getopt32(argv, "w:+v", &waitsec, &verbose); argv += optind; action = *argv++; if (!action || !*argv) bb_show_usage(); |