Merge branch 'busybox' into merge

50 files changed, 419 insertions, 399 deletions

diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 3c3811752..4f491fa14 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -264,8 +264,12 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "df:e--e";
-        opts = getopt32(argv, "c:de:fl:a:M:" IF_FEATURE_PIDFILE("p:") IF_FEATURE_ACPID_COMPAT("g:m:s:S:v"),
+        opts = getopt32(argv, "^"
+                "c:de:fl:a:M:"
+                IF_FEATURE_PIDFILE("p:")
+                IF_FEATURE_ACPID_COMPAT("g:m:s:S:v")
+                "\0"
+                "df:e--e",
                 &opt_dir, &opt_input, &opt_logfile, &opt_action, &opt_map
                 IF_FEATURE_PIDFILE(, &opt_pidfile)
                 IF_FEATURE_ACPID_COMPAT(, NULL, NULL, NULL, NULL)
diff --git a/util-linux/blkdiscard.c b/util-linux/blkdiscard.c
index 8f6a4ab6c..5863f0aab 100644
--- a/util-linux/blkdiscard.c
+++ b/util-linux/blkdiscard.c
@@ -11,8 +11,9 @@
 //config:       help
 //config:       blkdiscard discards sectors on a given device.
 
+//applet:IF_BLKDISCARD(APPLET_NOEXEC(blkdiscard, blkdiscard, BB_DIR_USR_BIN, BB_SUID_DROP, blkdiscard))
+
 //kbuild:lib-$(CONFIG_BLKDISCARD) += blkdiscard.o
-//applet:IF_BLKDISCARD(APPLET(blkdiscard, BB_DIR_USR_BIN, BB_SUID_DROP))
 
 //usage:#define blkdiscard_trivial_usage
 //usage:       "[-o OFS] [-l LEN] [-s] DEVICE"
@@ -44,7 +45,6 @@ int blkdiscard_main(int argc UNUSED_PARAM, char **argv)
         uint64_t offset; /* Leaving these two variables out does not  */
         uint64_t length; /* shrink code size and hampers readability. */
         uint64_t range[2];
-//      struct stat st;
         int fd;
 
         enum {
@@ -53,8 +53,7 @@ int blkdiscard_main(int argc UNUSED_PARAM, char **argv)
                 OPT_SECURE = (1 << 2),
         };
 
-        opt_complementary = "=1";
-        opts = getopt32(argv, "o:l:s", &offset_str, &length_str);
+        opts = getopt32(argv, "^" "o:l:s" "\0" "=1", &offset_str, &length_str);
         argv += optind;
 
         fd = xopen(argv[0], O_RDWR|O_EXCL);
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index 0bd701aae..a56b69661 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -16,12 +16,12 @@
 //config:
 //config:config FEATURE_BLKID_TYPE
 //config:       bool "Print filesystem type"
-//config:       default n
+//config:       default y
 //config:       depends on BLKID
 //config:       help
 //config:       Show TYPE="filesystem type"
 
-//applet:IF_BLKID(APPLET(blkid, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_BLKID(APPLET_NOEXEC(blkid, blkid, BB_DIR_SBIN, BB_SUID_DROP, blkid))
 
 //kbuild:lib-$(CONFIG_BLKID) += blkid.o
 
diff --git a/util-linux/blockdev.c b/util-linux/blockdev.c
index 9e1fef206..e53ade995 100644
--- a/util-linux/blockdev.c
+++ b/util-linux/blockdev.c
@@ -11,7 +11,7 @@
 //config:       help
 //config:       Performs some ioctls with block devices.
 
-//applet:IF_BLOCKDEV(APPLET(blockdev, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_BLOCKDEV(APPLET_NOEXEC(blockdev, blockdev, BB_DIR_SBIN, BB_SUID_DROP, blockdev))
 
 //kbuild:lib-$(CONFIG_BLOCKDEV) += blockdev.o
 
diff --git a/util-linux/cal.c b/util-linux/cal.c
index 091fdbd2b..10df0ae8b 100644
--- a/util-linux/cal.c
+++ b/util-linux/cal.c
@@ -376,7 +376,7 @@ static char *build_row(char *p, unsigned *dp)
  *    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/util-linux/chrt.c b/util-linux/chrt.c
index 4bc8b6cfa..2712ea3e3 100644
--- a/util-linux/chrt.c
+++ b/util-linux/chrt.c
@@ -12,7 +12,7 @@
 //config:       manipulate real-time attributes of a process.
 //config:       This requires sched_{g,s}etparam support in your libc.
 
-//applet:IF_CHRT(APPLET(chrt, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_CHRT(APPLET_NOEXEC(chrt, chrt, BB_DIR_USR_BIN, BB_SUID_DROP, chrt))
 
 //kbuild:lib-$(CONFIG_CHRT) += chrt.o
 
@@ -77,8 +77,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
         int policy = SCHED_RR;
 
         /* only one policy accepted */
-        opt_complementary = "r--fo:f--ro:o--rf";
-        opt = getopt32(argv, "+mprfo");
+        opt = getopt32(argv, "^+" "mprfo" "\0" "r--fo:f--ro:o--rf");
         if (opt & OPT_m) { /* print min/max and exit */
                 show_min_max(SCHED_FIFO);
                 show_min_max(SCHED_RR);
diff --git a/util-linux/eject.c b/util-linux/eject.c
index 8095cbef0..6c30facd2 100644
--- a/util-linux/eject.c
+++ b/util-linux/eject.c
@@ -124,8 +124,9 @@ int eject_main(int argc UNUSED_PARAM, char **argv)
         unsigned flags;
         const char *device;
 
-        opt_complementary = "?1:t--T:T--t";
-        flags = getopt32(argv, "tT" IF_FEATURE_EJECT_SCSI("s"));
+        flags = getopt32(argv, "^" "tT"IF_FEATURE_EJECT_SCSI("s")
+                        "\0" "?1:t--T:T--t"
+        );
         device = argv[optind] ? argv[optind] : "/dev/cdrom";
 
         /* We used to do "umount <device>" here, but it was buggy
diff --git a/util-linux/fallocate.c b/util-linux/fallocate.c
index 70e7e178f..1a02a322f 100644
--- a/util-linux/fallocate.c
+++ b/util-linux/fallocate.c
@@ -82,8 +82,7 @@ int fallocate_main(int argc UNUSED_PARAM, char **argv)
         int fd;
 
         /* exactly one non-option arg */
-        opt_complementary = "=1";
-        opts = getopt32(argv, "l:o:", &str_l, &str_o);
+        opts = getopt32(argv, "^" "l:o:" "\0" "=1", &str_l, &str_o);
         if (!(opts & 1))
                 bb_show_usage();
 
diff --git a/util-linux/fatattr.c b/util-linux/fatattr.c
index 9fb566d5a..770b1d2f9 100644
--- a/util-linux/fatattr.c
+++ b/util-linux/fatattr.c
@@ -15,7 +15,7 @@
 //config:       help
 //config:       fatattr lists or changes the file attributes on a fat file system.
 
-//applet:IF_FATATTR(APPLET(fatattr, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_FATATTR(APPLET_NOEXEC(fatattr, fatattr, BB_DIR_BIN, BB_SUID_DROP, fatattr))
 
 //kbuild:lib-$(CONFIG_FATATTR) += fatattr.o
 
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 6faaf1b10..855269c30 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -66,8 +66,7 @@ int fdformat_main(int argc UNUSED_PARAM, char **argv)
         struct floppy_struct param;
         struct format_descr descr;
 
-        opt_complementary = "=1"; /* must have 1 param */
-        verify = !getopt32(argv, "n");
+        verify = !getopt32(argv, "^" "n" "\0" "=1");
         argv += optind;
 
         xstat(*argv, &st);
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index e00f85864..c4318b6c4 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -644,7 +644,7 @@ read_line(const char *prompt)
 {
         int sz;
 
-        sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer), /*timeout*/ -1);
+        sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer));
         if (sz <= 0)
                 exit(EXIT_SUCCESS); /* Ctrl-D or Ctrl-C */
 
@@ -2848,7 +2848,7 @@ xselect(void)
                         if (dos_compatible_flag) {
                                 sector_offset = g_sectors;
                                 puts("Warning: setting sector offset for DOS "
-                                        "compatiblity");
+                                        "compatibility");
                         }
                         update_units();
                         break;
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index 89f1f323c..1141b7801 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -18,7 +18,7 @@
  *    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/util-linux/flock.c b/util-linux/flock.c
index ec35af18f..dd0bfd430 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -38,17 +38,15 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
         };
 
 #if ENABLE_LONG_OPTS
-        static const char getopt_longopts[] ALIGN1 =
+        static const char flock_longopts[] ALIGN1 =
                 "shared\0"      No_argument       "s"
                 "exclusive\0"   No_argument       "x"
                 "unlock\0"      No_argument       "u"
                 "nonblock\0"    No_argument       "n"
                 ;
-        applet_long_options = getopt_longopts;
 #endif
-        opt_complementary = "-1";
 
