aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-08-08 21:55:02 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-08-08 21:55:02 +0200
commit22542eca18e5807b72ddc78999f5101e33f17a53 (patch)
tree1271842a37c6215c998674a44bf7f561a0deff52 /archival
parent036585a911a5fe6c2cd77b808dd9150500f37272 (diff)
downloadbusybox-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 'archival')
-rw-r--r--archival/ar.c11
-rw-r--r--archival/bzip2.c8
-rw-r--r--archival/dpkg_deb.c5
-rw-r--r--archival/lzop.c2
-rw-r--r--archival/tar.c25
5 files changed, 28 insertions, 23 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 46c10aad4..027cd6b5a 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -243,10 +243,13 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
243 /* prepend '-' to the first argument if required */ 243 /* prepend '-' to the first argument if required */
244 if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') 244 if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
245 argv[1] = xasprintf("-%s", argv[1]); 245 argv[1] = xasprintf("-%s", argv[1]);
246 /* -1: at least one param is reqd */ 246 opt = getopt32(argv, "^"
247 /* one of p,t,x[,r] is required */ 247 "voc""ptx"IF_FEATURE_AR_CREATE("r")
248 opt_complementary = "-1:p:t:x"IF_FEATURE_AR_CREATE(":r"); 248 "\0"
249 opt = getopt32(argv, "voc""ptx"IF_FEATURE_AR_CREATE("r")); 249 /* -1: at least one arg is reqd */
250 /* one of p,t,x[,r] is required */
251 "-1:p:t:x"IF_FEATURE_AR_CREATE(":r")
252 );
250 argv += optind; 253 argv += optind;
251 254
252 t = opt / FIRST_CMD; 255 t = opt / FIRST_CMD;
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 0b9c508df..d578eb7ad 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -195,9 +195,11 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
195 * --best alias for -9 195 * --best alias for -9
196 */ 196 */
197 197
198 opt_complementary = "s2"; /* -s means -2 (compatibility) */ 198 opt = getopt32(argv, "^"
199 /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ 199 /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
200 opt = getopt32(argv, "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs"); 200 "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs"
201 "\0" "s2" /* -s means -2 (compatibility) */
202 );
201#if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */ 203#if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */
202 if (opt & 0x30) // -d and/or -t 204 if (opt & 0x30) // -d and/or -t
203 return bunzip2_main(argc, argv); 205 return bunzip2_main(argc, argv);
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 029bc4af1..f6bf9eb04 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -80,8 +80,9 @@ int dpkg_deb_main(int argc UNUSED_PARAM, char **argv)
80#endif 80#endif
81 81
82 /* Must have 1 or 2 args */ 82 /* Must have 1 or 2 args */
83 opt_complementary = "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"; 83 opt = getopt32(argv, "^" "cefXx"
84 opt = getopt32(argv, "cefXx"); 84 "\0" "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"
85 );
85 argv += optind; 86 argv += optind;
86 //argc -= optind; 87 //argc -= optind;
87 88
diff --git a/archival/lzop.c b/archival/lzop.c
index df18ff170..1bf954f4f 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -1138,7 +1138,7 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
1138 /* -U is "anti -k", invert bit for bbunpack(): */ 1138 /* -U is "anti -k", invert bit for bbunpack(): */
1139 option_mask32 ^= OPT_KEEP; 1139 option_mask32 ^= OPT_KEEP;
1140 /* -k disables -U (if any): */ 1140 /* -k disables -U (if any): */
1141 /* opt_complementary = "k-U"; - nope, only handles -Uk, not -kU */ 1141 /* opt_complementary "k-U"? - nope, only handles -Uk, not -kU */
1142 if (option_mask32 & OPT_k) 1142 if (option_mask32 & OPT_k)
1143 option_mask32 |= OPT_KEEP; 1143 option_mask32 |= OPT_KEEP;
1144 1144
diff --git a/archival/tar.c b/archival/tar.c
index 44ab246c0..73c14ca81 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -973,18 +973,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
973 /* Prepend '-' to the first argument if required */ 973 /* Prepend '-' to the first argument if required */
974 if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') 974 if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
975 argv[1] = xasprintf("-%s", argv[1]); 975 argv[1] = xasprintf("-%s", argv[1]);
976 opt_complementary =
977 "tt:vv:" // count -t,-v
978#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
979 "\xff::" // --exclude=PATTERN is a list
980#endif
981 IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
982 IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
983 IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
984#if ENABLE_FEATURE_TAR_LONG_OPTIONS
985 ":\xf9+" // --strip-components=NUM
986#endif
987 ;
988#if ENABLE_DESKTOP 976#if ENABLE_DESKTOP
989 /* Lie to buildroot when it starts asking stupid questions. */ 977 /* Lie to buildroot when it starts asking stupid questions. */
990 if (argv[1] && strcmp(argv[1], "--version") == 0) { 978 if (argv[1] && strcmp(argv[1], "--version") == 0) {
@@ -1021,7 +1009,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1021 } 1009 }
1022 } 1010 }
1023#endif 1011#endif
1024 opt = GETOPT32(argv, 1012 opt = GETOPT32(argv, "^"
1025 "txC:f:Oopvk" 1013 "txC:f:Oopvk"
1026 IF_FEATURE_TAR_CREATE( "ch" ) 1014 IF_FEATURE_TAR_CREATE( "ch" )
1027 IF_FEATURE_SEAMLESS_BZ2( "j" ) 1015 IF_FEATURE_SEAMLESS_BZ2( "j" )
@@ -1032,6 +1020,17 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1032 IF_FEATURE_SEAMLESS_Z( "Z" ) 1020 IF_FEATURE_SEAMLESS_Z( "Z" )
1033 IF_FEATURE_TAR_NOPRESERVE_TIME("m") 1021 IF_FEATURE_TAR_NOPRESERVE_TIME("m")
1034 IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components 1022 IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
1023 "\0"
1024 "tt:vv:" // count -t,-v
1025#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
1026 "\xff::" // --exclude=PATTERN is a list
1027#endif
1028 IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
1029 IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
1030 IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
1031#if ENABLE_FEATURE_TAR_LONG_OPTIONS
1032 ":\xf9+" // --strip-components=NUM
1033#endif
1035 LONGOPTS 1034 LONGOPTS
1036 , &base_dir // -C dir 1035 , &base_dir // -C dir
1037 , &tar_filename // -f filename 1036 , &tar_filename // -f filename
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-14 13:58:25 +0000