Merge branch 'busybox' into merge

56 files changed, 299 insertions, 327 deletions

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 390254512..7e35fa5ee 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -170,9 +170,11 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opts;
 
-        IF_FEATURE_CATV(opt_complementary = "Aetv"; /* -A == -vet */)
-        /* -u is ignored ("unbuffered") */
-        opts = getopt32(argv, IF_FEATURE_CATV("etvA") IF_FEATURE_CATN("nb") "u");
+        opts = getopt32(argv, IF_FEATURE_CATV("^")
+                /* -u is ignored ("unbuffered") */
+                IF_FEATURE_CATV("etvA")IF_FEATURE_CATN("nb")"u"
+                IF_FEATURE_CATV("\0" "Aetv" /* -A == -vet */)
+        );
         argv += optind;
 
         /* Read from stdin if there's nothing else to do. */
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 2174334d1..88989bf67 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -123,8 +123,7 @@ int chmod_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* Parse options */
-        opt_complementary = "-2";
-        getopt32(argv, ("-"OPT_STR) + 1); /* Reuse string */
+        getopt32(argv, "^" OPT_STR "\0" "-2");
         argv += optind;
 
         /* Restore option-like mode if needed */
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 1bfc725cc..985d18d6f 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -55,7 +55,7 @@
 /* This is a NOEXEC applet. Be very careful! */
 
 
-#define OPT_STR     ("Rh" IF_DESKTOP("vcfLHP"))
+#define OPT_STR     "Rh" IF_DESKTOP("vcfLHP")
 #define BIT_RECURSE 1
 #define OPT_RECURSE (opt & 1)
 #define OPT_NODEREF (opt & 2)
@@ -128,10 +128,10 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
         struct param_t param;
 
 #if ENABLE_FEATURE_CHOWN_LONG_OPTIONS
-        applet_long_options = chown_longopts;
+        opt = getopt32long(argv, "^" OPT_STR "\0" "=2", chown_longopts);
+#else
+        opt = getopt32(argv, "^" OPT_STR "\0" "=2");
 #endif
-        opt_complementary = "-2";
-        opt = getopt32(argv, OPT_STR);
         argv += optind;
 
         /* This matches coreutils behavior (almost - see below) */
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 44a587fe0..78751df84 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -11,9 +11,9 @@
 //config:       default y
 //config:       help
 //config:       chroot is used to change the root directory and run a command.
-//config:       The default command is `/bin/sh'.
+//config:       The default command is '/bin/sh'.
 
-//applet:IF_CHROOT(APPLET(chroot, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_CHROOT(APPLET_NOEXEC(chroot, chroot, BB_DIR_USR_SBIN, BB_SUID_DROP, chroot))
 
 //kbuild:lib-$(CONFIG_CHROOT) += chroot.o
 
@@ -40,6 +40,7 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
         ++argv;
         if (!*argv)
                 bb_show_usage();
+
         xchroot(*argv);
 
         ++argv;
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index c0cf65d2a..059a33310 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -13,6 +13,7 @@
 //config:       cksum is used to calculate the CRC32 checksum of a file.
 
 //applet:IF_CKSUM(APPLET_NOEXEC(cksum, cksum, BB_DIR_USR_BIN, BB_SUID_DROP, cksum))
+/* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
 
 //kbuild:lib-$(CONFIG_CKSUM) += cksum.o
 
diff --git a/coreutils/comm.c b/coreutils/comm.c
index 5be11468c..4bee77677 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -62,8 +62,7 @@ int comm_main(int argc UNUSED_PARAM, char **argv)
         int i;
         int order;
 
-        opt_complementary = "=2";
-        getopt32(argv, "123");
+        getopt32(argv, "^" "123" "\0" "=2");
         argv += optind;
 
         for (i = 0; i < 2; ++i) {
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 092e39583..5b34c27e7 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -73,15 +73,17 @@ int cp_main(int argc, char **argv)
 #endif
         };
 
-        // Need at least two arguments
-        // Soft- and hardlinking doesn't mix
-        // -P and -d are the same (-P is POSIX, -d is GNU)
-        // -r and -R are the same
-        // -R (and therefore -r) turns on -d (coreutils does this)
-        // -a = -pdR
-        opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR";
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
-        applet_long_options =
+        flags = getopt32long(argv, "^"
+                FILEUTILS_CP_OPTSTR
+                "\0"
+                // Need at least two arguments
+                // Soft- and hardlinking doesn't mix
+                // -P and -d are the same (-P is POSIX, -d is GNU)
+                // -r and -R are the same
+                // -R (and therefore -r) turns on -d (coreutils does this)
+                // -a = -pdR
+                "-2:l--s:s--l:Pd:rRd:Rd:apdR",
                 "archive\0"        No_argument "a"
                 "force\0"          No_argument "f"
                 "interactive\0"    No_argument "i"
@@ -94,9 +96,10 @@ int cp_main(int argc, char **argv)
                 "update\0"         No_argument "u"
                 "remove-destination\0" No_argument "\xff"
                 "parents\0"        No_argument "\xfe"
-                ;
-#endif
+        );
+#else
         flags = getopt32(argv, FILEUTILS_CP_OPTSTR);
+#endif
         /* Options of cp from GNU coreutils 6.10:
          * -a, --archive
          * -f, --force
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 6578ce8ce..cdd90ab44 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -42,7 +42,7 @@
 
 
 /* option vars */
-static const char optstring[] ALIGN1 = "b:c:f:d:sn";
+#define OPT_STR "b:c:f:d:sn"
 #define CUT_OPT_BYTE_FLGS     (1 << 0)
 #define CUT_OPT_CHAR_FLGS     (1 << 1)
 #define CUT_OPT_FIELDS_FLGS   (1 << 2)
@@ -201,8 +201,11 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
         char *sopt, *ltok;
         unsigned opt;
 
-        opt_complementary = "b--bcf:c--bcf:f--bcf";
-        opt = getopt32(argv, optstring, &sopt, &sopt, &sopt, &ltok);
+        opt = getopt32(argv, "^"
+                        OPT_STR
+                        "\0" "b--bcf:c--bcf:f--bcf",
+                        &sopt, &sopt, &sopt, &ltok
+        );
 //      argc -= optind;
         argv += optind;
         if (!(opt & (CUT_OPT_BYTE_FLGS | CUT_OPT_CHAR_FLGS | CUT_OPT_FIELDS_FLGS)))
diff --git a/coreutils/date.c b/coreutils/date.c
index 0fb9f1f00..5b15ce778 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -58,7 +58,8 @@
 //config:       the same format. With it on, 'date DATE' additionally supports
 //config:       MMDDhhmm[[YY]YY][.ss] format.
 
-//applet:IF_DATE(APPLET(date, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_DATE(APPLET_NOEXEC(date, date, BB_DIR_BIN, BB_SUID_DROP, date))
+/* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
 
 //kbuild:lib-$(CONFIG_DATE) += date.o
 
@@ -66,7 +67,7 @@
  * date [OPTION]... [+FORMAT]
  * date [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]
  * -d, --date=STRING
- *      display time described by STRING, not `now'
+ *      display time described by STRING, not 'now'
  * -f, --file=DATEFILE
  *      like --date once for each line of DATEFILE
  * -r, --reference=FILE
@@ -152,12 +153,6 @@ enum {
         OPT_HINT      = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
 };
 
-static void maybe_set_utc(int opt)
-{
-        if (opt & OPT_UTC)
-                putenv((char*)"TZ=UTC0");
-}
-
 #if ENABLE_LONG_OPTS
 static const char date_longopts[] ALIGN1 =
                 "rfc-822\0"   No_argument       "R"
@@ -170,6 +165,19 @@ static const char date_longopts[] ALIGN1 =
                 ;
 #endif
 
+/* We are a NOEXEC applet.
+ * Obstacles to NOFORK:
+ * - we change env
+ * - xasprintf result not freed
+ * - after xasprintf we use other xfuncs
+ */
+
+static void maybe_set_utc(int opt)
+{
+        if (opt & OPT_UTC)
+                putenv((char*)"TZ=UTC0");
+}
+
 int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int date_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -184,13 +192,16 @@ int date_main(int argc UNUSED_PARAM, char **argv)
         char *filename;
         char *isofmt_arg = NULL;
 