-        opt = getopt32(argv, "+sxnu");
+        opt = getopt32long(argv, "^+" "sxnu" "\0" "-1", flock_longopts);
         argv += optind;
 
         if (argv[1]) {
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 55187cb40..6752e49d8 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -33,9 +33,9 @@
 //config:       ramdisk. If you have no use for freeing memory from a ramdisk, leave
 //config:       this disabled.
 
-//                  APPLET_ODDNAME:name     main         location    suid_type     help
-//applet:IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush))
-//applet:IF_FREERAMDISK(APPLET(freeramdisk, BB_DIR_SBIN, BB_SUID_DROP))
+//                     APPLET_ODDNAME:name         main         location     suid_type     help
+//applet:IF_FDFLUSH(   APPLET_ODDNAME(fdflush,     freeramdisk, BB_DIR_BIN,  BB_SUID_DROP, fdflush    ))
+//applet:IF_FREERAMDISK(APPLET_NOEXEC(freeramdisk, freeramdisk, BB_DIR_SBIN, BB_SUID_DROP, freeramdisk))
 
 //kbuild:lib-$(CONFIG_FDFLUSH) += freeramdisk.o
 //kbuild:lib-$(CONFIG_FREERAMDISK) += freeramdisk.o
@@ -67,8 +67,12 @@ int freeramdisk_main(int argc UNUSED_PARAM, char **argv)
         fd = xopen(single_argv(argv), O_RDWR);
 
         // Act like freeramdisk, fdflush, or both depending on configuration.
-        ioctl_or_perror_and_die(fd, (ENABLE_FREERAMDISK && applet_name[1] == 'r')
-                        || !ENABLE_FDFLUSH ? BLKFLSBUF : FDFLUSH, NULL, "%s", argv[1]);
+        ioctl_or_perror_and_die(fd,
+                ((ENABLE_FREERAMDISK && applet_name[1] == 'r') || !ENABLE_FDFLUSH)
+                                ? BLKFLSBUF
+                                : FDFLUSH,
+                NULL, "%s", argv[1]
+        );
 
         if (ENABLE_FEATURE_CLEAN_UP) close(fd);
 
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 8c2b7d8de..c4612f251 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -173,7 +173,10 @@ struct globals {
 
         /* Bigger stuff */
         struct termios sv_termios;
-        char superblock_buffer[BLOCK_SIZE];
+        union {
+                char superblock_buffer[BLOCK_SIZE];
+                struct minix_superblock Super;
+        } u;
         char add_zone_ind_blk[BLOCK_SIZE];
         char add_zone_dind_blk[BLOCK_SIZE];
         IF_FEATURE_MINIX2(char add_zone_tind_blk[BLOCK_SIZE];)
@@ -207,7 +210,7 @@ struct globals {
 #define name_depth         (G.name_depth         )
 #define name_component     (G.name_component     )
 #define sv_termios         (G.sv_termios         )
-#define superblock_buffer  (G.superblock_buffer )
+#define superblock_buffer  (G.u.superblock_buffer)
 #define add_zone_ind_blk   (G.add_zone_ind_blk   )
 #define add_zone_dind_blk  (G.add_zone_dind_blk  )
 #define add_zone_tind_blk  (G.add_zone_tind_blk  )
@@ -247,7 +250,7 @@ enum {
 #define Inode1 (((struct minix1_inode *) inode_buffer)-1)
 #define Inode2 (((struct minix2_inode *) inode_buffer)-1)
 
-#define Super (*(struct minix_superblock *)(superblock_buffer))
+#define Super (G.u.Super)
 
 #if ENABLE_FEATURE_MINIX2
 # define ZONES    ((unsigned)(version2 ? Super.s_zones : Super.s_nzones))
@@ -1232,8 +1235,7 @@ int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "=1:ar"; /* one argument; -a assumes -r */
-        getopt32(argv, OPTION_STR);
+        getopt32(argv, "^" OPTION_STR "\0" "=1:ar" /* one arg; -a assumes -r */);
         argv += optind;
         device_name = argv[0];
 
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
index 5c10c8044..2e2257337 100644
--- a/util-linux/fsfreeze.c
+++ b/util-linux/fsfreeze.c
@@ -13,7 +13,7 @@
 //config:       help
 //config:       Halt new accesses and flush writes on a mounted filesystem.
 
-//applet:IF_FSFREEZE(APPLET(fsfreeze, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_FSFREEZE(APPLET_NOEXEC(fsfreeze, fsfreeze, BB_DIR_USR_SBIN, BB_SUID_DROP, fsfreeze))
 
 //kbuild:lib-$(CONFIG_FSFREEZE) += fsfreeze.o
 
@@ -36,15 +36,15 @@ int fsfreeze_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         int fd;
 
-        applet_long_options =
-                "freeze\0"   No_argument "\xff"
-                "unfreeze\0" No_argument "\xfe"
-        ;
         /* exactly one non-option arg: the mountpoint */
         /* one of opts is required */
         /* opts are mutually exclusive */
-        opt_complementary = "=1:""\xff:\xfe:""\xff--\xfe:\xfe--\xff";
-        opts = getopt32(argv, "");
+        opts = getopt32long(argv, "^"
+                "" /* no opts */
+                "\0" "=1:""\xff:\xfe:""\xff--\xfe:\xfe--\xff",
+                "freeze\0"   No_argument "\xff"
+                "unfreeze\0" No_argument "\xfe"
+        );
 
         fd = xopen(argv[optind], O_RDONLY);
         /* Works with NULL arg on linux-4.8.0 */
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 6d0d61d92..4acfa567a 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -15,7 +15,7 @@
 //config:       help
 //config:       Discard unused blocks on a mounted filesystem.
 
-//applet:IF_FSTRIM(APPLET(fstrim, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_FSTRIM(APPLET_NOEXEC(fstrim, fstrim, BB_DIR_SBIN, BB_SUID_DROP, fstrim))
 
 //kbuild:lib-$(CONFIG_FSTRIM) += fstrim.o
 
@@ -63,17 +63,17 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
         };
 
 #if ENABLE_LONG_OPTS
-        static const char getopt_longopts[] ALIGN1 =
+        static const char fstrim_longopts[] ALIGN1 =
                 "offset\0"    Required_argument    "o"
                 "length\0"    Required_argument    "l"
                 "minimum\0"   Required_argument    "m"
                 "verbose\0"   No_argument          "v"
                 ;
-        applet_long_options = getopt_longopts;
 #endif
 
-        opt_complementary = "=1"; /* exactly one non-option arg: the mountpoint */
-        opts = getopt32(argv, "o:l:m:v", &arg_o, &arg_l, &arg_m);
+        opts = getopt32long(argv, "^" "o:l:m:v" "\0" "=1", fstrim_longopts,
+                        &arg_o, &arg_l, &arg_m
+        );
 
         memset(&range, 0, sizeof(range));
         range.len = ULLONG_MAX;
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index cf1bc592f..a151b7e56 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -42,32 +42,18 @@
 //config:
 //config:config FEATURE_GETOPT_LONG
 //config:       bool "Support -l LONGOPTs"
-//config:       default y if LONG_OPTS
-//config:       depends on GETOPT
+//config:       default y
+//config:       depends on GETOPT && LONG_OPTS
 //config:       help
 //config:       Enable support for long options (option -l).
 
-//applet:IF_GETOPT(APPLET(getopt, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_GETOPT(APPLET_NOEXEC(getopt, getopt, BB_DIR_BIN, BB_SUID_DROP, getopt))
 
 //kbuild:lib-$(CONFIG_GETOPT) += getopt.o
 
 //usage:#define getopt_trivial_usage
 //usage:       "[OPTIONS] [--] OPTSTRING PARAMS"
 //usage:#define getopt_full_usage "\n\n"
-//usage:        IF_LONG_OPTS(
-//usage:        IF_FEATURE_GETOPT_LONG(
-//usage:       "        -a,--alternative                Allow long options starting with single -\n"
-//usage:       "        -l,--longoptions LOPT[,...]     Long options to recognize\n"
-//usage:        )
-//usage:       "        -n,--name PROGNAME              The name under which errors are reported"
-//usage:     "\n        -o,--options OPTSTRING          Short options to recognize"
-//usage:     "\n        -q,--quiet                      No error messages on unrecognized options"
-//usage:     "\n        -Q,--quiet-output               No normal output"
-//usage:     "\n        -s,--shell SHELL                Set shell quoting conventions"
-//usage:     "\n        -T,--test                       Version test (exits with 4)"
-//usage:     "\n        -u,--unquoted                   Don't quote output"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:        IF_FEATURE_GETOPT_LONG(
 //usage:       "        -a              Allow long options starting with single -\n"
 //usage:       "        -l LOPT[,...]   Long options to recognize\n"
@@ -79,7 +65,6 @@
 //usage:     "\n        -s SHELL        Set shell quoting conventions"
 //usage:     "\n        -T              Version test (exits with 4)"
 //usage:     "\n        -u              Don't quote output"
-//usage:        )
 //usage:        IF_FEATURE_GETOPT_LONG( /* example uses -l, needs FEATURE_GETOPT_LONG */
 //usage:     "\n"
 //usage:     "\nExample:"
@@ -411,8 +396,7 @@ int getopt_main(int argc, char **argv)
 #if !ENABLE_FEATURE_GETOPT_LONG
         opt = getopt32(argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg);
 #else
-        applet_long_options = getopt_longopts;
-        opt = getopt32(argv, "+o:n:qQs:Tual:*",
+        opt = getopt32long(argv, "+o:n:qQs:Tual:*", getopt_longopts,
                                         &optstr, &name, &s_arg, &l_arg);
         /* Effectuate the read options for the applet itself */
         while (l_arg) {
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index 37e58f2d0..6cf6d0297 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -73,8 +73,9 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
 #define OPT_s (1 << 1)
 #define OPT_a (1 << 2)
 #define OPT_p (1 << 3)
-        opt_complementary = "?1"; /* 1 argument max */
-        opt = getopt32(argv, "l:s:apg:+c:+", &opt_l, &opt_s, &bytes, &cols);
+        opt = getopt32(argv, "^" "l:s:apg:+c:+" "\0" "?1" /* 1 argument max */,
+                        &opt_l, &opt_s, &bytes, &cols
+        );
         argv += optind;
 
         dumper->dump_vflag = ALL;
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 5df56de15..29f51021e 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -16,11 +16,6 @@
 //config:       shutdown in the hardware clock, so the hardware will keep the
 //config:       correct time when Linux is _not_ running.
 //config:
-//config:config FEATURE_HWCLOCK_LONG_OPTIONS
-//config:       bool "Support long options (--hctosys,...)"
-//config:       default y
-//config:       depends on HWCLOCK && LONG_OPTS
-//config:
 //config:config FEATURE_HWCLOCK_ADJTIME_FHS
 //config:       bool "Use FHS /var/lib/hwclock/adjtime"
 //config:       default n  # util-linux-ng in Fedora 13 still uses /etc/adjtime
@@ -293,12 +288,12 @@ static void set_system_clock_timezone(int utc)
 }
 
 //usage:#define hwclock_trivial_usage
-//usage:        IF_FEATURE_HWCLOCK_LONG_OPTIONS(
-//usage:       "[-r|--show] [-s|--hctosys] [-w|--systohc] [-t|--systz]"
-//usage:       " [-l|--localtime] [-u|--utc]"
+//usage:        IF_LONG_OPTS(
+//usage:       "[-r|--show] [-s|--hctosys] [-w|--systohc] [--systz]"
+//usage:       " [--localtime] [-u|--utc]"
 //usage:       " [-f|--rtc FILE]"
 //usage:        )
-//usage:        IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS(
+//usage:        IF_NOT_LONG_OPTS(
 //usage:       "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
 //usage:        )
 //usage:#define hwclock_full_usage "\n\n"
@@ -306,12 +301,18 @@ static void set_system_clock_timezone(int utc)
 //usage:     "\n        -r      Show hardware clock time"
 //usage:     "\n        -s      Set system time from hardware clock"
 //usage:     "\n        -w      Set hardware clock from system time"
-//usage:     "\n        -t      Set in-kernel timezone, correct system time"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --systz Set in-kernel timezone, correct system time"
+//usage:        )
 //usage:     "\n                if hardware clock is in local time"
 //usage:     "\n        -u      Assume hardware clock is kept in UTC"
-//usage:     "\n        -l      Assume hardware clock is kept in local time"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --localtime     Assume hardware clock is kept in local time"
+//usage:        )
 //usage:     "\n        -f FILE Use specified device (e.g. /dev/rtc2)"
 
+//TODO: get rid of incompatible -t and -l aliases to --systz and --localtime
+
 #define HWCLOCK_OPT_LOCALTIME   0x01
 #define HWCLOCK_OPT_UTC         0x02
 #define HWCLOCK_OPT_SHOW        0x04
@@ -327,7 +328,7 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         int utc;
 
-#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
         static const char hwclock_longopts[] ALIGN1 =
                 "localtime\0" No_argument "l" /* short opt is non-standard */
                 "utc\0"       No_argument "u"
@@ -337,14 +338,16 @@ int hwclock_main(int argc UNUSED_PARAM, char **argv)
                 "systz\0"     No_argument "t" /* short opt is non-standard */
                 "rtc\0"       Required_argument "f"
                 ;
-        applet_long_options = hwclock_longopts;
 #endif
 
         /* Initialize "timezone" (libc global variable) */
         tzset();
 
-        opt_complementary = "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l";
-        opt = getopt32(argv, "lurswtf:", &rtcname);
+        opt = getopt32long(argv,
+                "^lurswtf:" "\0" "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l",
+                hwclock_longopts,
+                &rtcname
+        );
 
         /* If -u or -l wasn't given check if we are using utc */
         if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
diff --git a/util-linux/ionice.c b/util-linux/ionice.c
index c7b7f0373..5b9664d25 100644
--- a/util-linux/ionice.c
+++ b/util-linux/ionice.c
@@ -14,7 +14,7 @@
 //config:       Set/set program io scheduling class and priority
 //config:       Requires kernel >= 2.6.13
 
-//applet:IF_IONICE(APPLET(ionice, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_IONICE(APPLET_NOEXEC(ionice, ionice, BB_DIR_BIN, BB_SUID_DROP, ionice))
 
 //kbuild:lib-$(CONFIG_IONICE) += ionice.o
 
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index c51d33143..a93ceee11 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -15,19 +15,10 @@
 //config:       communication (IPC) objects and the associated data structures
 //config:       from the system.
 
-//applet:IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_IPCRM(APPLET_NOEXEC(ipcrm, ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP, ipcrm))
 
 //kbuild:lib-$(CONFIG_IPCRM) += ipcrm.o
 
-//usage:#define ipcrm_trivial_usage
-//usage:       "[-MQS key] [-mqs id]"
-//usage:#define ipcrm_full_usage "\n\n"
-//usage:       "Upper-case options MQS remove an object by shmkey value.\n"
-//usage:       "Lower-case options remove an object by shmid value.\n"
-//usage:     "\n        -mM     Remove memory segment after last detach"
-//usage:     "\n        -qQ     Remove message queue"
-//usage:     "\n        -sS     Remove semaphore"
-
 #include "libbb.h"
 
 /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
@@ -94,6 +85,14 @@ static int remove_ids(type_id type, char **argv)
 }
 #endif /* IPCRM_LEGACY */
 
+//usage:#define ipcrm_trivial_usage
+//usage:       "[-MQS key] [-mqs id]"
+//usage:#define ipcrm_full_usage "\n\n"
+//usage:       "Upper-case options MQS remove an object by shmkey value.\n"
+//usage:       "Lower-case options remove an object by shmid value.\n"
+//usage:     "\n        -mM     Remove memory segment after last detach"
+//usage:     "\n        -qQ     Remove message queue"
+//usage:     "\n        -sS     Remove semaphore"
 
 int ipcrm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ipcrm_main(int argc, char **argv)
@@ -137,28 +136,20 @@ int ipcrm_main(int argc, char **argv)
 #endif /* IPCRM_LEGACY */
 
         /* process new syntax to conform with SYSV ipcrm */
-        while ((c = getopt(argc, argv, "q:m:s:Q:M:S:h?")) != -1) {
+        while ((c = getopt(argc, argv, "q:m:s:Q:M:S:")) != -1) {
                 int result;
-                int id = 0;
-                int iskey = isupper(c);
-
+                int id;
+                int iskey;
                 /* needed to delete semaphores */
                 union semun arg;
 
-                arg.val = 0;
-
-                if ((c == '?') || (c == 'h')) {
+                if (c == '?') /* option not in the string */
                         bb_show_usage();
-                }
-
-                /* we don't need case information any more */
-                c = tolower(c);
 
-                /* make sure the option is in range: allowed are q, m, s */
-                if (c != 'q' && c != 'm' && c != 's') {
-                        bb_show_usage();
-                }
+                id = 0;
+                arg.val = 0;
 
+                iskey = !(c & 0x20); /* uppercase? */
                 if (iskey) {
                         /* keys are in hex or decimal */
                         key_t key = xstrtoul(optarg, 0);
@@ -169,6 +160,7 @@ int ipcrm_main(int argc, char **argv)
                                 continue;
                         }
 
+                        c |= 0x20; /* lowercase. c is 'q', 'm' or 's' now */
                         /* convert key to id */
                         id = ((c == 'q') ? msgget(key, 0) :
                                 (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0));
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 1404930d4..7092ecd92 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -15,26 +15,10 @@
 //config:       The ipcs utility is used to provide information on the currently
 //config:       allocated System V interprocess (IPC) objects in the system.
 
-//applet:IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_IPCS(APPLET_NOEXEC(ipcs, ipcs, BB_DIR_USR_BIN, BB_SUID_DROP, ipcs))
 
 //kbuild:lib-$(CONFIG_IPCS) += ipcs.o
 
-//usage:#define ipcs_trivial_usage
-//usage:       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
-//usage:#define ipcs_full_usage "\n\n"
-//usage:       "        -i      Show specific resource"
-//usage:     "\nResource specification:"
-//usage:     "\n        -m      Shared memory segments"
-//usage:     "\n        -q      Message queues"
-//usage:     "\n        -s      Semaphore arrays"
-//usage:     "\n        -a      All (default)"
-//usage:     "\nOutput format:"
-//usage:     "\n        -t      Time"
-//usage:     "\n        -c      Creator"
-//usage:     "\n        -p      Pid"
-//usage:     "\n        -l      Limits"
-//usage:     "\n        -u      Summary"
-
 /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
 /* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
 /* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */
@@ -585,6 +569,22 @@ static void print_sem(int semid)
         bb_putchar('\n');
 }
 
+//usage:#define ipcs_trivial_usage
+//usage:       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
+//usage:#define ipcs_full_usage "\n\n"
+//usage:       "        -i      Show specific resource"
+//usage:     "\nResource specification:"
+//usage:     "\n        -m      Shared memory segments"
+//usage:     "\n        -q      Message queues"
+//usage:     "\n        -s      Semaphore arrays"
+//usage:     "\n        -a      All (default)"
+//usage:     "\nOutput format:"
+//usage:     "\n        -t      Time"
+//usage:     "\n        -c      Creator"
+//usage:     "\n        -p      Pid"
+//usage:     "\n        -l      Limits"
+//usage:     "\n        -u      Summary"
+
 int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ipcs_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -632,6 +632,10 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv)
                 flags |= flag_msg | flag_shm | flag_sem;
         bb_putchar('\n');
 
+        if (flags & flag_msg) {
+                do_msg();
+                bb_putchar('\n');
+        }
         if (flags & flag_shm) {
                 do_shm();
                 bb_putchar('\n');
@@ -640,9 +644,5 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv)
                 do_sem();
                 bb_putchar('\n');
         }
-        if (flags & flag_msg) {
-                do_msg();
-                bb_putchar('\n');
-        }
         fflush_stdout_and_exit(EXIT_SUCCESS);
 }
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index c608de6cc..6b171d710 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -15,9 +15,9 @@
 //config:       file or block device, and to query the status of a loop device. This
 //config:       version does not currently support enabling data encryption.
 
-//kbuild:lib-$(CONFIG_LOSETUP) += losetup.o
+//applet:IF_LOSETUP(APPLET_NOEXEC(losetup, losetup, BB_DIR_SBIN, BB_SUID_DROP, losetup))
 
-//applet:IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_LOSETUP) += losetup.o
 
 //usage:#define losetup_trivial_usage
 //usage:       "[-r] [-o OFS] {-f|LOOPDEV} FILE - associate loop devices\n"
@@ -57,8 +57,7 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
                 OPT_r = (1 << 4), /* must be last */
         };
 
