getopt32: remove opt_complementary
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
@@ -96,9 +96,11 @@ getopt32(char **argv, const char *applet_opts, ...)
|
||||
env -i ls -d /
|
||||
Here we want env to process just the '-i', not the '-d'.
|
||||
|
||||
"!" Report bad option, missing required options,
|
||||
"!" Report bad options, missing required options,
|
||||
inconsistent options with all-ones return value (instead of abort).
|
||||
|
||||
"^" options string is "^optchars""\0""opt_complementary".
|
||||
|
||||
uint32_t
|
||||
getopt32long(char **argv, const char *applet_opts, const char *logopts...)
|
||||
|
||||
@@ -121,7 +123,7 @@ getopt32long(char **argv, const char *applet_opts, const char *logopts...)
|
||||
config process and not a required feature. The current standard
|
||||
is to name the config option CONFIG_FEATURE_<applet>_LONG_OPTIONS.
|
||||
|
||||
const char *opt_complementary
|
||||
opt_complementary - option modifiers.
|
||||
|
||||
":" The colon (":") is used to separate groups of two or more chars
|
||||
and/or groups of chars and special characters (stating some
|
||||
@@ -132,8 +134,7 @@ const char *opt_complementary
|
||||
Their flags will be turned on if the main option is found even
|
||||
if they are not specified on the command line. For example:
|
||||
|
||||
opt_complementary = "abc";
|
||||
flags = getopt32(argv, "abcd")
|
||||
flags = getopt32(argv, "^abcd""\0""abc")
|
||||
|
||||
If getopt() finds "-a" on the command line, then
|
||||
getopt32's return value will be as if "-a -b -c" were
|
||||
@@ -146,8 +147,7 @@ const char *opt_complementary
|
||||
if w is given more than once, it is "unlimited"
|
||||
|
||||
int w_counter = 0; // must be initialized!
|
||||
opt_complementary = "ww";
|
||||
getopt32(argv, "w", &w_counter);
|
||||
getopt32(argv, "^w""\0""ww", &w_counter);
|
||||
if (w_counter)
|
||||
width = (w_counter == 1) ? 132 : INT_MAX;
|
||||
else
|
||||
@@ -162,8 +162,9 @@ const char *opt_complementary
|
||||
|
||||
llist_t *my_b = NULL;
|
||||
int verbose_level = 0;
|
||||
opt_complementary = "vv:b-c:c-b";
|
||||
f = getopt32(argv, "vb:*c", &my_b, &verbose_level);
|
||||
f = getopt32(argv, "^vb:*c"
|
||||
"\0""vv:b-c:c-b"
|
||||
, &my_b, &verbose_level);
|
||||
if (f & 2) // -c after -b unsets -b flag
|
||||
while (my_b) dosomething_with(llist_pop(&my_b));
|
||||
if (my_b) // but llist is stored if -b is specified
|
||||
@@ -199,7 +200,7 @@ Special characters:
|
||||
getopt32 finds -s, then -d is unset or if it finds -d
|
||||
then -s is unset. (Note: busybox implements the GNU
|
||||
"--max-depth" option as "-d".) To obtain this behavior, you
|
||||
set opt_complementary = "s-d:d-s". Only one flag value is
|
||||
set opt_complementary to "s-d:d-s". Only one flag value is
|
||||
added to getopt32's return value depending on the
|
||||
position of the options on the command line. If one of the
|
||||
two options requires an argument pointer (":" in applet_opts
|
||||
@@ -207,8 +208,7 @@ Special characters:
|
||||
|
||||
char *smax_print_depth;
|
||||
|
||||
opt_complementary = "s-d:d-s:x-x";
|
||||
opt = getopt32(argv, "sd:x", &smax_print_depth);
|
||||
opt = getopt32(argv, "^sd:x""\0""s-d:d-s:x-x", &smax_print_depth);
|
||||
|
||||
if (opt & 2)
|
||||
max_print_depth = atoi(smax_print_depth);
|
||||
@@ -224,7 +224,7 @@ Special characters:
|
||||
The cut applet must have only one type of list specified, so
|
||||
-b, -c and -f are mutually exclusive and should raise an error
|
||||
if specified together. In this case you must set
|
||||
opt_complementary = "b--cf:c--bf:f--bc". If two of the
|
||||
opt_complementary to "b--cf:c--bf:f--bc". If two of the
|
||||
mutually exclusive options are found, getopt32 will call
|
||||
bb_show_usage() and die.
|
||||
|
||||
@@ -236,8 +236,7 @@ Special characters:
|
||||
with xatoi_positive() - allowed range is 0..INT_MAX.
|
||||
|
||||
int param; // "unsigned param;" will also work
|
||||
opt_complementary = "p+";
|
||||
getopt32(argv, "p:", ¶m);
|
||||
getopt32(argv, "^p:""\0""p+", ¶m);
|
||||
|
||||
"o::" A double colon after a char in opt_complementary means that the
|
||||
option can occur multiple times. Each occurrence will be saved as
|
||||
@@ -252,8 +251,7 @@ Special characters:
|
||||
(this pointer must be initializated to NULL if the list is empty
|
||||
as required by llist_add_to_end(llist_t **old_head, char *new_item).)
|
||||
|
||||
opt_complementary = "e::";
|
||||
getopt32(argv, "e:", &patterns);
|
||||
getopt32(argv, "^e:""\0""e::", &patterns);
|
||||
|
||||
$ grep -e user -e root /etc/passwd
|
||||
root:x:0:0:root:/root:/bin/bash
|
||||
@@ -271,8 +269,7 @@ Special characters:
|
||||
For example from "id" applet:
|
||||
|
||||
// Don't allow -n -r -rn -ug -rug -nug -rnug
|
||||
opt_complementary = "r?ug:n?ug:u--g:g--u";
|
||||
flags = getopt32(argv, "rnug");
|
||||
flags = getopt32(argv, "^rnug""\0""r?ug:n?ug:u--g:g--u");
|
||||
|
||||
This example allowed only:
|
||||
$ id; id -u; id -g; id -ru; id -nu; id -rg; id -ng; id -rnu; id -rng
|
||||
@@ -283,8 +280,7 @@ Special characters:
|
||||
For example from "start-stop-daemon" applet:
|
||||
|
||||
// Don't allow -KS -SK, but -S or -K is required
|
||||
opt_complementary = "K:S:K--S:S--K";
|
||||
flags = getopt32(argv, "KS...);
|
||||
flags = getopt32(argv, "^KS...""\0""K:S:K--S:S--K");
|
||||
|
||||
|
||||
Don't forget to use ':'. For example, "?322-22-23X-x-a"
|
||||
@@ -299,8 +295,6 @@ Special characters:
|
||||
|
||||
const char *const bb_argv_dash[] = { "-", NULL };
|
||||
|
||||
const char *opt_complementary;
|
||||
|
||||
enum {
|
||||
PARAM_STRING,
|
||||
PARAM_LIST,
|
||||
@@ -337,10 +331,12 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
||||
int argc;
|
||||
unsigned flags = 0;
|
||||
unsigned requires = 0;
|
||||
unsigned len;
|
||||
t_complementary complementary[33]; /* last stays zero-filled */
|
||||
char first_char;
|
||||
char dont_die_flag;
|
||||
int c;
|
||||
const unsigned char *s;
|
||||
const char *opt_complementary;
|
||||
t_complementary *on_off;
|
||||
#if ENABLE_LONG_OPTS
|
||||
const struct option *l_o;
|
||||
@@ -349,23 +345,29 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
||||
unsigned trigger;
|
||||
int min_arg = 0;
|
||||
int max_arg = -1;
|
||||
|
||||
#define SHOW_USAGE_IF_ERROR 1
|
||||
|
||||
int spec_flgs = 0;
|
||||
|
||||
/* skip 0: some applets cheat: they do not actually HAVE argv[0] */
|
||||
argc = 1 + string_array_len(argv + 1);
|
||||
#define SHOW_USAGE_IF_ERROR 1
|
||||
|
||||
on_off = complementary;
|
||||
memset(on_off, 0, sizeof(complementary));
|
||||
|
||||
applet_opts = strcpy(alloca(strlen(applet_opts) + 1), applet_opts);
|
||||
len = strlen(applet_opts);
|
||||
|
||||
/* skip bbox extension */
|
||||
first_char = applet_opts[0];
|
||||
if (first_char == '!')
|
||||
opt_complementary = NULL;
|
||||
if (applet_opts[0] == '^') {
|
||||
applet_opts++;
|
||||
/* point it past terminating NUL */
|
||||
opt_complementary = applet_opts + len;
|
||||
}
|
||||
|
||||
/* skip another bbox extension */
|
||||
dont_die_flag = applet_opts[0];
|
||||
if (dont_die_flag == '!')
|
||||
applet_opts++;
|
||||
|
||||
applet_opts = strcpy(alloca(len + 1), applet_opts);
|
||||
|
||||
/* skip GNU extension */
|
||||
s = (const unsigned char *)applet_opts;
|
||||
@@ -435,7 +437,8 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
||||
}
|
||||
#endif /* ENABLE_LONG_OPTS */
|
||||
|
||||
for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
|
||||
s = (const unsigned char *)opt_complementary;
|
||||
if (s) for (; *s; s++) {
|
||||
t_complementary *pair;
|
||||
unsigned *pair_switch;
|
||||
|
||||
@@ -513,8 +516,6 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
||||
s--;
|
||||
}
|
||||
|
||||
/* 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
|
||||
@@ -522,6 +523,9 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
||||
*/
|
||||
GETOPT_RESET();
|
||||
|
||||
/* skip 0: some applets cheat: they do not actually HAVE argv[0] */
|
||||
argc = 1 + string_array_len(argv + 1);
|
||||
|
||||
/* Note: just "getopt() <= 0" will not work well for
|
||||
* "fake" short options, like this one:
|
||||
* wget $'-\203' "Test: test" http://kernel.org/
|
||||
@@ -583,7 +587,7 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
||||
return flags;
|
||||
|
||||
error:
|
||||
if (first_char != '!')
|
||||
if (dont_die_flag != '!')
|
||||
bb_show_usage();
|
||||
return (int32_t)-1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user