3 files changed, 6 insertions, 11 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 142ab670f..de3362cff 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 */
@@ -3213,7 +3210,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 b629e060a..2e99dc792 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1508,8 +1508,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);
 
@@ -1518,7 +1517,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;