6 files changed, 32 insertions, 25 deletions
diff --git a/editors/awk.c b/editors/awk.c
index 56688d72c..2fc7d6102 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -70,7 +70,11 @@
 #endif
-#define OPTSTR_AWK \
+/* "+": stop on first non-option:
+ * $ awk 'BEGIN { for(i=1; i<ARGC; ++i) { print i ": " ARGV[i] }}' -argz
+ * 1: -argz
+ */
+#define OPTSTR_AWK "+" \
        "F:v:*f:*" \
        IF_FEATURE_AWK_GNU_EXTENSIONS("e:*") \
        "W:"
@@ -230,7 +234,7 @@ typedef struct tsplitter_s {
 */
 #define TC_LENGTH       (1 << 20)
 #define TC_GETLINE      (1 << 21)
-#define TC_FUNCDECL     (1 << 22)               /* `function' `func' */
+#define TC_FUNCDECL     (1 << 22)               /* 'function' 'func' */
 #define TC_BEGIN        (1 << 23)
 #define TC_END          (1 << 24)
 #define TC_EOF          (1 << 25)
diff --git a/editors/cmp.c b/editors/cmp.c
index f53d9603c..ec86c0ce2 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -36,7 +36,7 @@ static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"u, line %u
 // This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%"OFF_FMT"u %o %o\n"
 static const char fmt_l_opt[] ALIGN1 = "%.0s%.0s%"OFF_FMT"u %3o %3o\n";
-static const char opt_chars[] ALIGN1 = "sl";
+#define OPT_STR "sl"
 #define CMP_OPT_s (1<<0)
 #define CMP_OPT_l (1<<1)
@@ -52,11 +52,13 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
        unsigned opt;
        int retval = 0;
-        opt_complementary = "-1"
+        opt = getopt32(argv, "^"
+                        OPT_STR
+                        "\0" "-1"
                        IF_DESKTOP(":?4")
                        IF_NOT_DESKTOP(":?2")
-                        ":l--s:s--l";
+                        ":l--s:s--l"
-        opt = getopt32(argv, opt_chars);
+        );
        argv += optind;
        filename1 = *argv;
diff --git a/editors/diff.c b/editors/diff.c
index 62f558944..1ff399ffb 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -988,6 +988,11 @@ static const char diff_longopts[] ALIGN1 =
        "starting-file\0"            Required_argument "S"
        "minimal\0"                  No_argument       "d"
        ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,diff_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -1000,11 +1005,8 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
        /* exactly 2 params; collect multiple -L <label>; -U N */
-        opt_complementary = "=2";
+        GETOPT32(argv, "^" "abdiL:*NqrsS:tTU:+wupBE" "\0" "=2"
-#if ENABLE_FEATURE_DIFF_LONG_OPTIONS
+                        LONGOPTS,
-        applet_long_options = diff_longopts;
-#endif
-        getopt32(argv, "abdiL:*NqrsS:tTU:+wupBE",
                        &L_arg, &s_start, &opt_U_context);
        argv += optind;
        while (L_arg)
diff --git a/editors/ed.c b/editors/ed.c
index 7f21ded92..05797692c 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -360,7 +360,7 @@ static void addLines(int num)
                 * 0  on ctrl-C,
                 * >0 length of input string, including terminating '\n'
                 */
-                len = read_line_input(NULL, "", buf, sizeof(buf), /*timeout*/ -1);
+                len = read_line_input(NULL, "", buf, sizeof(buf));
                if (len <= 0) {
                        /* Previously, ctrl-C was exiting to shell.
                         * Now we exit to ed prompt. Is in important? */
@@ -789,7 +789,7 @@ static void doCommands(void)
                 * 0  on ctrl-C,
                 * >0 length of input string, including terminating '\n'
                 */
-                len = read_line_input(NULL, ": ", buf, sizeof(buf), /*timeout*/ -1);
+                len = read_line_input(NULL, ": ", buf, sizeof(buf));
                if (len <= 0)
                        return;
                while (len && isspace(buf[--len]))
@@ -892,7 +892,7 @@ static void doCommands(void)
                        }
                        if (!dirty)
                                return;
-                        len = read_line_input(NULL, "Really quit? ", buf, 16, /*timeout*/ -1);
+                        len = read_line_input(NULL, "Really quit? ", buf, 16);
                        /* read error/EOF - no way to continue */
                        if (len < 0)
                                return;
diff --git a/editors/patch_bbox.c b/editors/patch_bbox.c
index aae7b7987..8e09ef488 100644
--- a/editors/patch_bbox.c
+++ b/editors/patch_bbox.c
@@ -111,10 +111,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                        "no-backup-if-mismatch\0" No_argument       "\xff" /*ignored*/
 # endif
                        ;
-                applet_long_options = patch_longopts;
 #endif
                /* -f,-E,-g are ignored */
-                opt = getopt32(argv, "p:i:RN""fEg:", &p, &i, NULL);
+                opt = getopt32long(argv, "p:i:RN""fEg:", patch_longopts, &p, &i, NULL);
                if (opt & OPT_R)
                        plus = '-';
                patch_level = xatoi(p); /* can be negative! */
diff --git a/editors/sed.c b/editors/sed.c
index e10078b7c..d6e25aedc 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -68,8 +68,8 @@
 //applet:IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP))
 //usage:#define sed_trivial_usage
-//usage:       "[-inrE] [-f FILE]... [-e CMD]... [FILE]...\n"
+//usage:       "[-i[SFX]] [-nrE] [-f FILE]... [-e CMD]... [FILE]...\n"
-//usage:       "or: sed [-inrE] CMD [FILE]..."
+//usage:       "or: sed [-i[SFX]] [-nrE] CMD [FILE]..."
 //usage:#define sed_full_usage "\n\n"
 //usage:       "        -e CMD  Add CMD to sed commands to be executed"
 //usage:     "\n        -f FILE Add FILE contents to sed commands to be executed"
@@ -1512,21 +1512,21 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
        /* do normal option parsing */
        opt_e = opt_f = NULL;
        opt_i = NULL;
-        opt_complementary = "nn"; /* count -n */
-        IF_LONG_OPTS(applet_long_options = sed_longopts);
        /* -i must be first, to match OPT_in_place definition */
        /* -E is a synonym of -r:
         * 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 = getopt32long(argv, "^"
-                            &G.be_quiet); /* counter for -n */
+                        "i::rEne:*f:*"
+                        "\0" "nn"/*count -n*/,
+                        sed_longopts,
+                        &opt_i, &opt_e, &opt_f,
+                        &G.be_quiet); /* counter for -n */
        //argc -= optind;
        argv += optind;
        if (opt & OPT_in_place) { // -i
-                atexit(cleanup_outname);
+                die_func = cleanup_outname;
        }
        if (opt & (2|4))
                G.regex_type |= REG_EXTENDED; // -r or -E