From 237bedd499c58034a1355484d6d4d906f0180308 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 6 Jul 2016 21:58:02 +0200 Subject: 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 --- procps/pgrep.c | 3 +-- procps/pidof.c | 3 +-- procps/ps.c | 3 +-- procps/watch.c | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) (limited to 'procps') diff --git a/procps/pgrep.c b/procps/pgrep.c index 1c7c7c48b..1c594cf96 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c @@ -106,8 +106,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv) /* Parse remaining options */ ppid2match = -1; sid2match = -1; - opt_complementary = "s+:P+"; /* numeric opts */ - opt = getopt32(argv, "vlfxons:P:", &sid2match, &ppid2match); + opt = getopt32(argv, "vlfxons:+P:+", &sid2match, &ppid2match); argv += optind; if (pkill && OPT_LIST) { /* -l: print the whole signal list */ diff --git a/procps/pidof.c b/procps/pidof.c index 6d7b59109..6d265667f 100644 --- a/procps/pidof.c +++ b/procps/pidof.c @@ -51,13 +51,12 @@ int pidof_main(int argc UNUSED_PARAM, char **argv) unsigned opt; #if ENABLE_FEATURE_PIDOF_OMIT llist_t *omits = NULL; /* list of pids to omit */ - opt_complementary = "o::"; #endif /* do unconditional option parsing */ opt = getopt32(argv, "" IF_FEATURE_PIDOF_SINGLE ("s") - IF_FEATURE_PIDOF_OMIT("o:", &omits)); + IF_FEATURE_PIDOF_OMIT("o:*", &omits)); #if ENABLE_FEATURE_PIDOF_OMIT /* fill omit list. */ diff --git a/procps/ps.c b/procps/ps.c index 08dfce12e..ce638261a 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -593,8 +593,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv) * procps v3.2.7 supports -T and shows tids as SPID column, * it also supports -L where it shows tids as LWP column. */ - opt_complementary = "o::"; - opt = getopt32(argv, "Zo:aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); + opt = getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); if (opt_o) { do { parse_o(llist_pop(&opt_o)); diff --git a/procps/watch.c b/procps/watch.c index 97aa04767..20859c3cd 100644 --- a/procps/watch.c +++ b/procps/watch.c @@ -51,9 +51,9 @@ int watch_main(int argc UNUSED_PARAM, char **argv) xopen("/dev/null", O_RDONLY); #endif - opt_complementary = "-1:n+"; // at least one param; -n NUM + opt_complementary = "-1"; // at least one param; -n NUM // "+": stop at first non-option (procps 3.x only) - opt = getopt32(argv, "+dtn:", &period); + opt = getopt32(argv, "+dtn:+", &period); argv += optind; // watch from both procps 2.x and 3.x does concatenation. Example: -- cgit v1.2.3