-        opt_complementary = "?2:d--ofar:a--ofr";
-        opt = getopt32(argv, "do:far", &opt_o);
+        opt = getopt32(argv, "^" "do:far" "\0" "?2:d--ofar:a--ofr", &opt_o);
         argv += optind;
 
         /* LOOPDEV */
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index 3877deb67..0000fbfda 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -16,7 +16,7 @@
 //config:
 //config:       This version uses sysfs (/sys/bus/pci/devices) only.
 
-//applet:IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci))
 
 //kbuild:lib-$(CONFIG_LSPCI) += lspci.o
 
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c
index cabf047cf..33639413a 100644
--- a/util-linux/lsusb.c
+++ b/util-linux/lsusb.c
@@ -16,7 +16,7 @@
 //config:
 //config:       This version uses sysfs (/sys/bus/usb/devices) only.
 
-//applet:IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_LSUSB(APPLET_NOEXEC(lsusb, lsusb, BB_DIR_USR_BIN, BB_SUID_DROP, lsusb))
 
 //kbuild:lib-$(CONFIG_LSUSB) += lsusb.o
 
diff --git a/util-linux/mesg.c b/util-linux/mesg.c
index c4371eb24..91c05317e 100644
--- a/util-linux/mesg.c
+++ b/util-linux/mesg.c
@@ -26,7 +26,7 @@
 //config:       If you set this option to N, "mesg y" will enable writing
 //config:       by anybody at all. This is not recommended.
 
