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
@@ -95,9 +95,10 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
|
||||
|
||||
memset(&txc, 0, sizeof(txc));
|
||||
|
||||
opt_complementary = "=0"; /* no valid non-option parameters */
|
||||
opt = getopt32(argv, "qo:f:p:t:",
|
||||
&opt_o, &opt_f, &opt_p, &opt_t);
|
||||
opt = getopt32(argv, "^" "qo:f:p:t:"
|
||||
"\0" "=0"/*no valid non-option args*/,
|
||||
&opt_o, &opt_f, &opt_p, &opt_t
|
||||
);
|
||||
//if (opt & 0x1) // -q
|
||||
if (opt & 0x2) { // -o
|
||||
txc.offset = xatol(opt_o);
|
||||
|
||||
@@ -1021,13 +1021,17 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
|
||||
|
||||
INIT_G();
|
||||
|
||||
/* "-b after -f is ignored", and so on for every pair a-b */
|
||||
opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
|
||||
opts = getopt32(argv, "^"
|
||||
"l:L:fbSc:" IF_FEATURE_CROND_D("d:")
|
||||
"\0"
|
||||
/* "-b after -f is ignored", and so on for every pair a-b */
|
||||
"f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
|
||||
/* -l and -d have numeric param */
|
||||
":l+" IF_FEATURE_CROND_D(":d+");
|
||||
opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
|
||||
":l+" IF_FEATURE_CROND_D(":d+")
|
||||
,
|
||||
&G.log_level, &G.log_filename, &G.crontab_dir_name
|
||||
IF_FEATURE_CROND_D(,&G.log_level));
|
||||
IF_FEATURE_CROND_D(,&G.log_level)
|
||||
);
|
||||
/* both -d N and -l N set the same variable: G.log_level */
|
||||
|
||||
if (!(opts & OPT_f)) {
|
||||
|
||||
@@ -99,8 +99,9 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
|
||||
OPT_ler = OPT_l + OPT_e + OPT_r,
|
||||
};
|
||||
|
||||
opt_complementary = "?1:dr"; /* max one argument; -d implies -r */
|
||||
opt_ler = getopt32(argv, "u:c:lerd", &user_name, &crontab_dir);
|
||||
opt_ler = getopt32(argv, "^" "u:c:lerd" "\0" "?1:dr"/*max one arg; -d implies -r*/,
|
||||
&user_name, &crontab_dir
|
||||
);
|
||||
argv += optind;
|
||||
|
||||
if (sanitize_env_if_suid()) { /* Clears dangerous stuff, sets PATH */
|
||||
|
||||
@@ -82,8 +82,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
|
||||
unsigned int flags;
|
||||
char *mtd_name;
|
||||
|
||||
opt_complementary = "=1";
|
||||
flags = getopt32(argv, "jNq");
|
||||
flags = getopt32(argv, "^" "jNq" "\0" "=1");
|
||||
|
||||
mtd_name = argv[optind];
|
||||
fd = xopen(mtd_name, O_RDWR);
|
||||
|
||||
@@ -69,8 +69,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
|
||||
RESERVE_CONFIG_UBUFFER(buf, BUFSIZE);
|
||||
RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE);
|
||||
|
||||
opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */
|
||||
/*opts =*/ getopt32(argv, "v");
|
||||
/*opts =*/ getopt32(argv, "^" "v" "\0" "=2"/*exactly 2 non-option args: file,dev*/);
|
||||
argv += optind;
|
||||
// filename = *argv++;
|
||||
// devicename = *argv;
|
||||
|
||||
@@ -455,14 +455,12 @@ int i2cget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int i2cget_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
const unsigned opt_f = (1 << 0), opt_y = (1 << 1);
|
||||
const char *const optstr = "fy";
|
||||
|
||||
int bus_num, bus_addr, data_addr = -1, status;
|
||||
int mode = I2C_SMBUS_BYTE, pec = 0, fd;
|
||||
unsigned opts;
|
||||
|
||||
opt_complementary = "-2:?4"; /* from 2 to 4 args */
|
||||
opts = getopt32(argv, optstr);
|
||||
opts = getopt32(argv, "^" "fy" "\0" "-2:?4"/*from 2 to 4 args*/);
|
||||
argv += optind;
|
||||
|
||||
bus_num = i2c_bus_lookup(argv[0]);
|
||||
@@ -544,7 +542,6 @@ int i2cset_main(int argc, char **argv)
|
||||
{
|
||||
const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
|
||||
opt_m = (1 << 2), opt_r = (1 << 3);
|
||||
const char *const optstr = "fym:r";
|
||||
|
||||
int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0;
|
||||
int val, blen = 0, mask = 0, fd, status;
|
||||
@@ -552,8 +549,7 @@ int i2cset_main(int argc, char **argv)
|
||||
char *opt_m_arg = NULL;
|
||||
unsigned opts;
|
||||
|
||||
opt_complementary = "-3"; /* from 3 to ? args */
|
||||
opts = getopt32(argv, optstr, &opt_m_arg);
|
||||
opts = getopt32(argv, "^" "fym:r" "\0" "-3"/*from 3 to ? args*/, &opt_m_arg);
|
||||
argv += optind;
|
||||
argc -= optind;
|
||||
|
||||
@@ -905,7 +901,6 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
|
||||
opt_r = (1 << 2);
|
||||
const char *const optstr = "fyr:";
|
||||
|
||||
int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0;
|
||||
unsigned first = 0x00, last = 0xff, opts;
|
||||
@@ -913,8 +908,11 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
|
||||
char *opt_r_str, *dash;
|
||||
int fd, res;
|
||||
|
||||
opt_complementary = "-2:?3"; /* from 2 to 3 args */
|
||||
opts = getopt32(argv, optstr, &opt_r_str);
|
||||
opts = getopt32(argv, "^"
|
||||
"fyr:"
|
||||
"\0" "-2:?3" /* from 2 to 3 args */,
|
||||
&opt_r_str
|
||||
);
|
||||
argv += optind;
|
||||
|
||||
bus_num = i2c_bus_lookup(argv[0]);
|
||||
@@ -1208,15 +1206,16 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
|
||||
const unsigned opt_y = (1 << 0), opt_a = (1 << 1),
|
||||
opt_q = (1 << 2), opt_r = (1 << 3),
|
||||
opt_F = (1 << 4), opt_l = (1 << 5);
|
||||
const char *const optstr = "yaqrFl";
|
||||
|
||||
int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd;
|
||||
unsigned first = 0x03, last = 0x77, opts;
|
||||
unsigned long funcs;
|
||||
|
||||
opt_complementary = "q--r:r--q:" /* mutually exclusive */
|
||||
"?3"; /* up to 3 args */
|
||||
opts = getopt32(argv, optstr);
|
||||
opts = getopt32(argv, "^"
|
||||
"yaqrFl"
|
||||
"\0"
|
||||
"q--r:r--q:"/*mutually exclusive*/ "?3"/*up to 3 args*/
|
||||
);
|
||||
argv += optind;
|
||||
|
||||
if (opts & opt_l)
|
||||
|
||||
@@ -183,8 +183,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv)
|
||||
char *line = (char *)"-";
|
||||
int ret = EXIT_SUCCESS;
|
||||
|
||||
opt_complementary = "=1"; /* exactly one param */
|
||||
getopt32(argv, "d:", &line);
|
||||
getopt32(argv, "^" "d:" "\0" "=1", &line);
|
||||
argv += optind;
|
||||
|
||||
xchdir(*argv); /* ensure root dir exists */
|
||||
|
||||
@@ -253,8 +253,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
|
||||
|
||||
INIT_G();
|
||||
|
||||
opt_complementary = "-1"; /* at least one argument */
|
||||
opt = getopt32(argv, "+aw");
|
||||
opt = getopt32(argv, "^+" "aw" "\0" "-1"/*at least one arg*/);
|
||||
argv += optind;
|
||||
|
||||
sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
|
||||
|
||||
@@ -74,8 +74,9 @@ int microcom_main(int argc UNUSED_PARAM, char **argv)
|
||||
unsigned opts;
|
||||
|
||||
// fetch options
|
||||
opt_complementary = "=1";
|
||||
opts = getopt32(argv, "Xs:+d:+t:+", &speed, &delay, &timeout);
|
||||
opts = getopt32(argv, "^" "Xs:+d:+t:+" "\0" "=1",
|
||||
&speed, &delay, &timeout
|
||||
);
|
||||
// argc -= optind;
|
||||
argv += optind;
|
||||
|
||||
|
||||
@@ -123,13 +123,12 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
|
||||
const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
|
||||
|
||||
if (IS_NANDDUMP) {
|
||||
opt_complementary = "=1";
|
||||
opts = getopt32long(argv, "ons:f:l:",
|
||||
opts = getopt32long(argv, "^" "ons:f:l:" "\0" "=1",
|
||||
"bb\0" Required_argument "\xff", /* no short equivalent */
|
||||
&opt_s, &opt_f, &opt_l, &opt_bb);
|
||||
&opt_s, &opt_f, &opt_l, &opt_bb
|
||||
);
|
||||
} else { /* nandwrite */
|
||||
opt_complementary = "-1:?2";
|
||||
opts = getopt32(argv, "pns:", &opt_s);
|
||||
opts = getopt32(argv, "^" "pns:" "\0" "-1:?2", &opt_s);
|
||||
}
|
||||
argv += optind;
|
||||
|
||||
|
||||
@@ -742,8 +742,7 @@ int setserial_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
int opts;
|
||||
|
||||
opt_complementary = "-1:b-aG:G-ab:a-bG";
|
||||
opts = getopt32(argv, "bGavzgq");
|
||||
opts = getopt32(argv, "^" "bGavzgq" "\0" "-1:b-aG:G-ab:a-bG");
|
||||
argv += optind;
|
||||
|
||||
if (!argv[1]) /* one arg only? (nothing to change?) */
|
||||
|
||||
@@ -430,9 +430,10 @@ int time_main(int argc UNUSED_PARAM, char **argv)
|
||||
OPT_f = (1 << 4),
|
||||
};
|
||||
|
||||
opt_complementary = "-1"; /* at least one arg */
|
||||
/* "+": stop on first non-option */
|
||||
opt = getopt32(argv, "+vpao:f:", &output_filename, &output_format);
|
||||
opt = getopt32(argv, "^+" "vpao:f:" "\0" "-1"/*at least one arg*/,
|
||||
&output_filename, &output_format
|
||||
);
|
||||
argv += optind;
|
||||
if (opt & OPT_v)
|
||||
output_format = long_format;
|
||||
|
||||
@@ -145,20 +145,17 @@ 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";
|
||||
opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+",
|
||||
opts = getopt32(argv, "^" "md:+n:+N:s:a:+t:O:+" "\0" "-1",
|
||||
&dev_num, &vol_id,
|
||||
&vol_name, &size_bytes_str, &alignment, &type,
|
||||
&vid_hdr_offset
|
||||
);
|
||||
} else
|
||||
if (do_update) {
|
||||
opt_complementary = "-1";
|
||||
opts = getopt32(argv, "s:at", &size_bytes_str);
|
||||
opts = getopt32(argv, "^" "s:at" "\0" "-1", &size_bytes_str);
|
||||
opts *= OPTION_s;
|
||||
} else {
|
||||
opt_complementary = "-1";
|
||||
opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:",
|
||||
opts = getopt32(argv, "^" "m:+d:+n:+N:s:a:+t:" "\0" "-1",
|
||||
&mtd_num, &dev_num, &vol_id,
|
||||
&vol_name, &size_bytes_str, &alignment, &type
|
||||
);
|
||||
|
||||
@@ -101,8 +101,9 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
|
||||
char *st_arg;
|
||||
char *ht_arg;
|
||||
|
||||
opt_complementary = "=1"; /* must have exactly 1 argument */
|
||||
opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
|
||||
opts = getopt32(argv, "^" "Ft:T:" "\0" "=1"/*must have exactly 1 arg*/,
|
||||
&st_arg, &ht_arg
|
||||
);
|
||||
|
||||
/* We need to daemonize *before* opening the watchdog as many drivers
|
||||
* will only allow one process at a time to do so. Since daemonizing
|
||||
|
||||
Reference in New Issue
Block a user