-        opt_complementary = "d--s:s--d"
-                IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
-        IF_LONG_OPTS(applet_long_options = date_longopts;)
-        opt = getopt32(argv, "Rs:ud:r:"
-                        IF_FEATURE_DATE_ISOFMT("I::D:"),
+        opt = getopt32long(argv, "^"
+                        "Rs:ud:r:"
+                        IF_FEATURE_DATE_ISOFMT("I::D:")
+                        "\0"
+                        "d--s:s--d"
+                        IF_FEATURE_DATE_ISOFMT(":R--I:I--R"),
+                        date_longopts,
                         &date_str, &date_str, &filename
-                        IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
+                        IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt)
+        );
         argv += optind;
         maybe_set_utc(opt);
 
diff --git a/coreutils/dd.c b/coreutils/dd.c
index f7f1c9564..9ea4897d5 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -19,7 +19,7 @@
 //config:       default y
 //config:       depends on DD
 //config:       help
-//config:       Sending a SIGUSR1 signal to a running `dd' process makes it
+//config:       Sending a SIGUSR1 signal to a running 'dd' process makes it
 //config:       print to standard error the number of records read and written
 //config:       so far, then to resume copying.
 //config:
diff --git a/coreutils/df.c b/coreutils/df.c
index 27dd2b5a8..121da970b 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -33,7 +33,7 @@
 //config:       -i Inodes
 //config:       -B <SIZE> Blocksize
 
-//applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_DF(APPLET_NOEXEC(df, df, BB_DIR_BIN, BB_SUID_DROP, df))
 
 //kbuild:lib-$(CONFIG_DF) += df.o
 
@@ -115,15 +115,18 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 
         init_unicode();
 
+        opt = getopt32(argv, "^"
+                        "kPT"
+                        IF_FEATURE_DF_FANCY("aiB:")
+                        IF_FEATURE_HUMAN_READABLE("hm")
+                        "\0"
 #if ENABLE_FEATURE_HUMAN_READABLE && ENABLE_FEATURE_DF_FANCY
-        opt_complementary = "k-mB:m-Bk:B-km";
+                        "k-mB:m-Bk:B-km"
 #elif ENABLE_FEATURE_HUMAN_READABLE
-        opt_complementary = "k-m:m-k";
+                        "k-m:m-k"
 #endif
-        opt = getopt32(argv, "kPT"
-                        IF_FEATURE_DF_FANCY("aiB:")
-                        IF_FEATURE_HUMAN_READABLE("hm")
-                        IF_FEATURE_DF_FANCY(, &chp));
+                        IF_FEATURE_DF_FANCY(, &chp)
+        );
         if (opt & OPT_MEGA)
                 df_disp_hr = 1024*1024;
 
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index a3d008051..9f098e41e 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -120,8 +120,7 @@ int dos2unix_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* -u convert to unix, -d convert to dos */
-        opt_complementary = "u--d:d--u"; /* mutually exclusive */
-        o = getopt32(argv, "du");
+        o = getopt32(argv, "^" "du" "\0" "u--d:d--u"); /* mutually exclusive */
 
         /* Do the conversion requested by an argument else do the default
          * conversion depending on our name.  */
diff --git a/coreutils/du.c b/coreutils/du.c
index 947c46e74..d5ce46cf2 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -242,8 +242,11 @@ int du_main(int argc UNUSED_PARAM, char **argv)
          * ignore -a.  This is consistent with -s being equivalent to -d 0.
          */
 #if ENABLE_FEATURE_HUMAN_READABLE
-        opt_complementary = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
-        opt = getopt32(argv, "aHkLsx" "d:+" "lc" "hm", &G.max_print_depth);
+        opt = getopt32(argv, "^"
+                        "aHkLsxd:+lchm"
+                        "\0" "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s",
+                        &G.max_print_depth
+        );
         argv += optind;
         if (opt & OPT_h_for_humans) {
                 G.disp_unit = 0;
@@ -255,8 +258,11 @@ int du_main(int argc UNUSED_PARAM, char **argv)
                 G.disp_unit = 1024;
         }
 #else
