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>

3 files changed, 6 insertions, 11 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 69816464d..d0269b9f4 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -72,12 +72,9 @@
 
 
 #define OPTSTR_AWK \
-        "F:v:f:" \
-        IF_FEATURE_AWK_GNU_EXTENSIONS("e:") \
+        "F:v:*f:*" \
+        IF_FEATURE_AWK_GNU_EXTENSIONS("e:*") \
         "W:"
-#define OPTCOMPLSTR_AWK \
-        "v::f::" \
-        IF_FEATURE_AWK_GNU_EXTENSIONS("e::")
 enum {
         OPTBIT_F,       /* define field separator */
         OPTBIT_v,       /* define variable */
@@ -3209,7 +3206,6 @@ int awk_main(int argc, char **argv)
                         *s1 = '=';
                 }
         }
-        opt_complementary = OPTCOMPLSTR_AWK;
         opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL);
         argv += optind;
         argc -= optind;
diff --git a/editors/diff.c b/editors/diff.c
index ff269360f..75229ad8c 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -982,11 +982,11 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         /* exactly 2 params; collect multiple -L <label>; -U N */
-        opt_complementary = "=2:L::U+";
+        opt_complementary = "=2";
 #if ENABLE_FEATURE_DIFF_LONG_OPTIONS
         applet_long_options = diff_longopts;
 #endif
-        getopt32(argv, "abdiL:NqrsS:tTU:wupBE",
+        getopt32(argv, "abdiL:*NqrsS:tTU:+wupBE",
                         &L_arg, &s_start, &opt_U_context);
         argv += optind;
         while (L_arg)
diff --git a/editors/sed.c b/editors/sed.c
index f37c37d88..c0d79cc7b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1503,8 +1503,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
         /* do normal option parsing */
         opt_e = opt_f = NULL;
         opt_i = NULL;
-        opt_complementary = "e::f::" /* can occur multiple times */
-                            "nn"; /* count -n */
+        opt_complementary = "nn"; /* count -n */
 
         IF_LONG_OPTS(applet_long_options = sed_longopts);
 
@@ -1513,7 +1512,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
          * GNU sed 4.2.1 mentions it in neither --help
          * nor manpage, but does recognize it.
          */
-        opt = getopt32(argv, "i::rEne:f:", &opt_i, &opt_e, &opt_f,
+        opt = getopt32(argv, "i::rEne:*f:*", &opt_i, &opt_e, &opt_f,
                             &G.be_quiet); /* counter for -n */
         //argc -= optind;
         argv += optind;