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 --- miscutils/conspy.c | 4 ++-- miscutils/ionice.c | 3 +-- miscutils/microcom.c | 3 +-- miscutils/timeout.c | 3 +-- miscutils/ubi_tools.c | 8 ++++---- 5 files changed, 9 insertions(+), 12 deletions(-) (limited to 'miscutils') diff --git a/miscutils/conspy.c b/miscutils/conspy.c index f6468c116..e80158e39 100644 --- a/miscutils/conspy.c +++ b/miscutils/conspy.c @@ -388,8 +388,8 @@ int conspy_main(int argc UNUSED_PARAM, char **argv) INIT_G(); strcpy(G.vcsa_name, DEV_VCSA); - opt_complementary = "x+:y+"; // numeric params - opts = getopt32(argv, "vcQsndfFx:y:", &G.x, &G.y); + // numeric params + opts = getopt32(argv, "vcQsndfFx:+y:+", &G.x, &G.y); argv += optind; ttynum = 0; if (argv[0]) { diff --git a/miscutils/ionice.c b/miscutils/ionice.c index 0c14256ab..5fcb653a8 100644 --- a/miscutils/ionice.c +++ b/miscutils/ionice.c @@ -60,9 +60,8 @@ int ionice_main(int argc UNUSED_PARAM, char **argv) }; /* Numeric params */ - opt_complementary = "n+:c+:p+"; /* '+': stop at first non-option */ - opt = getopt32(argv, "+n:c:p:", &pri, &ioclass, &pid); + opt = getopt32(argv, "+n:+c:+p:+", &pri, &ioclass, &pid); argv += optind; if (opt & OPT_c) { diff --git a/miscutils/microcom.c b/miscutils/microcom.c index d9e8f9187..dfc9771d8 100644 --- a/miscutils/microcom.c +++ b/miscutils/microcom.c @@ -64,8 +64,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) unsigned opts; // fetch options - opt_complementary = "=1:s+:d+:t+"; // exactly one arg, numeric options - opts = getopt32(argv, "Xs:d:t:", &speed, &delay, &timeout); + opts = getopt32(argv, "Xs:+d:+t:+", &speed, &delay, &timeout); // argc -= optind; argv += optind; diff --git a/miscutils/timeout.c b/miscutils/timeout.c index 9d56593ba..8df9ff0fd 100644 --- a/miscutils/timeout.c +++ b/miscutils/timeout.c @@ -52,9 +52,8 @@ int timeout_main(int argc UNUSED_PARAM, char **argv) /* -p option is not documented, it is needed to support NOMMU. */ /* -t SECONDS; -p PARENT_PID */ - opt_complementary = "t+" USE_FOR_NOMMU(":p+"); /* '+': stop at first non-option */ - getopt32(argv, "+s:t:" USE_FOR_NOMMU("p:"), &opt_s, &timeout, &parent); + getopt32(argv, "+s:t:+" USE_FOR_NOMMU("p:+"), &opt_s, &timeout, &parent); /*argv += optind; - no, wait for bb_daemonize_or_rexec! */ signo = get_signum(opt_s); if (signo < 0) diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index 4364bc807..8e55e9577 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c @@ -134,8 +134,8 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv) #define OPTION_a (1 << 5) #define OPTION_t (1 << 6) if (do_mkvol) { - opt_complementary = "-1:d+:n+:a+:O+"; - opts = getopt32(argv, "md:n:N:s:a:t:O:", + opt_complementary = "-1"; + opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+", &dev_num, &vol_id, &vol_name, &size_bytes_str, &alignment, &type, &vid_hdr_offset @@ -146,8 +146,8 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv) opts = getopt32(argv, "s:at", &size_bytes_str); opts *= OPTION_s; } else { - opt_complementary = "-1:m+:d+:n+:a+"; - opts = getopt32(argv, "m:d:n:N:s:a:t:", + opt_complementary = "-1"; + opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:", &mtd_num, &dev_num, &vol_id, &vol_name, &size_bytes_str, &alignment, &type ); -- cgit v1.2.3