-        opt_complementary = "H-L:L-H:s-d:d-s";
-        opt = getopt32(argv, "aHkLsx" "d:+" "lc", &G.max_print_depth);
+        opt = getopt32(argv, "^"
+                        "aHkLsxd:+lc"
+                        "\0" "H-L:L-H:s-d:d-s",
+                        &G.max_print_depth
+        );
         argv += optind;
 #if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
         if (opt & OPT_k_kbytes) {
diff --git a/coreutils/echo.c b/coreutils/echo.c
index af33319a1..e45b90940 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -218,7 +218,7 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
diff --git a/coreutils/env.c b/coreutils/env.c
index 8def9c2da..20453e871 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -30,11 +30,6 @@
 //config:       env is used to set an environment variable and run
 //config:       a command; without options it displays the current
 //config:       environment.
-//config:
-//config:config FEATURE_ENV_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on ENV && LONG_OPTS
 
 //applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))
 
@@ -53,23 +48,17 @@
 
 #include "libbb.h"
 
-#if ENABLE_FEATURE_ENV_LONG_OPTIONS
-static const char env_longopts[] ALIGN1 =
-        "ignore-environment\0" No_argument       "i"
-        "unset\0"              Required_argument "u"
-        ;
-#endif
-
 int env_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int env_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opts;
         llist_t *unset_env = NULL;
 
-#if ENABLE_FEATURE_ENV_LONG_OPTIONS
-        applet_long_options = env_longopts;
-#endif
-        opts = getopt32(argv, "+iu:+", &unset_env);
+        opts = getopt32long(argv, "+iu:+",
+                        "ignore-environment\0" No_argument       "i"
+                        "unset\0"              Required_argument "u"
+                        , &unset_env
+        );
         argv += optind;
         if (argv[0] && LONE_DASH(argv[0])) {
                 opts |= 1;
@@ -129,7 +118,7 @@ int env_main(int argc UNUSED_PARAM, char **argv)
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 64f2a539d..91084b80b 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -26,21 +26,11 @@
 //config:       help
 //config:       By default, convert all tabs to spaces.
 //config:
-//config:config FEATURE_EXPAND_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on EXPAND && LONG_OPTS
-//config:
 //config:config UNEXPAND
 //config:       bool "unexpand (6 kb)"
 //config:       default y
 //config:       help
 //config:       By default, convert only leading sequences of blanks to tabs.
-//config:
-//config:config FEATURE_UNEXPAND_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on UNEXPAND && LONG_OPTS
 
 //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                   APPLET_ODDNAME:name      main    location        suid_type     help
@@ -53,29 +43,16 @@
 //usage:       "[-i] [-t N] [FILE]..."
 //usage:#define expand_full_usage "\n\n"
 //usage:       "Convert tabs to spaces, writing to stdout\n"
-//usage:        IF_FEATURE_EXPAND_LONG_OPTIONS(
-//usage:     "\n        -i,--initial    Don't convert tabs after non blanks"
-//usage:     "\n        -t,--tabs N     Tabstops every N chars"
-//usage:        )
-//usage:        IF_NOT_FEATURE_EXPAND_LONG_OPTIONS(
 //usage:     "\n        -i      Don't convert tabs after non blanks"
 //usage:     "\n        -t      Tabstops every N chars"
-//usage:        )
 
 //usage:#define unexpand_trivial_usage
 //usage:       "[-fa][-t N] [FILE]..."
 //usage:#define unexpand_full_usage "\n\n"
 //usage:       "Convert spaces to tabs, writing to stdout\n"
-//usage:        IF_FEATURE_UNEXPAND_LONG_OPTIONS(
-//usage:     "\n        -a,--all        Convert all blanks"
-//usage:     "\n        -f,--first-only Convert only leading blanks"
-//usage:     "\n        -t,--tabs N     Tabstops every N chars"
-//usage:        )
-//usage:        IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS(
 //usage:     "\n        -a      Convert all blanks"
 //usage:     "\n        -f      Convert only leading blanks"
 //usage:     "\n        -t N    Tabstops every N chars"
-//usage:        )
 
 #include "libbb.h"
 #include "unicode.h"
@@ -188,31 +165,24 @@ int expand_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         int exit_status = EXIT_SUCCESS;
 
-#if ENABLE_FEATURE_EXPAND_LONG_OPTIONS
-        static const char expand_longopts[] ALIGN1 =
-                /* name, has_arg, val */
-                "initial\0"          No_argument       "i"
-                "tabs\0"             Required_argument "t"
-        ;
-#endif
-#if ENABLE_FEATURE_UNEXPAND_LONG_OPTIONS
-        static const char unexpand_longopts[] ALIGN1 =
-                /* name, has_arg, val */
-                "first-only\0"       No_argument       "i"
-                "tabs\0"             Required_argument "t"
-                "all\0"              No_argument       "a"
-        ;
-#endif
         init_unicode();
 
         if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) {
-                IF_FEATURE_EXPAND_LONG_OPTIONS(applet_long_options = expand_longopts);
-                opt = getopt32(argv, "it:", &opt_t);
+                opt = getopt32long(argv, "it:",
+                                "initial\0"          No_argument       "i"
+                                "tabs\0"             Required_argument "t"
+                                , &opt_t
+                );
         } else {
-                IF_FEATURE_UNEXPAND_LONG_OPTIONS(applet_long_options = unexpand_longopts);
-                /* -t NUM sets also -a */
-                opt_complementary = "ta";
-                opt = getopt32(argv, "ft:a", &opt_t);
+                opt = getopt32long(argv, "^"
+                                "ft:a"
+                                "\0"
+                                "ta" /* -t NUM sets -a */,
+                                "first-only\0"       No_argument       "i"
+                                "tabs\0"             Required_argument "t"
+                                "all\0"              No_argument       "a"
+                                , &opt_t
+                );
                 /* -f --first-only is the default */
                 if (!(opt & OPT_ALL)) opt |= OPT_INITIAL;
         }
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 0cf2b9bd9..00bcf60d4 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -38,7 +38,7 @@
 //config:       the applet slightly larger, but will allow computation with very
 //config:       large numbers.
 
-//applet:IF_EXPR(APPLET(expr, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_EXPR(APPLET_NOEXEC(expr, expr, BB_DIR_USR_BIN, BB_SUID_DROP, expr))
 
 //kbuild:lib-$(CONFIG_EXPR) += expr.o
 
@@ -118,7 +118,10 @@ struct globals {
         char **args;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define INIT_G() do { setup_common_bufsiz(); } while (0)
+#define INIT_G() do { \
+        setup_common_bufsiz(); \
+        /* NB: noexec applet - globals not zeroed */ \
+} while (0)
 
 /* forward declarations */
 static VALUE *eval(void);
diff --git a/coreutils/id.c b/coreutils/id.c
index 6043bca61..5a7fb9aaf 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -170,9 +170,12 @@ int id_main(int argc UNUSED_PARAM, char **argv)
         } else {
                 /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/
                 /* Don't allow more than one username */
-                opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
-                        IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G");
-                opt = getopt32(argv, "rnugG" IF_SELINUX("Z"));
+                opt = getopt32(argv, "^"
+                        "rnugG" IF_SELINUX("Z")
+                        "\0"
+                        "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
+                        IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G")
+                );
         }
 
         username = argv[optind];
diff --git a/coreutils/install.c b/coreutils/install.c
index a1342bb13..2e4dc257f 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -55,12 +55,17 @@ static const char install_longopts[] ALIGN1 =
         "target-directory\0"    Required_argument "t"
 /* autofs build insists of using -b --suffix=.orig */
 /* TODO? (short option for --suffix is -S) */
-#if ENABLE_SELINUX
+# if ENABLE_SELINUX
         "context\0"             Required_argument "Z"
         "preserve_context\0"    No_argument       "\xff"
         "preserve-context\0"    No_argument       "\xff"
-#endif
+# endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS install_longopts,
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 
@@ -135,15 +140,17 @@ int install_main(int argc, char **argv)
 #endif
         };
 
-#if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
-        applet_long_options = install_longopts;
-#endif
-        opt_complementary = "t--d:d--t:s--d:d--s" IF_FEATURE_INSTALL_LONG_OPTIONS(IF_SELINUX(":Z--\xff:\xff--Z"));
         /* -c exists for backwards compatibility, it's needed */
         /* -b is ignored ("make a backup of each existing destination file") */
-        opts = getopt32(argv, "cvb" "Ddpsg:m:o:t:" IF_SELINUX("Z:"),
-                        &gid_str, &mode_str, &uid_str, &last
-                        IF_SELINUX(, &scontext));
+        opts = GETOPT32(argv, "^"
+                "cvb" "Ddpsg:m:o:t:" IF_SELINUX("Z:")
+                "\0"
+                "t--d:d--t:s--d:d--s"
+                IF_FEATURE_INSTALL_LONG_OPTIONS(IF_SELINUX(":Z--\xff:\xff--Z")),
+                LONGOPTS
+                &gid_str, &mode_str, &uid_str, &last
+                IF_SELINUX(, &scontext)
+        );
         argc -= optind;
         argv += optind;
 