-//applet:IF_MESG(APPLET(mesg, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_MESG(APPLET_NOFORK(mesg, mesg, BB_DIR_USR_BIN, BB_SUID_DROP, mesg))
 
 //kbuild:lib-$(CONFIG_MESG) += mesg.o
 
@@ -60,10 +60,15 @@ int mesg_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
         }
 
+        /* We are a NOFORK applet.
+         * (Not that it's very useful, but code is trivially NOFORK-safe).
+         * Play nice. Do not leak anything.
+         */
+
         if (!isatty(STDIN_FILENO))
                 bb_error_msg_and_die("not a tty");
 
-        xfstat(STDIN_FILENO, &sb, "stderr");
+        xfstat(STDIN_FILENO, &sb, "stdin");
         if (c == 0) {
                 puts((sb.st_mode & (S_IWGRP|S_IWOTH)) ? "is y" : "is n");
                 return EXIT_SUCCESS;
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 88647e9d8..69dfcd123 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -142,7 +142,10 @@ struct globals {
         unsigned currently_testing;
 
         char root_block[BLOCK_SIZE];
-        char superblock_buffer[BLOCK_SIZE];
+        union {
+                char superblock_buffer[BLOCK_SIZE];
+                struct minix_superblock SB;
+        } u;
         char boot_block_buffer[512];
         unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
         /* check_blocks(): buffer[] was the biggest static in entire bbox */
@@ -166,7 +169,7 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
 #define INODE_BUF1              (((struct minix1_inode*)G.inode_buffer) - 1)
 #define INODE_BUF2              (((struct minix2_inode*)G.inode_buffer) - 1)
 
-#define SB                      (*(struct minix_superblock*)G.superblock_buffer)
+#define SB                      (G.u.SB)
 
 #define SB_INODES               (SB.s_ninodes)
 #define SB_IMAPS                (SB.s_imap_blocks)
@@ -234,7 +237,7 @@ static void write_tables(void)
         xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
 
         msg_eol = "can't write superblock";
-        xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE);
+        xwrite(dev_fd, G.u.superblock_buffer, BLOCK_SIZE);
 
         msg_eol = "can't write inode map";
         xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE);
@@ -541,7 +544,7 @@ static void setup_tables(void)
         unsigned sb_zmaps;
         unsigned i;
 
-        /* memset(G.superblock_buffer, 0, BLOCK_SIZE); */
+        /* memset(G.u.superblock_buffer, 0, BLOCK_SIZE); */
         /* memset(G.boot_block_buffer, 0, 512); */
         SB_MAGIC = G.magic;
         SB_ZONE_SIZE = 0;
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index c7d99b018..390aef86c 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -180,8 +180,7 @@ int mkfs_reiser_main(int argc UNUSED_PARAM, char **argv)
 
         // using global "option_mask32" instead of local "opts":
         // we are register starved here
-        opt_complementary = "-1";
-        /*opts =*/ getopt32(argv, "b:+j:s:o:t:B:h:u:l:fqd",
+        /*opts =*/ getopt32(argv, "^" "b:+j:s:o:t:B:h:u:l:fqd" "\0" "-1",
                 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &label);
         argv += optind; // argv[0] -- device
 
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index f9768ed56..426854b1e 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -269,8 +269,9 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
                 OPT_v = 1 << 16, // verbose
         };
 
