diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 21:55:02 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 21:55:02 +0200 |
commit | 22542eca18e5807b72ddc78999f5101e33f17a53 (patch) | |
tree | 1271842a37c6215c998674a44bf7f561a0deff52 /miscutils | |
parent | 036585a911a5fe6c2cd77b808dd9150500f37272 (diff) | |
download | busybox-w32-22542eca18e5807b72ddc78999f5101e33f17a53.tar.gz busybox-w32-22542eca18e5807b72ddc78999f5101e33f17a53.tar.bz2 busybox-w32-22542eca18e5807b72ddc78999f5101e33f17a53.zip |
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>
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/adjtimex.c | 7 | ||||
-rw-r--r-- | miscutils/crond.c | 14 | ||||
-rw-r--r-- | miscutils/crontab.c | 5 | ||||
-rw-r--r-- | miscutils/flash_eraseall.c | 3 | ||||
-rw-r--r-- | miscutils/flashcp.c | 3 | ||||
-rw-r--r-- | miscutils/i2c_tools.c | 25 | ||||
-rw-r--r-- | miscutils/makedevs.c | 3 | ||||
-rw-r--r-- | miscutils/man.c | 3 | ||||
-rw-r--r-- | miscutils/microcom.c | 5 | ||||
-rw-r--r-- | miscutils/nandwrite.c | 9 | ||||
-rw-r--r-- | miscutils/setserial.c | 3 | ||||
-rw-r--r-- | miscutils/time.c | 5 | ||||
-rw-r--r-- | miscutils/ubi_tools.c | 9 | ||||
-rw-r--r-- | miscutils/watchdog.c | 5 |
14 files changed, 49 insertions, 50 deletions
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c index ce6f8ccd8..c1718e909 100644 --- a/miscutils/adjtimex.c +++ b/miscutils/adjtimex.c | |||
@@ -95,9 +95,10 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv) | |||
95 | 95 | ||
96 | memset(&txc, 0, sizeof(txc)); | 96 | memset(&txc, 0, sizeof(txc)); |
97 | 97 | ||
98 | opt_complementary = "=0"; /* no valid non-option parameters */ | 98 | opt = getopt32(argv, "^" "qo:f:p:t:" |
99 | opt = getopt32(argv, "qo:f:p:t:", | 99 | "\0" "=0"/*no valid non-option args*/, |
100 | &opt_o, &opt_f, &opt_p, &opt_t); | 100 | &opt_o, &opt_f, &opt_p, &opt_t |
101 | ); | ||
101 | //if (opt & 0x1) // -q | 102 | //if (opt & 0x1) // -q |
102 | if (opt & 0x2) { // -o | 103 | if (opt & 0x2) { // -o |
103 | txc.offset = xatol(opt_o); | 104 | txc.offset = xatol(opt_o); |
diff --git a/miscutils/crond.c b/miscutils/crond.c index 48e429976..f6580a9d4 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -1021,13 +1021,17 @@ int crond_main(int argc UNUSED_PARAM, char **argv) | |||
1021 | 1021 | ||
1022 | INIT_G(); | 1022 | INIT_G(); |
1023 | 1023 | ||
1024 | /* "-b after -f is ignored", and so on for every pair a-b */ | 1024 | opts = getopt32(argv, "^" |
1025 | opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l") | 1025 | "l:L:fbSc:" IF_FEATURE_CROND_D("d:") |
1026 | "\0" | ||
1027 | /* "-b after -f is ignored", and so on for every pair a-b */ | ||
1028 | "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l") | ||
1026 | /* -l and -d have numeric param */ | 1029 | /* -l and -d have numeric param */ |
1027 | ":l+" IF_FEATURE_CROND_D(":d+"); | 1030 | ":l+" IF_FEATURE_CROND_D(":d+") |
1028 | opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"), | 1031 | , |
1029 | &G.log_level, &G.log_filename, &G.crontab_dir_name | 1032 | &G.log_level, &G.log_filename, &G.crontab_dir_name |
1030 | IF_FEATURE_CROND_D(,&G.log_level)); | 1033 | IF_FEATURE_CROND_D(,&G.log_level) |
1034 | ); | ||
1031 | /* both -d N and -l N set the same variable: G.log_level */ | 1035 | /* both -d N and -l N set the same variable: G.log_level */ |
1032 | 1036 | ||
1033 | if (!(opts & OPT_f)) { | 1037 | if (!(opts & OPT_f)) { |
diff --git a/miscutils/crontab.c b/miscutils/crontab.c index 804cb57f2..4787fa08f 100644 --- a/miscutils/crontab.c +++ b/miscutils/crontab.c | |||
@@ -99,8 +99,9 @@ int crontab_main(int argc UNUSED_PARAM, char **argv) | |||
99 | OPT_ler = OPT_l + OPT_e + OPT_r, | 99 | OPT_ler = OPT_l + OPT_e + OPT_r, |
100 | }; | 100 | }; |
101 | 101 | ||
102 | opt_complementary = "?1:dr"; /* max one argument; -d implies -r */ | 102 | opt_ler = getopt32(argv, "^" "u:c:lerd" "\0" "?1:dr"/*max one arg; -d implies -r*/, |
103 | opt_ler = getopt32(argv, "u:c:lerd", &user_name, &crontab_dir); | 103 | &user_name, &crontab_dir |
104 | ); | ||
104 | argv += optind; | 105 | argv += optind; |
105 | 106 | ||
106 | if (sanitize_env_if_suid()) { /* Clears dangerous stuff, sets PATH */ | 107 | if (sanitize_env_if_suid()) { /* Clears dangerous stuff, sets PATH */ |
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c index 3ddd9dd99..a6ce41f27 100644 --- a/miscutils/flash_eraseall.c +++ b/miscutils/flash_eraseall.c | |||
@@ -82,8 +82,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv) | |||
82 | unsigned int flags; | 82 | unsigned int flags; |
83 | char *mtd_name; | 83 | char *mtd_name; |
84 | 84 | ||
85 | opt_complementary = "=1"; | 85 | flags = getopt32(argv, "^" "jNq" "\0" "=1"); |
86 | flags = getopt32(argv, "jNq"); | ||
87 | 86 | ||
88 | mtd_name = argv[optind]; | 87 | mtd_name = argv[optind]; |
89 | fd = xopen(mtd_name, O_RDWR); | 88 | fd = xopen(mtd_name, O_RDWR); |
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c index c10b96ee8..858cee194 100644 --- a/miscutils/flashcp.c +++ b/miscutils/flashcp.c | |||
@@ -69,8 +69,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv) | |||
69 | RESERVE_CONFIG_UBUFFER(buf, BUFSIZE); | 69 | RESERVE_CONFIG_UBUFFER(buf, BUFSIZE); |
70 | RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE); | 70 | RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE); |
71 | 71 | ||
72 | opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */ | 72 | /*opts =*/ getopt32(argv, "^" "v" "\0" "=2"/*exactly 2 non-option args: file,dev*/); |
73 | /*opts =*/ getopt32(argv, "v"); | ||
74 | argv += optind; | 73 | argv += optind; |
75 | // filename = *argv++; | 74 | // filename = *argv++; |
76 | // devicename = *argv; | 75 | // devicename = *argv; |
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c index 8d04d2259..30f606e8e 100644 --- a/miscutils/i2c_tools.c +++ b/miscutils/i2c_tools.c | |||
@@ -455,14 +455,12 @@ int i2cget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |||
455 | int i2cget_main(int argc UNUSED_PARAM, char **argv) | 455 | int i2cget_main(int argc UNUSED_PARAM, char **argv) |
456 | { | 456 | { |
457 | const unsigned opt_f = (1 << 0), opt_y = (1 << 1); | 457 | const unsigned opt_f = (1 << 0), opt_y = (1 << 1); |
458 | const char *const optstr = "fy"; | ||
459 | 458 | ||
460 | int bus_num, bus_addr, data_addr = -1, status; | 459 | int bus_num, bus_addr, data_addr = -1, status; |
461 | int mode = I2C_SMBUS_BYTE, pec = 0, fd; | 460 | int mode = I2C_SMBUS_BYTE, pec = 0, fd; |
462 | unsigned opts; | 461 | unsigned opts; |
463 | 462 | ||
464 | opt_complementary = "-2:?4"; /* from 2 to 4 args */ | 463 | opts = getopt32(argv, "^" "fy" "\0" "-2:?4"/*from 2 to 4 args*/); |
465 | opts = getopt32(argv, optstr); | ||
466 | argv += optind; | 464 | argv += optind; |
467 | 465 | ||
468 | bus_num = i2c_bus_lookup(argv[0]); | 466 | bus_num = i2c_bus_lookup(argv[0]); |
@@ -544,7 +542,6 @@ int i2cset_main(int argc, char **argv) | |||
544 | { | 542 | { |
545 | const unsigned opt_f = (1 << 0), opt_y = (1 << 1), | 543 | const unsigned opt_f = (1 << 0), opt_y = (1 << 1), |
546 | opt_m = (1 << 2), opt_r = (1 << 3); | 544 | opt_m = (1 << 2), opt_r = (1 << 3); |
547 | const char *const optstr = "fym:r"; | ||
548 | 545 | ||
549 | int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0; | 546 | int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0; |
550 | int val, blen = 0, mask = 0, fd, status; | 547 | int val, blen = 0, mask = 0, fd, status; |
@@ -552,8 +549,7 @@ int i2cset_main(int argc, char **argv) | |||
552 | char *opt_m_arg = NULL; | 549 | char *opt_m_arg = NULL; |
553 | unsigned opts; | 550 | unsigned opts; |
554 | 551 | ||
555 | opt_complementary = "-3"; /* from 3 to ? args */ | 552 | opts = getopt32(argv, "^" "fym:r" "\0" "-3"/*from 3 to ? args*/, &opt_m_arg); |
556 | opts = getopt32(argv, optstr, &opt_m_arg); | ||
557 | argv += optind; | 553 | argv += optind; |
558 | argc -= optind; | 554 | argc -= optind; |
559 | 555 | ||
@@ -905,7 +901,6 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv) | |||
905 | { | 901 | { |
906 | const unsigned opt_f = (1 << 0), opt_y = (1 << 1), | 902 | const unsigned opt_f = (1 << 0), opt_y = (1 << 1), |
907 | opt_r = (1 << 2); | 903 | opt_r = (1 << 2); |
908 | const char *const optstr = "fyr:"; | ||
909 | 904 | ||
910 | int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0; | 905 | int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0; |
911 | unsigned first = 0x00, last = 0xff, opts; | 906 | unsigned first = 0x00, last = 0xff, opts; |
@@ -913,8 +908,11 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv) | |||
913 | char *opt_r_str, *dash; | 908 | char *opt_r_str, *dash; |
914 | int fd, res; | 909 | int fd, res; |
915 | 910 | ||
916 | opt_complementary = "-2:?3"; /* from 2 to 3 args */ | 911 | opts = getopt32(argv, "^" |
917 | opts = getopt32(argv, optstr, &opt_r_str); | 912 | "fyr:" |
913 | "\0" "-2:?3" /* from 2 to 3 args */, | ||
914 | &opt_r_str | ||
915 | ); | ||
918 | argv += optind; | 916 | argv += optind; |
919 | 917 | ||
920 | bus_num = i2c_bus_lookup(argv[0]); | 918 | bus_num = i2c_bus_lookup(argv[0]); |
@@ -1208,15 +1206,16 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv) | |||
1208 | const unsigned opt_y = (1 << 0), opt_a = (1 << 1), | 1206 | const unsigned opt_y = (1 << 0), opt_a = (1 << 1), |
1209 | opt_q = (1 << 2), opt_r = (1 << 3), | 1207 | opt_q = (1 << 2), opt_r = (1 << 3), |
1210 | opt_F = (1 << 4), opt_l = (1 << 5); | 1208 | opt_F = (1 << 4), opt_l = (1 << 5); |
1211 | const char *const optstr = "yaqrFl"; | ||
1212 | 1209 | ||
1213 | int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd; | 1210 | int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd; |
1214 | unsigned first = 0x03, last = 0x77, opts; | 1211 | unsigned first = 0x03, last = 0x77, opts; |
1215 | unsigned long funcs; | 1212 | unsigned long funcs; |
1216 | 1213 | ||
1217 | opt_complementary = "q--r:r--q:" /* mutually exclusive */ | 1214 | opts = getopt32(argv, "^" |
1218 | "?3"; /* up to 3 args */ | 1215 | "yaqrFl" |
1219 | opts = getopt32(argv, optstr); | 1216 | "\0" |
1217 | "q--r:r--q:"/*mutually exclusive*/ "?3"/*up to 3 args*/ | ||
1218 | ); | ||
1220 | argv += optind; | 1219 | argv += optind; |
1221 | 1220 | ||
1222 | if (opts & opt_l) | 1221 | if (opts & opt_l) |
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index c13ad1442..80975c652 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
@@ -183,8 +183,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv) | |||
183 | char *line = (char *)"-"; | 183 | char *line = (char *)"-"; |
184 | int ret = EXIT_SUCCESS; | 184 | int ret = EXIT_SUCCESS; |
185 | 185 | ||
186 | opt_complementary = "=1"; /* exactly one param */ | 186 | getopt32(argv, "^" "d:" "\0" "=1", &line); |
187 | getopt32(argv, "d:", &line); | ||
188 | argv += optind; | 187 | argv += optind; |
189 | 188 | ||
190 | xchdir(*argv); /* ensure root dir exists */ | 189 | xchdir(*argv); /* ensure root dir exists */ |
diff --git a/miscutils/man.c b/miscutils/man.c index a16202f25..ba6bb4c01 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
@@ -253,8 +253,7 @@ int man_main(int argc UNUSED_PARAM, char **argv) | |||
253 | 253 | ||
254 | INIT_G(); | 254 | INIT_G(); |
255 | 255 | ||
256 | opt_complementary = "-1"; /* at least one argument */ | 256 | opt = getopt32(argv, "^+" "aw" "\0" "-1"/*at least one arg*/); |
257 | opt = getopt32(argv, "+aw"); | ||
258 | argv += optind; | 257 | argv += optind; |
259 | 258 | ||
260 | sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9"); | 259 | sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9"); |
diff --git a/miscutils/microcom.c b/miscutils/microcom.c index f382edebb..b87f3273f 100644 --- a/miscutils/microcom.c +++ b/miscutils/microcom.c | |||
@@ -74,8 +74,9 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) | |||
74 | unsigned opts; | 74 | unsigned opts; |
75 | 75 | ||
76 | // fetch options | 76 | // fetch options |
77 | opt_complementary = "=1"; | 77 | opts = getopt32(argv, "^" "Xs:+d:+t:+" "\0" "=1", |
78 | opts = getopt32(argv, "Xs:+d:+t:+", &speed, &delay, &timeout); | 78 | &speed, &delay, &timeout |
79 | ); | ||
79 | // argc -= optind; | 80 | // argc -= optind; |
80 | argv += optind; | 81 | argv += optind; |
81 | 82 | ||
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c index 5986ab272..80a005821 100644 --- a/miscutils/nandwrite.c +++ b/miscutils/nandwrite.c | |||
@@ -123,13 +123,12 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv) | |||
123 | const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb; | 123 | const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb; |
124 | 124 | ||
125 | if (IS_NANDDUMP) { | 125 | if (IS_NANDDUMP) { |
126 | opt_complementary = "=1"; | 126 | opts = getopt32long(argv, "^" "ons:f:l:" "\0" "=1", |
127 | opts = getopt32long(argv, "ons:f:l:", | ||
128 | "bb\0" Required_argument "\xff", /* no short equivalent */ | 127 | "bb\0" Required_argument "\xff", /* no short equivalent */ |
129 | &opt_s, &opt_f, &opt_l, &opt_bb); | 128 | &opt_s, &opt_f, &opt_l, &opt_bb |
129 | ); | ||
130 | } else { /* nandwrite */ | 130 | } else { /* nandwrite */ |
131 | opt_complementary = "-1:?2"; | 131 | opts = getopt32(argv, "^" "pns:" "\0" "-1:?2", &opt_s); |
132 | opts = getopt32(argv, "pns:", &opt_s); | ||
133 | } | 132 | } |
134 | argv += optind; | 133 | argv += optind; |
135 | 134 | ||
diff --git a/miscutils/setserial.c b/miscutils/setserial.c index 2000de7b1..f217c3beb 100644 --- a/miscutils/setserial.c +++ b/miscutils/setserial.c | |||
@@ -742,8 +742,7 @@ int setserial_main(int argc UNUSED_PARAM, char **argv) | |||
742 | { | 742 | { |
743 | int opts; | 743 | int opts; |
744 | 744 | ||
745 | opt_complementary = "-1:b-aG:G-ab:a-bG"; | 745 | opts = getopt32(argv, "^" "bGavzgq" "\0" "-1:b-aG:G-ab:a-bG"); |
746 | opts = getopt32(argv, "bGavzgq"); | ||
747 | argv += optind; | 746 | argv += optind; |
748 | 747 | ||
749 | if (!argv[1]) /* one arg only? (nothing to change?) */ | 748 | if (!argv[1]) /* one arg only? (nothing to change?) */ |
diff --git a/miscutils/time.c b/miscutils/time.c index 0ecdac1a6..65dbcdcf3 100644 --- a/miscutils/time.c +++ b/miscutils/time.c | |||
@@ -430,9 +430,10 @@ int time_main(int argc UNUSED_PARAM, char **argv) | |||
430 | OPT_f = (1 << 4), | 430 | OPT_f = (1 << 4), |
431 | }; | 431 | }; |
432 | 432 | ||
433 | opt_complementary = "-1"; /* at least one arg */ | ||
434 | /* "+": stop on first non-option */ | 433 | /* "+": stop on first non-option */ |
435 | opt = getopt32(argv, "+vpao:f:", &output_filename, &output_format); | 434 | opt = getopt32(argv, "^+" "vpao:f:" "\0" "-1"/*at least one arg*/, |
435 | &output_filename, &output_format | ||
436 | ); | ||
436 | argv += optind; | 437 | argv += optind; |
437 | if (opt & OPT_v) | 438 | if (opt & OPT_v) |
438 | output_format = long_format; | 439 | output_format = long_format; |
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index 123551e94..d142d1144 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c | |||
@@ -145,20 +145,17 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv) | |||
145 | #define OPTION_a (1 << 5) | 145 | #define OPTION_a (1 << 5) |
146 | #define OPTION_t (1 << 6) | 146 | #define OPTION_t (1 << 6) |
147 | if (do_mkvol) { | 147 | if (do_mkvol) { |
148 | opt_complementary = "-1"; | 148 | opts = getopt32(argv, "^" "md:+n:+N:s:a:+t:O:+" "\0" "-1", |
149 | opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+", | ||
150 | &dev_num, &vol_id, | 149 | &dev_num, &vol_id, |
151 | &vol_name, &size_bytes_str, &alignment, &type, | 150 | &vol_name, &size_bytes_str, &alignment, &type, |
152 | &vid_hdr_offset | 151 | &vid_hdr_offset |
153 | ); | 152 | ); |
154 | } else | 153 | } else |
155 | if (do_update) { | 154 | if (do_update) { |
156 | opt_complementary = "-1"; | 155 | opts = getopt32(argv, "^" "s:at" "\0" "-1", &size_bytes_str); |
157 | opts = getopt32(argv, "s:at", &size_bytes_str); | ||
158 | opts *= OPTION_s; | 156 | opts *= OPTION_s; |
159 | } else { | 157 | } else { |
160 | opt_complementary = "-1"; | 158 | opts = getopt32(argv, "^" "m:+d:+n:+N:s:a:+t:" "\0" "-1", |
161 | opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:", | ||
162 | &mtd_num, &dev_num, &vol_id, | 159 | &mtd_num, &dev_num, &vol_id, |
163 | &vol_name, &size_bytes_str, &alignment, &type | 160 | &vol_name, &size_bytes_str, &alignment, &type |
164 | ); | 161 | ); |
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index ec06bcb51..392d05646 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c | |||
@@ -101,8 +101,9 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv) | |||
101 | char *st_arg; | 101 | char *st_arg; |
102 | char *ht_arg; | 102 | char *ht_arg; |
103 | 103 | ||
104 | opt_complementary = "=1"; /* must have exactly 1 argument */ | 104 | opts = getopt32(argv, "^" "Ft:T:" "\0" "=1"/*must have exactly 1 arg*/, |
105 | opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg); | 105 | &st_arg, &ht_arg |
106 | ); | ||
106 | 107 | ||
107 | /* We need to daemonize *before* opening the watchdog as many drivers | 108 | /* We need to daemonize *before* opening the watchdog as many drivers |
108 | * will only allow one process at a time to do so. Since daemonizing | 109 | * will only allow one process at a time to do so. Since daemonizing |