diff --git a/coreutils/link.c b/coreutils/link.c
index 6e20dafe3..d8d583b7b 100644
--- a/coreutils/link.c
+++ b/coreutils/link.c
@@ -27,14 +27,12 @@
 int link_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int link_main(int argc UNUSED_PARAM, char **argv)
 {
-        opt_complementary = "=2"; /* exactly 2 params */
-        getopt32(argv, "");
+        getopt32(argv, "^" "" "\0" "=2");
         argv += optind;
         if (link(argv[0], argv[1]) != 0) {
                 /* shared message */
-                bb_perror_msg_and_die("can't create %slink "
-                                        "'%s' to '%s'", "hard",
-                                        argv[1], argv[0]
+                bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
+                        "hard", argv[1], argv[0]
                 );
         }
         return EXIT_SUCCESS;
diff --git a/coreutils/ln.c b/coreutils/ln.c
index fed96af42..2dda5dae9 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -62,8 +62,7 @@ int ln_main(int argc, char **argv)
         struct stat statbuf;
         int (*link_func)(const char *, const char *);
 
-        opt_complementary = "-1"; /* min one arg */
-        opts = getopt32(argv, "sfnbS:vT", &suffix);
+        opts = getopt32(argv, "^" "sfnbS:vT" "\0" "-1", &suffix);
 
         last = argv[argc - 1];
         argv += optind;
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 4c0944bb0..9f0462936 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -206,18 +206,18 @@ SPLIT_SUBDIR    = 2,
 /* -SXvhTw  GNU options, busybox optionally supports */
 /* -T WIDTH Ignored (we don't use tabs on output) */
 /* -Z       SELinux mandated option, busybox optionally supports */
-static const char ls_options[] ALIGN1 =
-        "Cadi1lgnsxAk"       /* 12 opts, total 12 */
-        IF_FEATURE_LS_FILETYPES("Fp")    /* 2, 14 */
-        IF_FEATURE_LS_RECURSIVE("R")     /* 1, 15 */
-        IF_SELINUX("Z")                  /* 1, 16 */
-        "Q"                              /* 1, 17 */
-        IF_FEATURE_LS_TIMESTAMPS("ctu")  /* 3, 20 */
-        IF_FEATURE_LS_SORTFILES("SXrv")  /* 4, 24 */
-        IF_FEATURE_LS_FOLLOWLINKS("LH")  /* 2, 26 */
-        IF_FEATURE_HUMAN_READABLE("h")   /* 1, 27 */
+#define ls_options \
+        "Cadi1lgnsxAk"       /* 12 opts, total 12 */ \
+        IF_FEATURE_LS_FILETYPES("Fp")    /* 2, 14 */ \
+        IF_FEATURE_LS_RECURSIVE("R")     /* 1, 15 */ \
+        IF_SELINUX("Z")                  /* 1, 16 */ \
+        "Q"                              /* 1, 17 */ \
+        IF_FEATURE_LS_TIMESTAMPS("ctu")  /* 3, 20 */ \
+        IF_FEATURE_LS_SORTFILES("SXrv")  /* 4, 24 */ \
+        IF_FEATURE_LS_FOLLOWLINKS("LH")  /* 2, 26 */ \
+        IF_FEATURE_HUMAN_READABLE("h")   /* 1, 27 */ \
         IF_FEATURE_LS_WIDTH("T:w:")      /* 2, 29 */
-;
+
 enum {
         OPT_C = (1 << 0),
         OPT_a = (1 << 1),
@@ -1093,25 +1093,26 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         /* process options */
-        IF_LONG_OPTS(applet_long_options = ls_longopts;)
-        opt_complementary =
-                /* -n and -g imply -l */
-                "nl:gl"
-                /* --full-time implies -l */
-                IF_FEATURE_LS_TIMESTAMPS(IF_LONG_OPTS(":\xff""l"))
-                /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html:
-                 * in some pairs of opts, only last one takes effect:
-                 */
-                IF_FEATURE_LS_TIMESTAMPS(IF_FEATURE_LS_SORTFILES(":t-S:S-t")) /* time/size */
-                // ":m-l:l-m" - we don't have -m
-                IF_FEATURE_LS_FOLLOWLINKS(":H-L:L-H")
-                ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */
-                ":C-1:1-C" /* bycols/oneline */
-                ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */
-                IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */
-                /* -w NUM: */
-                IF_FEATURE_LS_WIDTH(":w+");
-        opt = getopt32(argv, ls_options
+        opt = getopt32long(argv, "^"
+                ls_options
+                        "\0"
+                        /* -n and -g imply -l */
+                        "nl:gl"
+                        /* --full-time implies -l */
+                        IF_FEATURE_LS_TIMESTAMPS(IF_LONG_OPTS(":\xff""l"))
+                        /* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html:
+                         * in some pairs of opts, only last one takes effect:
+                         */
+                        IF_FEATURE_LS_TIMESTAMPS(IF_FEATURE_LS_SORTFILES(":t-S:S-t")) /* time/size */
+                        // ":m-l:l-m" - we don't have -m
+                        IF_FEATURE_LS_FOLLOWLINKS(":H-L:L-H")
+                        ":C-xl:x-Cl:l-xC" /* bycols/bylines/long */
+                        ":C-1:1-C" /* bycols/oneline */
+                        ":x-1:1-x" /* bylines/oneline (not in SuS, but in GNU coreutils 8.4) */
+                        IF_FEATURE_LS_TIMESTAMPS(":c-u:u-c") /* mtime/atime */
+                        /* -w NUM: */
+                        IF_FEATURE_LS_WIDTH(":w+")
+                , ls_longopts
                 IF_FEATURE_LS_WIDTH(, /*-T*/ NULL, /*-w*/ &G_terminal_width)
                 IF_FEATURE_LS_COLOR(, &color_opt)
         );
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index bcccdd64f..89d6cec0b 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -258,15 +258,14 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
-                /* -s and -w require -c */
-                opt_complementary = "s?c:w?c";
                 /* -b "binary", -t "text" are ignored (shaNNNsum compat) */
+                /* -s and -w require -c */
 #if ENABLE_SHA3SUM
                 if (applet_name[3] == HASH_SHA3)
-                        flags = getopt32(argv, "scwbta:+", &sha3_width);
+                        flags = getopt32(argv, "^" "scwbta:+" "\0" "s?c:w?c", &sha3_width);
                 else
 #endif
-                        flags = getopt32(argv, "scwbt");
+                        flags = getopt32(argv, "^" "scwbt" "\0" "s?c:w?c");
         } else {
 #if ENABLE_SHA3SUM
                 if (applet_name[3] == HASH_SHA3)
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 22851187c..986353dc6 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -18,11 +18,6 @@
 //config:       default y
 //config:       help
 //config:       mkdir is used to create directories with the specified names.
-//config:
-//config:config FEATURE_MKDIR_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on MKDIR && LONG_OPTS
 
 //applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))
 
@@ -53,19 +48,6 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
-#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-static const char mkdir_longopts[] ALIGN1 =
-        "mode\0"    Required_argument "m"
-        "parents\0" No_argument       "p"
-#if ENABLE_SELINUX
-        "context\0" Required_argument "Z"
-#endif
-#if ENABLE_FEATURE_VERBOSE
-        "verbose\0" No_argument       "v"
-#endif
-        ;
-#endif
-
 int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mkdir_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -78,10 +60,17 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
         security_context_t scontext;
 #endif
 
-#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-        applet_long_options = mkdir_longopts;
-#endif
-        opt = getopt32(argv, "m:pv" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+        opt = getopt32long(argv, "m:pv" IF_SELINUX("Z:"),
+                        "mode\0"    Required_argument "m"
+                        "parents\0" No_argument       "p"
+# if ENABLE_SELINUX
+                        "context\0" Required_argument "Z"
+# endif
+# if ENABLE_FEATURE_VERBOSE
+                        "verbose\0" No_argument       "v"
+# endif
+                        , &smode IF_SELINUX(,&scontext)
+        );
         if (opt & 1) {
                 mode_t mmode = bb_parse_mode(smode, 0777);
                 if (mmode == (mode_t)-1) {
diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c
index bfef0b4a6..d4ff883fa 100644
--- a/coreutils/mktemp.c
+++ b/coreutils/mktemp.c
@@ -36,7 +36,7 @@
 //config:       help
 //config:       mktemp is used to create unique temporary files
 
-//applet:IF_MKTEMP(APPLET(mktemp, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_MKTEMP(APPLET_NOEXEC(mktemp, mktemp, BB_DIR_BIN, BB_SUID_DROP, mktemp))
 
 //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o
 
@@ -80,8 +80,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
         if (!path || path[0] == '\0')
                 path = "/tmp";
 
-        opt_complementary = "?1"; /* 1 argument max */
-        opts = getopt32(argv, "dqtp:u", &path);
+        opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path);
 
         chp = argv[optind];
         if (!chp) {
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 147dd3bb2..10cbc506f 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -16,11 +16,6 @@
 //config:       default y
 //config:       help
 //config:       mv is used to move or rename files or directories.
-//config:
-//config:config FEATURE_MV_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on MV && LONG_OPTS
 
 //applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
 
@@ -41,23 +36,6 @@
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
-#if ENABLE_FEATURE_MV_LONG_OPTIONS
-static const char mv_longopts[] ALIGN1 =
-        "interactive\0" No_argument "i"
-        "force\0"       No_argument "f"
-        "no-clobber\0"  No_argument "n"
-        IF_FEATURE_VERBOSE(
-        "verbose\0"     No_argument "v"
-        )
-        ;
-#endif
-
-#define OPT_FORCE       (1 << 0)
-#define OPT_INTERACTIVE (1 << 1)
-#define OPT_NOCLOBBER   (1 << 2)
-#define OPT_VERBOSE     ((1 << 3) * ENABLE_FEATURE_VERBOSE)
-
-
 int mv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int mv_main(int argc, char **argv)
 {
@@ -69,15 +47,25 @@ int mv_main(int argc, char **argv)
         int status = 0;
         int copy_flag = 0;
 
-#if ENABLE_FEATURE_MV_LONG_OPTIONS
-        applet_long_options = mv_longopts;
-#endif
+#define OPT_FORCE       (1 << 0)
+#define OPT_INTERACTIVE (1 << 1)
+#define OPT_NOCLOBBER   (1 << 2)
+#define OPT_VERBOSE     ((1 << 3) * ENABLE_FEATURE_VERBOSE)
         /* Need at least two arguments.
          * If more than one of -f, -i, -n is specified , only the final one
          * takes effect (it unsets previous options).
          */
-        opt_complementary = "-2:f-in:i-fn:n-fi";
-        flags = getopt32(argv, "finv");
+        flags = getopt32long(argv, "^"
+                        "finv"
+                        "\0"
+                        "-2:f-in:i-fn:n-fi",
+                        "interactive\0" No_argument "i"
+                        "force\0"       No_argument "f"
+                        "no-clobber\0"  No_argument "n"
+                        IF_FEATURE_VERBOSE(
+                        "verbose\0"     No_argument "v"
+                        )
+        );
         argc -= optind;
         argv += optind;
         last = argv[argc - 1];
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 0bf055299..d6818cf00 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -12,7 +12,7 @@
 //config:       help
 //config:       nice runs a program with modified scheduling priority.
 
-//applet:IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_NICE(APPLET_NOEXEC(nice, nice, BB_DIR_BIN, BB_SUID_DROP, nice))
 
 //kbuild:lib-$(CONFIG_NICE) += nice.o
 
diff --git a/coreutils/nl.c b/coreutils/nl.c
index 93e78c490..c2f8b1042 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -57,14 +57,13 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
                 "starting-line-number\0"Required_argument "v"
                 "number-width\0"        Required_argument "w"
         ;
-
-        applet_long_options = nl_longopts;
 #endif
         ns.width = 6;
         ns.start = 1;
         ns.inc = 1;
         ns.sep = "\t";
-        getopt32(argv, "pw:+s:v:+i:+b:", &ns.width, &ns.sep, &ns.start, &ns.inc, &opt_b);
+        getopt32long(argv, "pw:+s:v:+i:+b:", nl_longopts,
+                        &ns.width, &ns.sep, &ns.start, &ns.inc, &opt_b);
         ns.all = (opt_b[0] == 'a');
         ns.nonempty = (opt_b[0] == 't');
         ns.empty_str = xasprintf("%*s\n", ns.width + (int)strlen(ns.sep), "");
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 8e28f9029..8a70ec4df 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -15,7 +15,7 @@
 //config:       help
 //config:       run a command immune to hangups, with output to a non-tty.
 
-//applet:IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_NOHUP(APPLET_NOEXEC(nohup, nohup, BB_DIR_USR_BIN, BB_SUID_DROP, nohup))
 
 //kbuild:lib-$(CONFIG_NOHUP) += nohup.o
 
@@ -31,12 +31,12 @@
 
 /* Compat info: nohup (GNU coreutils 6.8) does this:
 # nohup true
-nohup: ignoring input and appending output to `nohup.out'
+nohup: ignoring input and appending output to 'nohup.out'
 # nohup true 1>/dev/null
 nohup: ignoring input and redirecting stderr to stdout
 # nohup true 2>zz
 # cat zz
-nohup: ignoring input and appending output to `nohup.out'
+nohup: ignoring input and appending output to 'nohup.out'
 # nohup true 2>zz 1>/dev/null
 # cat zz
 nohup: ignoring input
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 68a831865..336b176ca 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -9,7 +9,7 @@
 //config:       help
 //config:       Print number of CPUs
 
-//applet:IF_NPROC(APPLET(nproc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_NPROC(APPLET_NOFORK(nproc, nproc, BB_DIR_USR_BIN, BB_SUID_DROP, nproc))
 
 //kbuild:lib-$(CONFIG_NPROC) += nproc.o
 
@@ -28,7 +28,6 @@ int nproc_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         unsigned long mask[1024];
         unsigned i, count = 0;
 
-        //applet_long_options = ...;
         //getopt32(argv, "");
 
         //if --all, count /sys/devices/system/cpu/cpuN dirs, else:
diff --git a/coreutils/od.c b/coreutils/od.c
index e3a68435b..9a888dd5f 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -223,7 +223,7 @@ int od_main(int argc, char **argv)
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 513c8ef37..df7354b7b 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -61,8 +61,8 @@ enum {
         OPT_traditional = (1 << 18) * ENABLE_LONG_OPTS,
 };
 
-#define OD_GETOPT32() getopt32(argv, \
-        "A:N:abcdfhij:lot:*vxsS:w:+:", \
+#define OD_GETOPT32() getopt32long(argv, \
+        "A:N:abcdfhij:lot:*vxsS:w:+:", od_longopts, \
         /* -w with optional param */ \
         /* -S was -s and also had optional parameter */ \
         /* but in coreutils 6.3 it was renamed and now has */ \
@@ -1220,9 +1220,6 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         address_pad_len_char = '7';
 
         /* Parse command line */
-#if ENABLE_LONG_OPTS
-        applet_long_options = od_longopts;
-#endif
         opt = OD_GETOPT32();
         argv += optind;
         if (opt & OPT_A) {
diff --git a/coreutils/printf.c b/coreutils/printf.c
index d3fc72adb..d1ff183d0 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -43,7 +43,7 @@
 //config:       default y
 //config:       help
 //config:       printf is used to format and print specified strings.
-//config:       It's similar to `echo' except it has more options.
+//config:       It's similar to 'echo' except it has more options.
 
 //applet:IF_PRINTF(APPLET_NOFORK(printf, printf, BB_DIR_USR_BIN, BB_SUID_DROP, printf))
 
diff --git a/coreutils/readlink.c b/coreutils/readlink.c
index 9690290e3..b8e327d11 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -20,7 +20,7 @@
 //config:       help
 //config:       Enable the readlink option (-f).
 
-//applet:IF_READLINK(APPLET(readlink, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_READLINK(APPLET_NOFORK(readlink, readlink, BB_DIR_USR_BIN, BB_SUID_DROP, readlink))
 
 //kbuild:lib-$(CONFIG_READLINK) += readlink.o
 
@@ -71,8 +71,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_READLINK_FOLLOW(
                 unsigned opt;
                 /* We need exactly one non-option argument.  */
-                opt_complementary = "=1";
-                opt = getopt32(argv, "fnvsq");
+                opt = getopt32(argv, "^" "fnvsq" "\0" "=1");
                 fname = argv[optind];
         )
         IF_NOT_FEATURE_READLINK_FOLLOW(
@@ -85,6 +84,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
         if (!(opt & 4)) /* not -v */
                 logmode = LOGMODE_NONE;
 
+        /* NOFORK: only one alloc is allowed; must free */
         if (opt & 1) { /* -f */
                 buf = xmalloc_realpath(fname);
         } else {
@@ -94,9 +94,7 @@ int readlink_main(int argc UNUSED_PARAM, char **argv)
         if (!buf)
                 return EXIT_FAILURE;
         printf((opt & 2) ? "%s" : "%s\n", buf);
-
-        if (ENABLE_FEATURE_CLEAN_UP)
-                free(buf);
+        free(buf);
 
         fflush_stdout_and_exit(EXIT_SUCCESS);
 }
diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index 6a61c3dc8..f9c630135 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -13,7 +13,7 @@
 //config:       Return the canonicalized absolute pathname.
 //config:       This isn't provided by GNU shellutils, but where else does it belong.
 
-//applet:IF_REALPATH(APPLET(realpath, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_REALPATH(APPLET_NOFORK(realpath, realpath, BB_DIR_USR_BIN, BB_SUID_DROP, realpath))
 
 //kbuild:lib-$(CONFIG_REALPATH) += realpath.o
 
@@ -36,6 +36,7 @@ int realpath_main(int argc UNUSED_PARAM, char **argv)
         }
 
         do {
+                /* NOFORK: only one alloc is allowed; must free */
                 char *resolved_path = xmalloc_realpath(*argv);
                 if (resolved_path != NULL) {
                         puts(resolved_path);
diff --git a/coreutils/rm.c b/coreutils/rm.c
index f91c94570..b68a82dc4 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -16,7 +16,8 @@
 //config:       help
 //config:       rm is used to remove files or directories.
 
-//applet:IF_RM(APPLET_NOFORK(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
+//applet:IF_RM(APPLET_NOEXEC(rm, rm, BB_DIR_BIN, BB_SUID_DROP, rm))
+/* was NOFORK, but then "rm -i FILE" can't be ^C'ed if run by hush */
 
 //kbuild:lib-$(CONFIG_RM) += rm.o
 
@@ -36,7 +37,7 @@
 
 #include "libbb.h"
 
-/* This is a NOFORK applet. Be very careful! */
+/* This is a NOEXEC applet. Be very careful! */
 
 int rm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rm_main(int argc UNUSED_PARAM, char **argv)
@@ -45,8 +46,7 @@ int rm_main(int argc UNUSED_PARAM, char **argv)
         int flags = 0;
         unsigned opt;
 
-        opt_complementary = "f-i:i-f";
-        opt = getopt32(argv, "fiRrv");
+        opt = getopt32(argv, "^" "fiRrv" "\0" "f-i:i-f");
         argv += optind;
         if (opt & 1)
                 flags |= FILEUTILS_FORCE;
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index c04ce78f8..955740494 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -11,14 +11,6 @@
 //config:       default y
 //config:       help
 //config:       rmdir is used to remove empty directories.
-//config:
-//config:config FEATURE_RMDIR_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on RMDIR && LONG_OPTS
-//config:       help
-//config:       Support long options for the rmdir applet, including
-//config:       --ignore-fail-on-non-empty for compatibility with GNU rmdir.
 
 //applet:IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, BB_DIR_BIN, BB_SUID_DROP, rmdir))
 
@@ -31,12 +23,9 @@
 //usage:       "[OPTIONS] DIRECTORY..."
 //usage:#define rmdir_full_usage "\n\n"
 //usage:       "Remove DIRECTORY if it is empty\n"
-//usage:        IF_FEATURE_RMDIR_LONG_OPTIONS(
-//usage:     "\n        -p|--parents    Include parents"
-//usage:     "\n        --ignore-fail-on-non-empty"
-//usage:        )
-//usage:        IF_NOT_FEATURE_RMDIR_LONG_OPTIONS(
 //usage:     "\n        -p      Include parents"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --ignore-fail-on-non-empty"
 //usage:        )
 //usage:
 //usage:#define rmdir_example_usage
@@ -49,7 +38,7 @@
 
 #define PARENTS          (1 << 0)
 #define VERBOSE          ((1 << 1) * ENABLE_FEATURE_VERBOSE)
-#define IGNORE_NON_EMPTY (1 << 2)
+#define IGNORE_NON_EMPTY ((1 << 2) * ENABLE_LONG_OPTS)
 
 int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rmdir_main(int argc UNUSED_PARAM, char **argv)
@@ -58,8 +47,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
         int flags;
         char *path;
 
-#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
-        static const char rmdir_longopts[] ALIGN1 =
+        flags = getopt32long(argv, "pv",
                 "parents\0"                  No_argument "p"
                 /* Debian etch: many packages fail to be purged or installed
                  * because they desperately want this option: */
@@ -67,10 +55,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
                 IF_FEATURE_VERBOSE(
                 "verbose\0"                  No_argument "v"
                 )
-                ;
-        applet_long_options = rmdir_longopts;
-#endif
-        flags = getopt32(argv, "pv");
+        );
         argv += optind;
 
         if (!*argv) {
@@ -86,7 +71,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
                         }
 
                         if (rmdir(path) < 0) {
-#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
                                 if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)
                                         break;
 #endif
diff --git a/coreutils/seq.c b/coreutils/seq.c
index f36dbb4ec..c26ff06b9 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -12,7 +12,8 @@
 //config:       help
 //config:       print a sequence of numbers
 
-//applet:IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
+//applet:IF_SEQ(APPLET_NOEXEC(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
+/* was NOFORK, but then "seq 1 999999999" can't be ^C'ed if run by hush */
 
 //kbuild:lib-$(CONFIG_SEQ) += seq.o
 
@@ -26,7 +27,7 @@
 
 #include "libbb.h"
 
-/* This is a NOFORK applet. Be very careful! */
+/* This is a NOEXEC applet. Be very careful! */
 
 int seq_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int seq_main(int argc, char **argv)
diff --git a/coreutils/shuf.c b/coreutils/shuf.c
index 403041534..d0caaa2ce 100644
--- a/coreutils/shuf.c
+++ b/coreutils/shuf.c
@@ -70,8 +70,11 @@ int shuf_main(int argc, char **argv)
         unsigned numlines;
         char eol;
 
-        opt_complementary = "e--i:i--e"; /* mutually exclusive */
-        opts = getopt32(argv, OPT_STR, &opt_i_str, &opt_n_str, &opt_o_str);
+        opts = getopt32(argv, "^"
+                        OPT_STR
+                        "\0" "e--i:i--e"/* mutually exclusive */,
+                        &opt_i_str, &opt_n_str, &opt_o_str
+        );
 
         argc -= optind;
         argv += optind;
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 9860dca64..ceea24491 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -94,7 +94,7 @@
 */
 
 /* These are sort types */
-static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:*t:";
+#define OPT_STR "ngMucszbrdfimS:T:o:k:*t:"
 enum {
         FLAG_n  = 1,            /* Numeric sort */
         FLAG_g  = 2,            /* Sort using strtod() */
@@ -378,9 +378,11 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
         xfunc_error_retval = 2;
 
         /* Parse command line options */
-        /* -o and -t can be given at most once */
-        opt_complementary = "o--o:t--t"; /* -t, -o: at most one of each */
-        opts = getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t);
+        opts = getopt32(argv, "^"
+                        OPT_STR
+                        "\0" "o--o:t--t"/*-t, -o: at most one of each*/,
+                        &str_ignored, &str_ignored, &str_o, &lst_k, &str_t
+        );
         /* global b strips leading and trailing spaces */
         if (opts & FLAG_b)
                 option_mask32 |= FLAG_bb;
diff --git a/coreutils/split.c b/coreutils/split.c
index d0c63573a..4e1db190c 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -100,8 +100,11 @@ int split_main(int argc UNUSED_PARAM, char **argv)
 
         setup_common_bufsiz();
 
-        opt_complementary = "?2"; /* max 2 args; -a N */
-        opt = getopt32(argv, "l:b:a:+", &count_p, &count_p, &suffix_len);
+        opt = getopt32(argv, "^"
+                        "l:b:a:+" /* -a N */
+                        "\0" "?2"/*max 2 args*/,
+                        &count_p, &count_p, &suffix_len
+        );
 
         if (opt & SPLIT_OPT_l)
                 cnt = XATOOFF(count_p);
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 96efa1d5d..177ced2f9 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -35,7 +35,7 @@
 //config:       Without this, stat will not support the '-f' option to display
 //config:       information about filesystem status.
 
-//applet:IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_STAT(APPLET_NOEXEC(stat, stat, BB_DIR_BIN, BB_SUID_DROP, stat))
 
 //kbuild:lib-$(CONFIG_STAT) += stat.o
 
@@ -761,11 +761,13 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         statfunc_ptr statfunc = do_stat;
 
-        opt_complementary = "-1"; /* min one arg */
-        opts = getopt32(argv, "tL"
+        opts = getopt32(argv, "^"
+                "tL"
                 IF_FEATURE_STAT_FILESYSTEM("f")
                 IF_SELINUX("Z")
-                IF_FEATURE_STAT_FORMAT("c:", &format)
+                IF_FEATURE_STAT_FORMAT("c:")
+                "\0" "-1" /* min one arg */
+                IF_FEATURE_STAT_FORMAT(,&format)
         );
 #if ENABLE_FEATURE_STAT_FILESYSTEM
         if (opts & OPT_FILESYS) /* -f */
diff --git a/coreutils/stty.c b/coreutils/stty.c
index f987fbbcf..57e2cc30d 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -25,7 +25,7 @@
 //config:       help
 //config:       stty is used to change and print terminal line settings.
 
-//applet:IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_STTY(APPLET_NOEXEC(stty, stty, BB_DIR_BIN, BB_SUID_DROP, stty))
 
 //kbuild:lib-$(CONFIG_STTY) += stty.o
 
@@ -782,12 +782,13 @@ struct globals {
         unsigned max_col;
         /* Current position, to know when to wrap */
         unsigned current_col;
-        char buf[10];
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         G.device_name = bb_msg_standard_input; \
         G.max_col = 80; \
+        G.current_col = 0; /* we are noexec, must clear */ \
 } while (0)
 
 static void set_speed_or_die(enum speed_setting type, const char *arg,
@@ -1018,6 +1019,8 @@ static void do_display(const struct termios *mode, int all)
 
         for (i = 0; i != CIDX_min; ++i) {
                 char ch;
+                char buf10[10];
+
                 /* If swtch is the same as susp, don't print both */
 #if VSWTCH == VSUSP
                 if (i == CIDX_swtch)
@@ -1033,10 +1036,10 @@ static void do_display(const struct termios *mode, int all)
 #endif
                 ch = mode->c_cc[control_info[i].offset];
                 if (ch == _POSIX_VDISABLE)
-                        strcpy(G.buf, "<undef>");
+                        strcpy(buf10, "<undef>");
                 else
-                        visible(ch, G.buf, 0);
-                wrapf("%s = %s;", nth_string(control_name, i), G.buf);
+                        visible(ch, buf10, 0);
+                wrapf("%s = %s;", nth_string(control_name, i), buf10);
         }
 #if VEOF == VMIN
         if ((mode->c_lflag & ICANON) == 0)
diff --git a/coreutils/sync.c b/coreutils/sync.c
index 66445281a..9be47ab64 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -59,8 +59,7 @@ int sync_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
                 OPT_SYNCFS   = (1 << 1),
         };
 
-        opt_complementary = "d--f:f--d";
-        opts = getopt32(argv, "df");
+        opts = getopt32(argv, "^" "df" "\0" "d--f:f--d");
         argv += optind;
 
         /* Handle the no-argument case. */
diff --git a/coreutils/tail.c b/coreutils/tail.c
index fd310f422..7335ba11e 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -140,9 +140,11 @@ int tail_main(int argc, char **argv)
 #endif
 
         /* -s NUM, -F imlies -f */
-        IF_FEATURE_FANCY_TAIL(opt_complementary = "Ff";)
-        opt = getopt32(argv, "fc:n:" IF_FEATURE_FANCY_TAIL("qs:+vF"),
-                        &str_c, &str_n IF_FEATURE_FANCY_TAIL(,&sleep_period));
+        opt = getopt32(argv, IF_FEATURE_FANCY_TAIL("^")
+                        "fc:n:"IF_FEATURE_FANCY_TAIL("qs:+vF")
+                        IF_FEATURE_FANCY_TAIL("\0" "Ff"),
+                        &str_c, &str_n IF_FEATURE_FANCY_TAIL(,&sleep_period)
+        );
 #define FOLLOW (opt & 0x1)
 #define COUNT_BYTES (opt & 0x2)
         //if (opt & 0x1) // -f
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 11b40d427..857761578 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -103,6 +103,11 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
                 "date\0"              Required_argument "d"
                 IF_FEATURE_TOUCH_NODEREF("no-dereference\0" No_argument "h")
         ;
+#  define GETOPT32 getopt32long
+#  define LONGOPTS ,touch_longopts
+# else
+#  define GETOPT32 getopt32
+#  define LONGOPTS
 # endif
         char *reference_file = NULL;
         char *date_str = NULL;
@@ -112,17 +117,17 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
 # define reference_file NULL
 # define date_str       NULL
 # define timebuf        ((struct timeval*)NULL)
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
-#if ENABLE_FEATURE_TOUCH_SUSV3 && ENABLE_LONG_OPTS
-        applet_long_options = touch_longopts;
-#endif
         /* -d and -t both set time. In coreutils,
          * accepted data format differs a bit between -d and -t.
          * We accept the same formats for both */
-        opts = getopt32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:")
+        opts = GETOPT32(argv, "c" IF_FEATURE_TOUCH_SUSV3("r:d:t:")
                                 IF_FEATURE_TOUCH_NODEREF("h")
                                 /*ignored:*/ "fma"
+                                LONGOPTS
                                 IF_FEATURE_TOUCH_SUSV3(, &reference_file)
                                 IF_FEATURE_TOUCH_SUSV3(, &date_str)
                                 IF_FEATURE_TOUCH_SUSV3(, &date_str)
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 64e4efc91..c5872434a 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -298,8 +298,8 @@ int tr_main(int argc UNUSED_PARAM, char **argv)
          * In POSIX locale, these are the same.
          */
 
-        opt_complementary = "-1";
-        opts = getopt32(argv, "+Ccds"); /* '+': stop at first non-option */
+        /* '+': stop at first non-option */
+        opts = getopt32(argv, "^+" "Ccds" "\0" "-1");
         argv += optind;
 
         str1_length = expand(*argv++, &str1);
diff --git a/coreutils/truncate.c b/coreutils/truncate.c
index f67abaf40..f693570aa 100644
--- a/coreutils/truncate.c
+++ b/coreutils/truncate.c
@@ -50,8 +50,7 @@ int truncate_main(int argc UNUSED_PARAM, char **argv)
                 OPT_SIZE = (1 << 1),
         };
 
-        opt_complementary = "s:-1";
-        opts = getopt32(argv, "cs:", &size_str);
+        opts = getopt32(argv, "^" "cs:" "\0" "s:-1", &size_str);
 
         if (!(opts & OPT_NOCREATE))
                 flags |= O_CREAT;
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 331941a01..18ad7c566 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -13,7 +13,7 @@
 //config:       tty is used to print the name of the current terminal to
 //config:       standard output.
 
-//applet:IF_TTY(APPLET(tty, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_TTY(APPLET_NOFORK(tty, tty, BB_DIR_USR_BIN, BB_SUID_DROP, tty))
 
 //kbuild:lib-$(CONFIG_TTY) += tty.o
 
diff --git a/coreutils/uname.c b/coreutils/uname.c
index aad58cab0..bb2d1fe8d 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -63,9 +63,9 @@
 //config:       help
 //config:       Same as uname -m.
 
-//applet:IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP))
-//                  APPLET_ODDNAME:name  main   location    suid_type     help
-//applet:IF_BB_ARCH(APPLET_ODDNAME(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch))
+//                  APPLET_NOFORK:name   main   location    suid_type     help
+//applet:IF_UNAME(APPLET_NOFORK(  uname, uname, BB_DIR_BIN, BB_SUID_DROP, uname))
+//applet:IF_BB_ARCH(APPLET_NOFORK(arch,  uname, BB_DIR_BIN, BB_SUID_DROP, arch))
 
 //kbuild:lib-$(CONFIG_UNAME)   += uname.o
 //kbuild:lib-$(CONFIG_BB_ARCH) += uname.o
@@ -147,8 +147,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         "operating-system\0"  No_argument       "o"
                 ;
 # endif
-                IF_LONG_OPTS(applet_long_options = uname_longopts);
-                toprint = getopt32(argv, options);
+                toprint = getopt32long(argv, options, uname_longopts);
                 if (argv[optind]) { /* coreutils-6.9 compat */
                         bb_show_usage();
                 }
@@ -183,7 +182,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 strcpy(uname_info.processor, unknown_str);
                 strcpy(uname_info.platform, unknown_str);
                 strcpy(uname_info.os, CONFIG_UNAME_OSNAME);
-# if 0
+# if ENABLE_FEDORA_COMPAT
                 /* Fedora does something like this */
                 strcpy(uname_info.processor, uname_info.name.machine);
                 strcpy(uname_info.platform, uname_info.name.machine);
diff --git a/coreutils/unlink.c b/coreutils/unlink.c
index 3322d5b47..56309b1c7 100644
--- a/coreutils/unlink.c
+++ b/coreutils/unlink.c
@@ -11,7 +11,7 @@
 //config:       help
 //config:       unlink deletes a file by calling unlink()
 
-//applet:IF_UNLINK(APPLET(unlink, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_UNLINK(APPLET_NOFORK(unlink, unlink, BB_DIR_USR_BIN, BB_SUID_DROP, unlink))
 
 //kbuild:lib-$(CONFIG_UNLINK) += unlink.o
 
@@ -25,8 +25,7 @@
 int unlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unlink_main(int argc UNUSED_PARAM, char **argv)
 {
-        opt_complementary = "=1"; /* must have exactly 1 param */
-        getopt32(argv, "");
+        getopt32(argv, "^" "" "\0" "=1");
         argv += optind;
         xunlink(argv[0]);
         return 0;
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index 7c25aada1..684ab781b 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -38,6 +38,13 @@ int usleep_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
         }
 
+        /* Safe wrt NOFORK? (noforks are not allowed to run for
+         * a long time). Try "usleep 99999999" + ^C + "echo $?"
+         * in hush with FEATURE_SH_NOFORK=y.
+         * At least on uclibc, usleep() thanslates to nanosleep()
+         * which returns early on any signal (even caught one),
+         * and uclibc does not loop back on EINTR.
+         */
         usleep(xatou(argv[1]));
 
         return EXIT_SUCCESS;
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 4e72e86ee..5ef05ee4d 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -120,8 +120,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
         char *outname = NULL;
         char *line;
 
-        opt_complementary = "?1"; /* 1 argument max */
-        getopt32(argv, "o:", &outname);
+        getopt32(argv, "^" "o:" "\0" "?1"/* 1 arg max*/, &outname);
         argv += optind;
 
         if (!argv[0])
@@ -196,8 +195,7 @@ int base64_main(int argc UNUSED_PARAM, char **argv)
         FILE *src_stream;
         unsigned opts;
 
-        opt_complementary = "?1"; /* 1 argument max */
-        opts = getopt32(argv, "d");
+        opts = getopt32(argv, "^" "d" "\0" "?1"/* 1 arg max*/);
         argv += optind;
 
         if (!argv[0])
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 7164f838a..d6e077430 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -49,8 +49,7 @@ int uuencode_main(int argc UNUSED_PARAM, char **argv)
 
         tbl = bb_uuenc_tbl_std;
         mode = 0666 & ~umask(0666);
-        opt_complementary = "-1:?2"; /* must have 1 or 2 args */
-        if (getopt32(argv, "m")) {
+        if (getopt32(argv, "^" "m" "\0" "-1:?2"/*must have 1 or 2 args*/)) {
                 tbl = bb_uuenc_tbl_base64;
         }
         argv += optind;
diff --git a/coreutils/who.c b/coreutils/who.c
index 91f99138c..cfe0c921e 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -38,10 +38,10 @@
 //config:       help
 //config:       Print users currently logged on.
 
-//                APPLET_ODDNAME:name   main location        suid_type     help
-//applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users))
-//applet:IF_W(    APPLET_ODDNAME(w,     who, BB_DIR_USR_BIN, BB_SUID_DROP, w))
-//applet:IF_WHO(  APPLET(        who,        BB_DIR_USR_BIN, BB_SUID_DROP))
+//                APPLET_NOEXEC:name   main location        suid_type     help
+//applet:IF_USERS(APPLET_NOEXEC(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users))
+//applet:IF_W(    APPLET_NOEXEC(w,     who, BB_DIR_USR_BIN, BB_SUID_DROP, w))
+//applet:IF_WHO(  APPLET_NOEXEC(who,   who, BB_DIR_USR_BIN, BB_SUID_DROP, who))
 
 //kbuild:lib-$(CONFIG_USERS) += who.o
 //kbuild:lib-$(CONFIG_W)     += who.o
@@ -117,8 +117,7 @@ int who_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         const char *fmt = "%s";
 
-        opt_complementary = "=0";
-        opt = getopt32(argv, do_who ? "aH" : "");
+        opt = getopt32(argv, do_who ? "^" "aH" "\0" "=0": "^" "" "\0" "=0");
         if ((opt & 2) || do_w) /* -H or we are w */
                 puts("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST");
 
diff --git a/coreutils/yes.c b/coreutils/yes.c
index a5a444249..6dc47355e 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -15,9 +15,10 @@
 //config:       default y
 //config:       help
 //config:       yes is used to repeatedly output a specific string, or
-//config:       the default string `y'.
+//config:       the default string 'y'.
 
-//applet:IF_YES(APPLET_NOFORK(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
+//applet:IF_YES(APPLET_NOEXEC(yes, yes, BB_DIR_USR_BIN, BB_SUID_DROP, yes))
+/* was NOFORK, but then yes can't be ^C'ed if run by hush */
 
 //kbuild:lib-$(CONFIG_YES) += yes.o