-        opt_complementary = "-1";//:b+:f+:F+:h+:r+:R+:s+:S+:vv:c--l:l--c";
-        opts = getopt32(argv, "Ab:cCf:F:h:Ii:l:m:n:r:R:s:S:v",
+        opts = getopt32(argv, "^"
+                "Ab:cCf:F:h:Ii:l:m:n:r:R:s:S:v"
+                "\0" "-1", //:b+:f+:F+:h+:r+:R+:s+:S+:vv:c--l:l--c
                 NULL, NULL, NULL, NULL, NULL,
                 NULL, NULL, &volume_label, NULL, NULL, NULL, NULL);
         argv += optind;
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index e44e13c0d..71449882d 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -119,9 +119,8 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "-1"; /* at least one param */
         /* TODO: -p PAGESZ, -U UUID */
-        getopt32(argv, "L:", &label);
+        getopt32(argv, "^" "L:" "\0" "-1"/*at least one arg*/, &label);
         argv += optind;
 
         fd = xopen(argv[0], O_WRONLY);
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4d5c2243a..4eade0869 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -69,7 +69,6 @@
 //config:       bool "Support mounting NFS file systems on Linux < 2.6.23"
 //config:       default n
 //config:       depends on MOUNT
-//config:       select FEATURE_HAVE_RPC
 //config:       select FEATURE_SYSLOG
 //config:       help
 //config:       Enable mounting of NFS file systems on Linux kernels prior
@@ -2205,10 +2204,14 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
 
         // Parse remaining options
         // Max 2 params; -o is a list, -v is a counter
-        opt_complementary = "?2" IF_FEATURE_MOUNT_VERBOSE("vv");
-        opt = getopt32(argv, OPTION_STR, &lst_o, &fstype, &O_optmatch
-                        IF_FEATURE_MOUNT_OTHERTAB(, &fstabname)
-                        IF_FEATURE_MOUNT_VERBOSE(, &verbose));
+        opt = getopt32(argv, "^"
+                OPTION_STR
+                "\0" "?2"IF_FEATURE_MOUNT_VERBOSE("vv"),
+                &lst_o, &fstype, &O_optmatch
+                IF_FEATURE_MOUNT_OTHERTAB(, &fstabname)
+                IF_FEATURE_MOUNT_VERBOSE(, &verbose)
+        );
+
         while (lst_o) append_mount_options(&cmdopts, llist_pop(&lst_o)); // -o
         if (opt & OPT_r) append_mount_options(&cmdopts, "ro"); // -r
         if (opt & OPT_w) append_mount_options(&cmdopts, "rw"); // -w
diff --git a/util-linux/mountpoint.c b/util-linux/mountpoint.c
index b7f048196..6b21a5fb3 100644
--- a/util-linux/mountpoint.c
+++ b/util-linux/mountpoint.c
@@ -14,7 +14,7 @@
 //config:       help
 //config:       mountpoint checks if the directory is a mountpoint.
 
-//applet:IF_MOUNTPOINT(APPLET(mountpoint, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_MOUNTPOINT(APPLET_NOEXEC(mountpoint, mountpoint, BB_DIR_BIN, BB_SUID_DROP, mountpoint))
 
 //kbuild:lib-$(CONFIG_MOUNTPOINT) += mountpoint.o
 
@@ -43,8 +43,7 @@ int mountpoint_main(int argc UNUSED_PARAM, char **argv)
         char *arg;
         int rc, opt;
 
-        opt_complementary = "=1"; /* must have one argument */
-        opt = getopt32(argv, "qdxn");
+        opt = getopt32(argv, "^" "qdxn" "\0" "=1");
 #define OPT_q (1)
 #define OPT_d (2)
 #define OPT_x (4)
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index 12c86b0ed..d91b0b509 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -13,14 +13,6 @@
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:       Run program with namespaces of other processes.
-//config:
-//config:config FEATURE_NSENTER_LONG_OPTS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on NSENTER && LONG_OPTS
-//config:       help
-//config:       Support long options for the nsenter applet. This makes
-//config:       the busybox implementation more compatible with upstream.
 
 //applet:IF_NSENTER(APPLET(nsenter, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -28,22 +20,6 @@
 
 //usage:#define nsenter_trivial_usage
 //usage:       "[OPTIONS] [PROG [ARGS]]"
-//usage:#if ENABLE_FEATURE_NSENTER_LONG_OPTS
-//usage:#define nsenter_full_usage "\n"
-//usage:     "\n        -t,--target PID         Target process to get namespaces from"
-//usage:     "\n        -m,--mount[=FILE]       Enter mount namespace"
-//usage:     "\n        -u,--uts[=FILE]         Enter UTS namespace (hostname etc)"
-//usage:     "\n        -i,--ipc[=FILE]         Enter System V IPC namespace"
-//usage:     "\n        -n,--net[=FILE]         Enter network namespace"
-//usage:     "\n        -p,--pid[=FILE]         Enter pid namespace"
-//usage:     "\n        -U,--user[=FILE]        Enter user namespace"
-//usage:     "\n        -S,--setuid UID         Set uid in entered namespace"
-//usage:     "\n        -G,--setgid GID         Set gid in entered namespace"
-//usage:     "\n        --preserve-credentials  Don't touch uids or gids"
-//usage:     "\n        -r,--root[=DIR]         Set root directory"
-//usage:     "\n        -w,--wd[=DIR]           Set working directory"
-//usage:     "\n        -F,--no-fork            Don't fork before exec'ing PROG"
-//usage:#else
 //usage:#define nsenter_full_usage "\n"
 //usage:     "\n        -t PID          Target process to get namespaces from"
 //usage:     "\n        -m[FILE]        Enter mount namespace"
@@ -54,10 +30,12 @@
 //usage:     "\n        -U[FILE]        Enter user namespace"
 //usage:     "\n        -S UID          Set uid in entered namespace"
 //usage:     "\n        -G GID          Set gid in entered namespace"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --preserve-credentials  Don't touch uids or gids"
+//usage:        )
 //usage:     "\n        -r[DIR]         Set root directory"
 //usage:     "\n        -w[DIR]         Set working directory"
 //usage:     "\n        -F              Don't fork before exec'ing PROG"
-//usage:#endif
 
 #include <sched.h>
 #ifndef CLONE_NEWUTS
@@ -101,7 +79,7 @@ enum {
         OPT_root        = 1 << 9,
         OPT_wd          = 1 << 10,
         OPT_nofork      = 1 << 11,
-        OPT_prescred    = (1 << 12) * ENABLE_FEATURE_NSENTER_LONG_OPTS,
+        OPT_prescred    = (1 << 12) * ENABLE_LONG_OPTS,
 };
 enum {
         NS_USR_POS = 0,
@@ -130,7 +108,7 @@ static const struct namespace_descr ns_list[] = {
  */
 static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F";
 
-#if ENABLE_FEATURE_NSENTER_LONG_OPTS
+#if ENABLE_LONG_OPTS
 static const char nsenter_longopts[] ALIGN1 =
         "user\0"                        Optional_argument       "U"
         "ipc\0"                         Optional_argument       "i"
@@ -190,8 +168,7 @@ int nsenter_main(int argc UNUSED_PARAM, char **argv)
 
         memset(ns_ctx_list, 0, sizeof(ns_ctx_list));
 
-        IF_FEATURE_NSENTER_LONG_OPTS(applet_long_options = nsenter_longopts);
-        opts = getopt32(argv, opt_str,
+        opts = getopt32long(argv, opt_str, nsenter_longopts,
                         &ns_ctx_list[NS_USR_POS].path,
                         &ns_ctx_list[NS_IPC_POS].path,
                         &ns_ctx_list[NS_UTS_POS].path,
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 331038057..d6a26b912 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -21,7 +21,7 @@
 //config:       Note: This is for initrd in linux 2.4. Under initramfs (introduced
 //config:       in linux 2.6) use switch_root instead.
 
-//applet:IF_PIVOT_ROOT(APPLET(pivot_root, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_PIVOT_ROOT(APPLET_NOFORK(pivot_root, pivot_root, BB_DIR_SBIN, BB_SUID_DROP, pivot_root))
 
 //kbuild:lib-$(CONFIG_PIVOT_ROOT) += pivot_root.o
 
@@ -33,7 +33,7 @@
 
 #include "libbb.h"
 
-extern int pivot_root(const char * new_root,const char * put_old);
+extern int pivot_root(const char *new_root, const char *put_old);
 
 int pivot_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int pivot_root_main(int argc, char **argv)
@@ -41,6 +41,8 @@ int pivot_root_main(int argc, char **argv)
         if (argc != 3)
                 bb_show_usage();
 
+        /* NOFORK applet. Hardly matters wrt performance, but code is trivial */
+
         if (pivot_root(argv[1], argv[2]) < 0) {
                 /* prints "pivot_root: <strerror text>" */
                 bb_perror_nomsg_and_die();
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 14ce591e9..f27294e25 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -81,8 +81,7 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
         time_t remote_time;
         unsigned flags;
 
-        opt_complementary = "-1";
-        flags = getopt32(argv, "sp");
+        flags = getopt32(argv, "^" "sp" "\0" "-1");
 
         remote_time = askremotedate(argv[optind]);
 
diff --git a/util-linux/rdev.c b/util-linux/rdev.c
index 2ffe07688..7eb7413a8 100644
--- a/util-linux/rdev.c
+++ b/util-linux/rdev.c
@@ -14,7 +14,7 @@
 //config:       help
 //config:       Print the device node associated with the filesystem mounted at '/'.
 
-//applet:IF_RDEV(APPLET(rdev, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_RDEV(APPLET_NOEXEC(rdev, rdev, BB_DIR_USR_SBIN, BB_SUID_DROP, rdev))
 
 //kbuild:lib-$(CONFIG_RDEV) += rdev.o
 
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index b045657d8..394ece1dd 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -266,8 +266,10 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
                 printf("%6u %-40s %8.4f\n",
                         total, "total", total/(double)(fn_add-add0));
 
-        fclose(map);
-        free(buf);
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                fclose(map);
+                free(buf);
+        }
 
         return EXIT_SUCCESS;
 }
diff --git a/util-linux/renice.c b/util-linux/renice.c
index 23cbca88d..70c494b3d 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -25,7 +25,7 @@
 //config:       Renice alters the scheduling priority of one or more running
 //config:       processes.
 
-//applet:IF_RENICE(APPLET(renice, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_RENICE(APPLET_NOEXEC(renice, renice, BB_DIR_USR_BIN, BB_SUID_DROP, renice))
 
 //kbuild:lib-$(CONFIG_RENICE) += renice.o
 
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 4c47c5369..8ffa4f3a6 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -154,11 +154,11 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
                 "seconds\0" Required_argument "s"
                 "time\0"    Required_argument "t"
                 ;
-        applet_long_options = rtcwake_longopts;
 #endif
-        /* Must have -s or -t, exclusive */
-        opt_complementary = "s:t:s--t:t--s";
-        opt = getopt32(argv, "alud:m:s:t:", &rtcname, &suspend, &opt_seconds, &opt_time);
+        opt = getopt32long(argv,
+                        /* Must have -s or -t, exclusive */
+                        "^alud:m:s:t:" "\0" "s:t:s--t:t--s", rtcwake_longopts,
+                        &rtcname, &suspend, &opt_seconds, &opt_time);
 
         /* this is the default
         if (opt & RTCWAKE_OPT_AUTO)
diff --git a/util-linux/script.c b/util-linux/script.c
index 9eebb51a4..aac77c3ba 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -21,15 +21,25 @@
 //kbuild:lib-$(CONFIG_SCRIPT) += script.o
 
 //usage:#define script_trivial_usage
-//usage:       "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]"
+//usage:       "[-afq] [-t[FILE]] [-c PROG] [OUTFILE]"
 //usage:#define script_full_usage "\n\n"
-//usage:       "        -a      Append output"
+//usage:       "Default OUTFILE is 'typescript'"
+//usage:     "\n"
+//usage:     "\n        -a      Append output"
 //usage:     "\n        -c PROG Run PROG, not shell"
-//usage:     "\n        -f      Flush output after each write"
+/* Accepted but has no effect (we never buffer output) */
+/*//usage:     "\n      -f      Flush output after each write"*/
 //usage:     "\n        -q      Quiet"
-//usage:        IF_SCRIPTREPLAY(
-//usage:     "\n        -t      Send timing to stderr"
-//usage:        )
+//usage:     "\n        -t[FILE] Send timing to stderr or FILE"
+
+//util-linux-2.28:
+//-e: return exit code of the child
+
+//FYI (reported as bbox bug #2749):
+// > script -q -c 'echo -e -n "1\n2\n3\n"' /dev/null </dev/null >123.txt
+// > The output file on full-blown ubuntu system contains 6 bytes.
+// > Output on Busybox system (arm-linux) contains extra '\r' byte in each line.
+//however, in my test, "script" from util-linux-2.28 seems to also add '\r' bytes.
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -46,6 +56,8 @@ int script_main(int argc UNUSED_PARAM, char **argv)
         char pty_line[GETPTY_BUFSIZE];
         struct termios tt, rtt;
         struct winsize win;
+        FILE *timing_fp;
+        const char *str_t = NULL;
         const char *fname = "typescript";
         const char *shell;
         char shell_opt[] = "-i";
@@ -59,19 +71,19 @@ int script_main(int argc UNUSED_PARAM, char **argv)
         };
 
 #if ENABLE_LONG_OPTS
-        static const char getopt_longopts[] ALIGN1 =
+        static const char script_longopts[] ALIGN1 =
                 "append\0"  No_argument       "a"
                 "command\0" Required_argument "c"
                 "flush\0"   No_argument       "f"
                 "quiet\0"   No_argument       "q"
-                IF_SCRIPTREPLAY("timing\0" No_argument "t")
+                "timing\0"  Optional_argument "t"
                 ;
-
-        applet_long_options = getopt_longopts;
 #endif
 
-        opt_complementary = "?1"; /* max one arg */
-        opt = getopt32(argv, "ac:fq" IF_SCRIPTREPLAY("t") , &shell_arg);
+        opt = getopt32long(argv, "^" "ac:fqt::" "\0" "?1"/* max one arg */,
+                                script_longopts,
+                                &shell_arg, &str_t
+        );
         //argc -= optind;
         argv += optind;
         if (argv[0]) {
@@ -87,6 +99,10 @@ int script_main(int argc UNUSED_PARAM, char **argv)
         if (!(opt & OPT_q)) {
                 printf("Script started, file is %s\n", fname);
         }
+        timing_fp = stderr;
+        if (str_t) {
+                timing_fp = xfopen_for_write(str_t);
+        }
 
         shell = get_shell_name();
 
@@ -120,8 +136,9 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                 /* parent */
                 struct pollfd pfd[2];
                 int outfd, count, loop;
-                double oldtime = ENABLE_SCRIPTREPLAY ? time(NULL) : 0;
+                double oldtime = time(NULL);
                 smallint fd_count = 2;
+
 #define buf bb_common_bufsiz1
                 setup_common_bufsiz();
 
@@ -151,20 +168,21 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                                         goto restore;
                                 }
                                 if (count > 0) {
-                                        if (ENABLE_SCRIPTREPLAY && (opt & OPT_t)) {
+                                        if (opt & OPT_t) {
                                                 struct timeval tv;
                                                 double newtime;
 
                                                 gettimeofday(&tv, NULL);
                                                 newtime = tv.tv_sec + (double) tv.tv_usec / 1000000;
-                                                fprintf(stderr, "%f %u\n", newtime - oldtime, count);
+                                                fprintf(timing_fp, "%f %u\n", newtime - oldtime, count);
                                                 oldtime = newtime;
                                         }
                                         full_write(STDOUT_FILENO, buf, count);
                                         full_write(outfd, buf, count);
-                                        if (opt & OPT_f) {
-                                                fsync(outfd);
-                                        }
+                                        // If we'd be using (buffered) FILE i/o, we'd need this:
+                                        //if (opt & OPT_f) {
+                                        //      fflush(outfd);
+                                        //}
                                 }
                         }
                         if (pfd[1].revents) {
diff --git a/util-linux/scriptreplay.c b/util-linux/scriptreplay.c
index 7e9850103..e3083ab93 100644
--- a/util-linux/scriptreplay.c
+++ b/util-linux/scriptreplay.c
@@ -5,7 +5,6 @@
  * pascal.bellard@ads-lu.com
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
  */
 //config:config SCRIPTREPLAY
 //config:       bool "scriptreplay (2.6 kb)"
@@ -19,7 +18,7 @@
 //kbuild:lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o
 
 //usage:#define scriptreplay_trivial_usage
-//usage:       "timingfile [typescript [divisor]]"
+//usage:       "TIMINGFILE [TYPESCRIPT [DIVISOR]]"
 //usage:#define scriptreplay_full_usage "\n\n"
 //usage:       "Play back typescripts, using timing information"
 
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index d4b568832..520865318 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -30,10 +30,10 @@
 //config:       help
 //config:       Alias to "setarch linux64".
 
-//applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP))
-//                  APPLET_ODDNAME:name     main     location    suid_type     help
-//applet:IF_LINUX32(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
-//applet:IF_LINUX64(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))
+//applet:IF_SETARCH(APPLET_NOEXEC(setarch, setarch, BB_DIR_BIN, BB_SUID_DROP, setarch))
+//                  APPLET_NOEXEC:name     main     location    suid_type     help
+//applet:IF_LINUX32(APPLET_NOEXEC(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
+//applet:IF_LINUX64(APPLET_NOEXEC(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))
 
 //kbuild:lib-$(CONFIG_SETARCH) += setarch.o
 //kbuild:lib-$(CONFIG_LINUX32) += setarch.o
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 0f85428ab..12ab1bd66 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2017 by  <assafgordon@gmail.com>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
  */
 //config:config SETPRIV
 //config:       bool "setpriv (3.4 kb)"
@@ -125,96 +124,10 @@ enum {
 };
 
 #if ENABLE_FEATURE_SETPRIV_CAPABILITIES
-struct caps {
-        struct __user_cap_header_struct header;
-        cap_user_data_t data;
-        int u32s;
-};
-
-# if ENABLE_FEATURE_SETPRIV_CAPABILITY_NAMES
-static const char *const capabilities[] = {
-        "chown",
-        "dac_override",
-        "dac_read_search",
-        "fowner",
-        "fsetid",
-        "kill",
-        "setgid",
-        "setuid",
-        "setpcap",
-        "linux_immutable",
-        "net_bind_service",
-        "net_broadcast",
-        "net_admin",
-        "net_raw",
-        "ipc_lock",
-        "ipc_owner",
-        "sys_module",
-        "sys_rawio",
-        "sys_chroot",
-        "sys_ptrace",
-        "sys_pacct",
-        "sys_admin",
-        "sys_boot",
-        "sys_nice",
-        "sys_resource",
-        "sys_time",
-        "sys_tty_config",
-        "mknod",
-        "lease",
-        "audit_write",
-        "audit_control",
-        "setfcap",
-        "mac_override",
-        "mac_admin",
-        "syslog",
-        "wake_alarm",
-        "block_suspend",
-        "audit_read",
-};
-# endif /* FEATURE_SETPRIV_CAPABILITY_NAMES */
+DEFINE_STRUCT_CAPS;
 
-static void getcaps(struct caps *caps)
+static unsigned parse_cap(const char *cap)
 {
-        static const uint8_t versions[] = {
-                _LINUX_CAPABILITY_U32S_3, /* = 2 (fits into byte) */
-                _LINUX_CAPABILITY_U32S_2, /* = 2 */
-                _LINUX_CAPABILITY_U32S_1, /* = 1 */
-        };
-        int i;
-
-        caps->header.pid = 0;
-        for (i = 0; i < ARRAY_SIZE(versions); i++) {
-                caps->header.version = versions[i];
-                if (capget(&caps->header, NULL) == 0)
-                        goto got_it;
-        }
-        bb_simple_perror_msg_and_die("capget");
- got_it:
-
-        switch (caps->header.version) {
-                case _LINUX_CAPABILITY_VERSION_1:
-                        caps->u32s = _LINUX_CAPABILITY_U32S_1;
-                        break;
-                case _LINUX_CAPABILITY_VERSION_2:
-                        caps->u32s = _LINUX_CAPABILITY_U32S_2;
-                        break;
-                case _LINUX_CAPABILITY_VERSION_3:
-                        caps->u32s = _LINUX_CAPABILITY_U32S_3;
-                        break;
-                default:
-                        bb_error_msg_and_die("unsupported capability version");
-        }
-
-        caps->data = xmalloc(sizeof(caps->data[0]) * caps->u32s);
-        if (capget(&caps->header, caps->data) < 0)
-                bb_simple_perror_msg_and_die("capget");
-}
-
-static void parse_cap(unsigned long *index, const char *cap)
-{
-        unsigned long i;
-
         switch (cap[0]) {
         case '-':
                 break;
@@ -226,26 +139,7 @@ static void parse_cap(unsigned long *index, const char *cap)
         }
 
         cap++;
-        if ((sscanf(cap, "cap_%lu", &i)) == 1) {
-                if (!cap_valid(i))
-                        bb_error_msg_and_die("unsupported capability '%s'", cap);
-                *index = i;
-                return;
-        }
-
-# if ENABLE_FEATURE_SETPRIV_CAPABILITY_NAMES
-        for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
-                if (strcmp(capabilities[i], cap) != 0)
-                        continue;
-
-                if (!cap_valid(i))
-                        bb_error_msg_and_die("unsupported capability '%s'", cap);
-                *index = i;
-                return;
-        }
-# endif
-
-        bb_error_msg_and_die("unknown capability '%s'", cap);
+        return cap_name_to_number(cap);
 }
 
 static void set_inh_caps(char *capstring)
@@ -256,11 +150,11 @@ static void set_inh_caps(char *capstring)
 
         capstring = strtok(capstring, ",");
         while (capstring) {
-                unsigned long cap;
+                unsigned cap;
 
-                parse_cap(&cap, capstring);
+                cap = parse_cap(capstring);
                 if (CAP_TO_INDEX(cap) >= caps.u32s)
-                        bb_error_msg_and_die("invalid capability cap");
+                        bb_error_msg_and_die("invalid capability '%s'", capstring);
 
                 if (capstring[0] == '+')
                         caps.data[CAP_TO_INDEX(cap)].inheritable |= CAP_TO_MASK(cap);
@@ -269,11 +163,8 @@ static void set_inh_caps(char *capstring)
                 capstring = strtok(NULL, ",");
         }
 
-        if ((capset(&caps.header, caps.data)) < 0)
+        if (capset(&caps.header, caps.data) != 0)
                 bb_perror_msg_and_die("capset");
-
-        if (ENABLE_FEATURE_CLEAN_UP)
-                free(caps.data);
 }
 
 static void set_ambient_caps(char *string)
@@ -282,9 +173,9 @@ static void set_ambient_caps(char *string)
 
         cap = strtok(string, ",");
         while (cap) {
-                unsigned long index;
+                unsigned index;
 
-                parse_cap(&index, cap);
+                index = parse_cap(cap);
                 if (cap[0] == '+') {
                         if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, index, 0, 0) < 0)
                                 bb_perror_msg("cap_ambient_raise");
@@ -298,16 +189,7 @@ static void set_ambient_caps(char *string)
 #endif /* FEATURE_SETPRIV_CAPABILITIES */
 
 #if ENABLE_FEATURE_SETPRIV_DUMP
-# if ENABLE_FEATURE_SETPRIV_CAPABILITY_NAMES
-static void printf_cap(const char *pfx, unsigned cap_no)
-{
-        if (cap_no < ARRAY_SIZE(capabilities)) {
-                printf("%s%s", pfx, capabilities[cap_no]);
-                return;
-        }
-        printf("%scap_%u", pfx, cap_no);
-}
-# else
+# if !ENABLE_FEATURE_SETPRIV_CAPABILITY_NAMES
 #  define printf_cap(pfx, cap_no) printf("%scap_%u", (pfx), (cap_no))
 # endif
 
@@ -396,10 +278,9 @@ static int dump(void)
         bb_putchar('\n');
 # endif
 
-        if (ENABLE_FEATURE_CLEAN_UP) {
-                IF_FEATURE_SETPRIV_CAPABILITIES(free(caps.data);)
+        if (ENABLE_FEATURE_CLEAN_UP)
                 free(gids);
-        }
+
         return EXIT_SUCCESS;
 }
 #endif /* FEATURE_SETPRIV_DUMP */
@@ -421,9 +302,12 @@ int setpriv_main(int argc UNUSED_PARAM, char **argv)
         int opts;
         IF_FEATURE_SETPRIV_CAPABILITIES(char *inh_caps, *ambient_caps;)
 
-        applet_long_options = setpriv_longopts;
-        opts = getopt32(argv, "+"IF_FEATURE_SETPRIV_DUMP("d")
-                        IF_FEATURE_SETPRIV_CAPABILITIES("\xfe:\xfd:", &inh_caps, &ambient_caps));
+        opts = getopt32long(argv, "+"
+                IF_FEATURE_SETPRIV_DUMP("d")
+                IF_FEATURE_SETPRIV_CAPABILITIES("\xfe:\xfd:"),
+                setpriv_longopts
+                IF_FEATURE_SETPRIV_CAPABILITIES(, &inh_caps, &ambient_caps)
+        );
         argv += optind;
 
 #if ENABLE_FEATURE_SETPRIV_DUMP
diff --git a/util-linux/setsid.c b/util-linux/setsid.c
index 60cab2fcf..8385a9115 100644
--- a/util-linux/setsid.c
+++ b/util-linux/setsid.c
@@ -37,8 +37,8 @@ int setsid_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opt;
 
-        opt_complementary = "-1"; /* at least one arg */
-        opt = getopt32(argv, "+c"); /* +: stop on first non-opt */
+        /* +: stop on first non-opt */
+        opt = getopt32(argv, "^+" "c" "\0" "-1"/* at least one arg */);
         argv += optind;
 
         /* setsid() is allowed only when we are not a process group leader.
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 32708934e..080b05e45 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -24,22 +24,33 @@
 //config:       * Because the Linux kernel uses rootfs internally as the starting
 //config:       and ending point for searching through the kernel's doubly linked
 //config:       list of active mount points. That's why.
+//config:
+// RUN_INIT config item is in klibc-utils
 
 //applet:IF_SWITCH_ROOT(APPLET(switch_root, BB_DIR_SBIN, BB_SUID_DROP))
+//                      APPLET_ODDNAME:name      main         location     suid_type     help
+//applet:IF_RUN_INIT(   APPLET_ODDNAME(run-init, switch_root, BB_DIR_SBIN, BB_SUID_DROP, run_init))
 
 //kbuild:lib-$(CONFIG_SWITCH_ROOT) += switch_root.o
-
-//usage:#define switch_root_trivial_usage
-//usage:       "[-c /dev/console] NEW_ROOT NEW_INIT [ARGS]"
-//usage:#define switch_root_full_usage "\n\n"
-//usage:       "Free initramfs and switch to another root fs:\n"
-//usage:       "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n"
-//usage:       "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n"
-//usage:     "\n        -c DEV  Reopen stdio to DEV after switch"
+//kbuild:lib-$(CONFIG_RUN_INIT)    += switch_root.o
 
 #include <sys/vfs.h>
 #include <sys/mount.h>
+#if ENABLE_RUN_INIT
+# include <sys/prctl.h>
+# include <linux/capability.h>
+// #include <sys/capability.h>
+// This header is in libcap, but the functions are in libc.
+// Comment in the header says this above capset/capget:
+/* system calls - look to libc for function to system call mapping */
+extern int capset(cap_user_header_t header, cap_user_data_t data);
+extern int capget(cap_user_header_t header, const cap_user_data_t data);
+// so for bbox, let's just repeat the declarations.
+// This way, libcap needs not be installed in build environment.
+#endif
+
 #include "libbb.h"
+
 // Make up for header deficiencies
 #ifndef RAMFS_MAGIC
 # define RAMFS_MAGIC ((unsigned)0x858458f6)
@@ -89,17 +100,125 @@ static void delete_contents(const char *directory, dev_t rootdev)
         }
 }
 
