From 036585a911a5fe6c2cd77b808dd9150500f37272 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 8 Aug 2017 16:38:18 +0200 Subject: getopt32: remove applet_long_options FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP /* We try to use --gid, not -g, because "standard" addgroup * has no short option -g, it has only long --gid. */ argv[1] = (char*)"--gid"; #else /* Breaks if system in fact does NOT use busybox addgroup */ argv[1] = (char*)"-g"; #endif xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko --- libbb/getopt32.c | 71 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 25 deletions(-) (limited to 'libbb/getopt32.c') diff --git a/libbb/getopt32.c b/libbb/getopt32.c index 513415894..b2b4de8cb 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c @@ -6,7 +6,7 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG +#if ENABLE_LONG_OPTS # include #endif #include "libbb.h" @@ -99,17 +99,18 @@ getopt32(char **argv, const char *applet_opts, ...) "!" Report bad option, missing required options, inconsistent options with all-ones return value (instead of abort). -const char *applet_long_options +uint32_t +getopt32long(char **argv, const char *applet_opts, const char *logopts...) - This struct allows you to define long options: + This allows you to define long options: static const char applet_longopts[] ALIGN1 = //"name\0" has_arg val "verbose\0" No_argument "v" ; - applet_long_options = applet_longopts; + opt = getopt32long(argv, applet_opts, applet_longopts, ...); - The last member of struct option (val) typically is set to + The last element (val) typically is set to matching short option from applet_opts. If there is no matching char in applet_opts, then: - return bit has next position after short options @@ -317,20 +318,21 @@ typedef struct { int *counter; } t_complementary; -/* You can set applet_long_options for parse called long options */ -#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG +uint32_t option_mask32; + +#if ENABLE_LONG_OPTS static const struct option bb_null_long_options[1] = { { 0, 0, 0, 0 } }; -const char *applet_long_options; +#else +#define vgetopt32(argv,applet_opts,applet_long_options,p) \ + vgetopt32(argv,applet_opts,p) #endif -uint32_t option_mask32; - /* Please keep getopt32 free from xmalloc */ -uint32_t FAST_FUNC -getopt32(char **argv, const char *applet_opts, ...) +static uint32_t +vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options, va_list p) { int argc; unsigned flags = 0; @@ -340,8 +342,7 @@ getopt32(char **argv, const char *applet_opts, ...) int c; const unsigned char *s; t_complementary *on_off; - va_list p; -#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG +#if ENABLE_LONG_OPTS const struct option *l_o; struct option *long_options = (struct option *) &bb_null_long_options; #endif @@ -356,8 +357,6 @@ getopt32(char **argv, const char *applet_opts, ...) /* skip 0: some applets cheat: they do not actually HAVE argv[0] */ argc = 1 + string_array_len(argv + 1); - va_start(p, applet_opts); - on_off = complementary; memset(on_off, 0, sizeof(complementary)); @@ -394,7 +393,7 @@ getopt32(char **argv, const char *applet_opts, ...) c++; } -#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG +#if ENABLE_LONG_OPTS if (applet_long_options) { const char *optstr; unsigned i, count; @@ -433,12 +432,8 @@ getopt32(char **argv, const char *applet_opts, ...) c++; next_long: ; } - /* Make it unnecessary to clear applet_long_options - * by hand after each call to getopt32 - */ - applet_long_options = NULL; } -#endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */ +#endif /* ENABLE_LONG_OPTS */ for (s = (const unsigned char *)opt_complementary; s && *s; s++) { t_complementary *pair; @@ -517,9 +512,9 @@ getopt32(char **argv, const char *applet_opts, ...) } s--; } - opt_complementary = NULL; - va_end(p); + /* Make it unnecessary to clear it by hand after each getopt32 call */ + opt_complementary = NULL; /* In case getopt32 was already called: * reset the libc getopt() function, which keeps internal state. * run_nofork_applet() does this, but we might end up here @@ -531,7 +526,7 @@ getopt32(char **argv, const char *applet_opts, ...) * "fake" short options, like this one: * wget $'-\203' "Test: test" http://kernel.org/ * (supposed to act as --header, but doesn't) */ -#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG +#if ENABLE_LONG_OPTS while ((c = getopt_long(argc, argv, applet_opts, long_options, NULL)) != -1) { #else @@ -592,3 +587,29 @@ getopt32(char **argv, const char *applet_opts, ...) bb_show_usage(); return (int32_t)-1; } + +uint32_t FAST_FUNC +getopt32(char **argv, const char *applet_opts, ...) +{ + uint32_t opt; + va_list p; + + va_start(p, applet_opts); + opt = vgetopt32(argv, applet_opts, NULL, p); + va_end(p); + return opt; +} + +#if ENABLE_LONG_OPTS +uint32_t FAST_FUNC +getopt32long(char **argv, const char *applet_opts, const char *longopts, ...) +{ + uint32_t opt; + va_list p; + + va_start(p, longopts); + opt = vgetopt32(argv, applet_opts, longopts, p); + va_end(p); + return opt; +} +#endif -- cgit v1.2.3