getopt32: add new syntax of 'o:+' and 'o:*' for -o NUM and -o LIST

In many cases, this aqllows to drop use of opt_complementary.
Approximately -400 bytes:

function                                             old     new   delta
getopt32                                            1423    1502     +79
opt_string                                            17      18      +1
OPT_STR                                               24      25      +1
uniq_main                                            416     406     -10
timeout_main                                         279     269     -10
sulogin_main                                         270     260     -10
readprofile_main                                    1825    1815     -10
ps_main                                              543     533     -10
pidof_main                                           245     235     -10
pgrep_main                                           611     601     -10
od_main                                             2600    2590     -10
mkfs_minix_main                                     2684    2674     -10
mkfs_ext2_main                                      2603    2593     -10
microcom_main                                        712     702     -10
makemime_main                                        315     305     -10
ionice_main                                          282     272     -10
inetd_main                                          2074    2064     -10
ifplugd_main                                        1144    1134     -10
halt_main                                            353     343     -10
getopt_main                                          636     626     -10
fdisk_main                                          2854    2844     -10
env_main                                             206     196     -10
dmesg_main                                           319     309     -10
conspy_main                                         1214    1204     -10
awk_main                                             981     971     -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/22 up/down: 81/-220)         Total: -139 bytes
   text	   data	    bss	    dec	    hex	filename
 919373	    906	  14060	 934339	  e41c3	busybox_old
 918969	    906	  14060	 933935	  e402f	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/archival/tar.c b/archival/tar.c
index 7434e22e4..8e315c610 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -980,7 +980,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         /* Prepend '-' to the first argument if required */
         opt_complementary = "--:" // first arg is options
                 "tt:vv:" // count -t,-v
-                IF_FEATURE_TAR_FROM("X::T::") // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                 "\xff::" // --exclude=PATTERN is a list
 #endif
@@ -1032,13 +1031,13 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
 #endif
         opt = getopt32(argv,
                 "txC:f:Oopvk"
-                IF_FEATURE_TAR_CREATE(   "ch"  )
-                IF_FEATURE_SEAMLESS_BZ2( "j"   )
-                IF_FEATURE_SEAMLESS_LZMA("a"   )
-                IF_FEATURE_TAR_FROM(     "T:X:")
-                IF_FEATURE_SEAMLESS_GZ(  "z"   )
-                IF_FEATURE_SEAMLESS_XZ(  "J"   )
-                IF_FEATURE_SEAMLESS_Z(   "Z"   )
+                IF_FEATURE_TAR_CREATE(   "ch"    )
+                IF_FEATURE_SEAMLESS_BZ2( "j"     )
+                IF_FEATURE_SEAMLESS_LZMA("a"     )
+                IF_FEATURE_TAR_FROM(     "T:*X:*")
+                IF_FEATURE_SEAMLESS_GZ(  "z"     )
+                IF_FEATURE_SEAMLESS_XZ(  "J"     )
+                IF_FEATURE_SEAMLESS_Z(   "Z"     )
                 IF_FEATURE_TAR_NOPRESERVE_TIME("m")
                 IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
                 , &base_dir // -C dir