+#if ENABLE_RUN_INIT
+DEFINE_STRUCT_CAPS;
+
+static void drop_capset(int cap_idx)
+{
+        struct caps caps;
+
+        getcaps(&caps);
+        caps.data[CAP_TO_INDEX(cap_idx)].inheritable &= ~CAP_TO_MASK(cap_idx);
+        if (capset(&caps.header, caps.data) != 0)
+                bb_perror_msg_and_die("capset");
+}
+
+static void drop_bounding_set(int cap_idx)
+{
+        int ret;
+
+        ret = prctl(PR_CAPBSET_READ, cap_idx, 0, 0, 0);
+        if (ret < 0)
+                bb_perror_msg_and_die("prctl: %s", "PR_CAPBSET_READ");
+
+        if (ret == 1) {
+                ret = prctl(PR_CAPBSET_DROP, cap_idx, 0, 0, 0);
+                if (ret != 0)
+                        bb_perror_msg_and_die("prctl: %s", "PR_CAPBSET_DROP");
+        }
+}
+
+static void drop_usermodehelper(const char *filename, int cap_idx)
+{
+        unsigned lo, hi;
+        char buf[sizeof(int)*3 * 2 + 8];
+        int fd;
+        int ret;
+
+        ret = open_read_close(filename, buf, sizeof(buf) - 1);
+        if (ret < 0)
+                return; /* assuming files do not exist */
+
+        buf[ret] = '\0';
+        ret = sscanf(buf, "%u %u", &lo, &hi);
+        if (ret != 2)
+                bb_perror_msg_and_die("can't parse file '%s'", filename);
+
+        if (cap_idx < 32)
+                lo &= ~(1 << cap_idx);
+        else
+                hi &= ~(1 << (cap_idx - 32));
+
+        fd = xopen(filename, O_WRONLY);
+        fdprintf(fd, "%u %u", lo, hi);
+        close(fd);
+}
+
+static void drop_capabilities(char *string)
+{
+        char *cap;
+
+        cap = strtok(string, ",");
+        while (cap) {
+                unsigned cap_idx;
+
+                cap_idx = cap_name_to_number(cap);
+                drop_usermodehelper("/proc/sys/kernel/usermodehelper/bset", cap_idx);
+                drop_usermodehelper("/proc/sys/kernel/usermodehelper/inheritable", cap_idx);
+                drop_bounding_set(cap_idx);
+                drop_capset(cap_idx);
+                bb_error_msg("dropped capability: %s", cap);
+                cap = strtok(NULL, ",");
+        }
+}
+#endif
+
 int switch_root_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int switch_root_main(int argc UNUSED_PARAM, char **argv)
 {
         char *newroot, *console = NULL;
         struct stat st;
         struct statfs stfs;
+        unsigned dry_run = 0;
         dev_t rootdev;
 
-        // Parse args (-c console)
-        opt_complementary = "-2"; // minimum 2 params
-        getopt32(argv, "+c:", &console); // '+': stop at first non-option
+        // Parse args. '+': stop at first non-option
+        if (ENABLE_SWITCH_ROOT && (!ENABLE_RUN_INIT || applet_name[0] == 's')) {
+//usage:#define switch_root_trivial_usage
+//usage:       "[-c CONSOLE_DEV] NEW_ROOT NEW_INIT [ARGS]"
+//usage:#define switch_root_full_usage "\n\n"
+//usage:       "Free initramfs and switch to another root fs:\n"
+//usage:       "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n"
+//usage:       "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n"
+//usage:     "\n        -c DEV  Reopen stdio to DEV after switch"
+                getopt32(argv, "^+"
+                        "c:"
+                        "\0" "-2" /* minimum 2 args */,
+                        &console
+                );
+        } else {
+#if ENABLE_RUN_INIT
+//usage:#define run_init_trivial_usage
+//usage:       "[-d CAP,CAP...] [-n] [-c CONSOLE_DEV] NEW_ROOT NEW_INIT [ARGS]"
+//usage:#define run_init_full_usage "\n\n"
+//usage:       "Free initramfs and switch to another root fs:\n"
+//usage:       "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n"
+//usage:       "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n"
+//usage:     "\n        -c DEV  Reopen stdio to DEV after switch"
+//usage:     "\n        -d CAPS Drop capabilities"
+//usage:     "\n        -n      Dry run"
+                char *cap_list = NULL;
+                dry_run = getopt32(argv, "^+"
+                        "c:d:n"
+                        "\0" "-2" /* minimum 2 args */,
+                        &console,
+                        &cap_list
+                );
+                dry_run >>= 2; // -n
+                if (cap_list)
+                        drop_capabilities(cap_list);
+#endif
+        }
         argv += optind;
         newroot = *argv++;
 
@@ -108,9 +227,12 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
         xstat("/", &st);
         rootdev = st.st_dev;
         xstat(".", &st);
-        if (st.st_dev == rootdev || getpid() != 1) {
+        if (st.st_dev == rootdev) {
                 // Show usage, it says new root must be a mountpoint
-                // and we must be PID 1
+                bb_show_usage();
+        }
+        if (!dry_run && getpid() != 1) {
+                // Show usage, it says we must be PID 1
                 bb_show_usage();
         }
 
@@ -118,7 +240,7 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
         // we mean it. I could make this a CONFIG option, but I would get email
         // from all the people who WILL destroy their filesystems.
         if (stat("/init", &st) != 0 || !S_ISREG(st.st_mode)) {
-                bb_error_msg_and_die("/init is not a regular file");
+                bb_error_msg_and_die("'%s' is not a regular file", "/init");
         }
         statfs("/", &stfs); // this never fails
         if ((unsigned)stfs.f_type != RAMFS_MAGIC
@@ -127,13 +249,15 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
                 bb_error_msg_and_die("root filesystem is not ramfs/tmpfs");
         }
 
-        // Zap everything out of rootdev
-        delete_contents("/", rootdev);
+        if (!dry_run) {
+                // Zap everything out of rootdev
+                delete_contents("/", rootdev);
 
-        // Overmount / with newdir and chroot into it
-        if (mount(".", "/", NULL, MS_MOVE, NULL)) {
-                // For example, fails when newroot is not a mountpoint
-                bb_perror_msg_and_die("error moving root");
+                // Overmount / with newdir and chroot into it
+                if (mount(".", "/", NULL, MS_MOVE, NULL)) {
+                        // For example, fails when newroot is not a mountpoint
+                        bb_perror_msg_and_die("error moving root");
+                }
         }
         xchroot(".");
         // The chdir is needed to recalculate "." and ".." links
@@ -149,8 +273,17 @@ int switch_root_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        // Exec real init
-        execv(argv[0], argv);
+        if (dry_run) {
+                // Does NEW_INIT look like it can be executed?
+                //xstat(argv[0], &st);
+                //if (!S_ISREG(st.st_mode))
+                //      bb_perror_msg_and_die("'%s' is not a regular file", argv[0]);
+                if (access(argv[0], X_OK) == 0)
+                        return 0;
+        } else {
+                // Exec NEW_INIT
+                execv(argv[0], argv);
+        }
         bb_perror_msg_and_die("can't execute '%s'", argv[0]);
 }
 
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index 9957b1a71..401a1bcb7 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -22,7 +22,7 @@
 //config:       affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
 //config:       in this case. Otherwise, it is limited to sizeof(long).
 
-//applet:IF_TASKSET(APPLET(taskset, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_TASKSET(APPLET_NOEXEC(taskset, taskset, BB_DIR_USR_BIN, BB_SUID_DROP, taskset))
 //kbuild:lib-$(CONFIG_TASKSET) += taskset.o
 
 //usage:#define taskset_trivial_usage
@@ -123,8 +123,7 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
          * Indeed, util-linux-2.13-pre7 uses:
          * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
 
-        opt_complementary = "-1"; /* at least 1 arg */
-        opt_p = getopt32(argv, "+p");
+        opt_p = getopt32(argv, "^+" "p" "\0" "-1" /* at least 1 arg */);
         argv += optind;
 
         aff = *argv++;
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 252e8fb64..7ff866cec 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -32,7 +32,10 @@
 #define env ((char **)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 enum {
-        MAX_ENV = COMMON_BUFSIZE / sizeof(env[0]) - 1,
+        MAX_ENV = COMMON_BUFSIZE / sizeof(char*) - 1,
+        /* sizeof(env[0]) instead of sizeof(char*)
+         * makes gcc-6.3.0 emit "strict-aliasing" warning.
+         */
 };
 
 #ifndef SO_RCVBUFFORCE
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 122c0f579..a6405dfcc 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -24,7 +24,20 @@
 //config:       help
 //config:       Support -a option to unmount all currently mounted filesystems.
 
-//applet:IF_UMOUNT(APPLET(umount, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_UMOUNT(APPLET_NOEXEC(umount, umount, BB_DIR_BIN, BB_SUID_DROP, umount))
+/*
+ * On one hand, in some weird situations you'd want umount
+ * to not do anything surprising, to behave as a usual fork+execed executable.
+ *
+ * OTOH, there can be situations where execing would not succeed, or even hang
+ * (say, if executable is on a filesystem which is in trouble and accesses to it
+ * block in kernel).
+ * In this case, you might be actually happy if your standalone bbox shell
+ * does not fork+exec, but only forks and calls umount_main() which it already has!
+ * Let's go with NOEXEC.
+ *
+ * bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed.
+ */
 
 //kbuild:lib-$(CONFIG_UMOUNT) += umount.o
 
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index e7b95c72b..6a3da9f91 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -137,7 +137,7 @@ static const struct namespace_descr ns_list[] = {
  * we are forced to use "fake" letters for them.
  * '+': stop at first non-option.
  */
-static const char opt_str[] ALIGN1 = "+muinpU""fr""\xfd::""\xfe:""\xff:";
+#define OPT_STR "+muinpU""fr""\xfd::""\xfe:""\xff:"
 static const char unshare_longopts[] ALIGN1 =
         "mount\0"               Optional_argument       "\xf0"
         "uts\0"                 Optional_argument       "\xf1"
@@ -210,7 +210,7 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
         prop_str = PRIVATE_STR;
         setgrp_str = NULL;
 
-        opt_complementary =
+        opts = getopt32long(argv, "^" OPT_STR "\0"
                 "\xf0""m" /* long opts (via their "fake chars") imply short opts */
                 ":\xf1""u"
                 ":\xf2""i"
@@ -219,16 +219,14 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
                 ":\xf5""U"
                 ":ru"      /* --map-root-user or -r implies -u */
                 ":\xfd""m" /* --mount-proc implies -m */
-        ;
-        applet_long_options = unshare_longopts;
-        opts = getopt32(argv, opt_str,
-                        &proc_mnt_target, &prop_str, &setgrp_str,
-                        &ns_ctx_list[NS_MNT_POS].path,
-                        &ns_ctx_list[NS_UTS_POS].path,
-                        &ns_ctx_list[NS_IPC_POS].path,
-                        &ns_ctx_list[NS_NET_POS].path,
-                        &ns_ctx_list[NS_PID_POS].path,
-                        &ns_ctx_list[NS_USR_POS].path
+                , unshare_longopts,
+                &proc_mnt_target, &prop_str, &setgrp_str,
+                &ns_ctx_list[NS_MNT_POS].path,
+                &ns_ctx_list[NS_UTS_POS].path,
+                &ns_ctx_list[NS_IPC_POS].path,
+                &ns_ctx_list[NS_NET_POS].path,
+                &ns_ctx_list[NS_PID_POS].path,
+                &ns_ctx_list[NS_USR_POS].path
         );
         argv += optind;
         //bb_error_msg("opts:0x%x", opts);