Merge branch 'busybox' into merge

342 files changed, 4878 insertions, 2519 deletions

diff --git a/Config.in b/Config.in
index e131dafaf..ba7ba1026 100644
--- a/Config.in
+++ b/Config.in
@@ -51,6 +51,19 @@ config EXTRA_COMPAT
         some GNU extensions in libc. You probably only need this option
         if you plan to run busybox on desktop.
 
+config FEDORA_COMPAT
+        bool "Building for Fedora distribution"
+        default n
+        help
+        This option makes some tools behave like they do on Fedora.
+
+        At the time of this writing (2017-08) this only affects uname:
+        normally, uname -p (processor) and uname -i (platform)
+        are shown as "unknown", but with this option uname -p
+        shows the same string as uname -m (machine type),
+        and so does uname -i unless machine type is i486/i586/i686 -
+        then uname -i shows "i386".
+
 config INCLUDE_SUSv2
         bool "Enable obsolete features removed before SUSv3"
         default y
@@ -366,13 +379,6 @@ config FEATURE_SYSLOG
         #This option is auto-selected when you select any applet which may
         #send its output to syslog. You do not need to select it manually.
 
-config FEATURE_HAVE_RPC
-        bool #No description makes it a hidden option
-        default n
-        #help
-        #This is automatically selected if any of enabled applets need it.
-        #You do not need to select it manually.
-
 config PLATFORM_LINUX
         bool #No description makes it a hidden option
         default n
@@ -721,6 +727,7 @@ source archival/Config.in
 source coreutils/Config.in
 source console-tools/Config.in
 source debianutils/Config.in
+source klibc-utils/Config.in
 source editors/Config.in
 source findutils/Config.in
 source init/Config.in
diff --git a/Makefile b/Makefile
index 47bdaf7ad..5b31a41a6 100644
--- a/Makefile
+++ b/Makefile
@@ -471,6 +471,7 @@ libs-y		:= \
                 coreutils/ \
                 coreutils/libcoreutils/ \
                 debianutils/ \
+                klibc-utils/ \
                 e2fsprogs/ \
                 editors/ \
                 findutils/ \
diff --git a/NOFORK_NOEXEC.lst b/NOFORK_NOEXEC.lst
new file mode 100644
index 000000000..3070a321b
--- /dev/null
+++ b/NOFORK_NOEXEC.lst
@@ -0,0 +1,431 @@
+Why an applet can't be NOFORK or NOEXEC?
+
+Why can't be NOFORK:
+interactive: may wait for user input, ^C has to work
+spawner: "tool PROG ARGS" which changes program state and execs - must fork
+changes state: e.g. environment, signal handlers
+leaks: does not free allocated memory or opened fds
+        alloc+xfunc: xmalloc, then xfunc - leaks memory if xfunc dies
+        open+xfunc: opens fd, then calls xfunc - fd is leaked if xfunc dies
+talks to network/serial/etc: it's not known how long the delay can be,
+        it's reasonable to expect it might be many seconds
+        (even if usually it is not), so ^C has to work
+runner: sometimes may run for long(ish) time, and/or works with network:
+        ^C has to work (cat BIGFILE, chmod -R, ftpget, nc)
+
+"runners" can become eligible after shell is taught ^C to interrupt NOFORKs,
+need to be inspected that they do not fall into alloc+xfunc, open+xfunc,
+leak categories.
+
+Why can't be NOEXEC:
+suid: runs under different uid - must fork+exec
+if it's important that /proc/PID/cmdline and comm are correct.
+        ("pkill sh" killing itself before it kills real "sh" is no fun)
+
+Why shouldn't be NOFORK/NOEXEC:
+rare: not started often enough to bother optimizing (example: poweroff)
+daemon: runs indefinitely; these are also always fit "rare" category
+longterm: often runs for a long time (many seconds), execing makes
+        memory footprint smaller
+complex: no immediately obvious reason why NOFORK wouldn't work,
+        but does some non-obvoius operations (example: fuser, lsof, losetup);
+        detailed audit often turns out that it's a leaker
+hardware: performs unusual hardware ops which may take long,
+        or even hang due to hardware or firmware bugs
+
+Interesting example of "interactive" applet which is nevertheless can be
+(and is) NOEXEC is "rm". Yes, "rm -i" is interactive - but it's not that typical
+for users to keep it waiting for many minutes, whereas running "rm" in shell
+is very typical, and speeding up this common use via NOEXEC is useful.
+IOW: rm is "interactive", but not "longterm".
+
+Interesting example of an applet which can be NOFORK but if not,
+then should not be NOEXEC, is "usleep". As NOFORK, it amount to simply
+nanosleep()ing in the calling program (usually shell). No memory wasted.
+But if ran as NOEXEC, it would create a potentially long-term process,
+which would be taking more memory because it did not exec
+and did not free much of the copied memory of the parent
+(COW helps with this only as long as parent doesn't modify its memory).
+
+
+[ - NOFORK
+[[ - NOFORK
+acpid - daemon
+add-shell - noexec. leaks: open+xfunc
+addgroup - noexec. leaks
+adduser - noexec. leaks
+adjtimex - NOFORK
+ar - runner
+arch - NOFORK
+arp - talks to network: arp -n queries DNS
+arping - longterm
+ash - interactive, longterm
+awk - noexec. runner
+base64 - runner
+basename - NOFORK
+beep - longterm: beep -r 999999999
+blkdiscard - noexec. leaks: open+xioctl
+blkid - noexec
+blockdev - noexec. leaks fd
+bootchartd - daemon
+brctl - noexec
+bunzip2 - runner
+bzcat - runner
+bzip2 - runner
+cal - runner: cal -n9999
+cat - runner: cat HUGEFILE
+chat - longterm (when used as intended - talking to modem over stdin/out)
+chattr - noexec. runner
+chgrp - noexec. runner
+chmod - noexec. runner
+chown - noexec. runner
+chpasswd - longterm? (list of "user:password"s from stdin)
+chpst - noexec. spawner
+chroot - noexec. spawner
+chrt - noexec. spawner
+chvt - noexec. leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds
+cksum - noexec. runner
+clear - NOFORK
+cmp - runner
+comm - runner
+conspy - interactive, longterm
+cp - noexec. runner
+cpio - runner
+crond - daemon
+crontab - longterm (runs $EDITOR), leaks: open+xasprintf
+cryptpw - noexec. changes state: with --password-fd=N, moves N to stdin
+cttyhack - noexec. spawner
+cut - noexec. runner
+date - noexec. nofork candidate(needs to stop messing up env, free xasprintf result, not use xfuncs after xasprintf)
+dc - longterm (eats stdin if no params)
+dd - noexec. runner
+deallocvt - noexec. leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds
+delgroup - noexec. leaks
+deluser - noexec. leaks
+depmod - longterm(ish)
+devmem - hardware (access to device memory may hang)
+df - noexec. leaks: nested allocs
+dhcprelay - daemon
+diff - runner
+dirname - NOFORK
+dmesg - runner
+dnsd - daemon
+dnsdomainname - noexec. talks to network (may query DNS)
+dos2unix - noexec. runner
+dpkg - runner
+du - runner
+dumpkmap - noexec. leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds
+dumpleases - noexec. leaks: open+xread
+echo - NOFORK
+ed - interactive, longterm
+egrep - longterm runner ("CMD | egrep ..."  may run indefinitely, better to exec to conserve memory)
+eject - hardware, leaks: open+ioctl_or_perror_and_die, changes state (moves fds)
+env - noexec. spawner, changes state (env)
+envdir - noexec. spawner
+envuidgid - noexec. spawner
+expand - runner
+expr - noexec. leaks: nested allocs
+factor - longterm (eats stdin if no params)
+fakeidentd - daemon
+false - NOFORK
+fatattr - noexec. leaks: open+xioctl, complex
+fbset - hardware, leaks: open+xfunc
+fbsplash - runner, longterm
+fdflush - hardware, leaks: open+ioctl_or_perror_and_die
+fdformat - hardware, longterm
+fdisk - interactive, longterm
+fgconsole - noexec. leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds
+fgrep - longterm runner ("CMD | fgrep ..."  may run indefinitely, better to exec to conserve memory)
+find - noexec. runner
+findfs - suid
+flash_eraseall - hardware
+flash_lock - hardware
+flash_unlock - hardware
+flashcp - hardware
+flock - spawner, changes state (file locks), let's play safe and not be noexec
+fold - noexec. runner
+free - noexec. nofork candidate(struct globals, needs to close /proc/meminfo fd)
+freeramdisk - noexec. leaks: open+ioctl_or_perror_and_die
+fsck - interactive, longterm
+fsck.minix - needs ^C
+fsfreeze - noexec. leaks: open+xioctl
+fstrim - noexec. leaks: open+xioctl, find_block_device -> readdir+xstrdup
+fsync - NOFORK
+ftpd - daemon
+ftpget - runner
+ftpput - runner
+fuser - complex
+getopt - noexec. leaks: many allocs
+getty - interactive, longterm
+grep - longterm runner ("CMD | grep ..."  may run indefinitely, better to exec to conserve memory)
+groups - noexec
+gunzip - runner
+gzip - runner
+halt - rare
+hd - noexec. runner
+hdparm - hardware
+head - noexec. runner
+hexdump - noexec. runner
+hostid - NOFORK
+hostname - noexec. talks to network (hostname -d may query DNS)
+httpd - daemon
+hush - interactive, longterm
+hwclock - hardware (xioctl(RTC_RD_TIME))
+i2cdetect - hardware
+i2cdump - hardware
+i2cget - hardware
+i2cset - hardware
+id - noexec
+ifconfig - hardware? (mem_start NN io_addr NN irq NN), leaks: xsocket+ioctl_or_perror_and_die
+ifenslave - noexec. leaks: xsocket+bb_perror_msg_and_die
+ifplugd - daemon
+inetd - daemon
+init - daemon
+inotifyd - daemon
+insmod - noexec
+install - runner
+ionice - noexec. spawner
+iostat - longterm: "iostat 1" runs indefinitely
+ip - noexec candidate
+ipaddr - noexec candidate
+ipcalc - noexec. ipcalc -h talks to network
+ipcrm - noexec
+ipcs - noexec
+iplink - noexec candidate
+ipneigh - noexec candidate
+iproute - noexec candidate
+iprule - noexec candidate
+iptunnel - noexec candidate
+kbd_mode - noexec. leaks: xopen_nonblocking+xioctl
+kill - NOFORK
+killall - NOFORK
+killall5 - NOFORK
+klogd - daemon
+last - runner (I've got 1300 lines of output when tried it)
+less - interactive, longterm
+link - NOFORK
+linux32 - noexec. spawner
+linux64 - noexec. spawner
+linuxrc - daemon
+ln - noexec
+loadfont - noexec. leaks: config_open+bb_error_msg_and_die("map format")
+loadkmap - noexec. leaks: get_console_fd_or_die() may open a new fd, or return one of stdio fds
+logger - runner
+login - suid, interactive, longterm
+logname - NOFORK
+losetup - noexec. complex
+lpd - daemon
+lpq - runner
+lpr - runner
+ls - noexec. runner
+lsattr - noexec. runner
+lsmod - noexec
+lsof - complex
+lspci - noexec. too rare to bother for nofork
+lsscsi - noexec. too rare to bother for nofork
+lsusb - noexec. too rare to bother for nofork
+lzcat - runner
+lzma - runner
+lzop - runner
+lzopcat - runner
+makedevs - noexec
+makemime - runner
+man - spawner, interactive, longterm
+md5sum - noexec. runner
+mdev - daemon
+mesg - NOFORK
+microcom - interactive, longterm
+mkdir - NOFORK
+mkdosfs - needs ^C
+mke2fs - needs ^C
+mkfifo - noexec
+mkfs.ext2 - needs ^C
+mkfs.minix - needs ^C
+mkfs.vfat - needs ^C
+mknod - noexec
+mkpasswd - noexec. changes state: with --password-fd=N, moves N to stdin
+mkswap - needs ^C
+mktemp - noexec. leaks: xstrdup+concat_path_file
+modinfo - noexec
+modprobe - noexec
+more - interactive, longterm
+mount - suid
+mountpoint - noexec. leaks: option -n "print dev name": find_block_device -> readdir+xstrdup
+mpstat - longterm: "mpstat 1" runs indefinitely
+mt - hardware
+mv - noexec candidate, runner
+nameif - noexec. openlog(), leaks: config_open2+ioctl_or_perror_and_die
+nbd-client - noexec
+nc - runner
+netstat - longterm with -c (continuous listing)
+nice - noexec. spawner
+nl - runner
+nmeter - longterm
+nohup - noexec. spawner
+nproc - NOFORK
+ntpd - daemon
+od - runner
+openvt - longterm: spawns a child and waits for it
+partprobe - noexec. leaks: open+ioctl_or_perror_and_die(BLKRRPART)
+passwd - suid
+paste - noexec. runner
+patch - needs ^C
+pgrep - must fork+exec to get correct /proc/PID/cmdline and comm field
+pidof - must fork+exec to get correct /proc/PID/cmdline and comm field
+ping - suid, longterm
+ping6 - suid, longterm
+pipe_progress - longterm
+pivot_root - NOFORK
+pkill - must fork+exec to get correct /proc/PID/cmdline and comm field
+pmap - noexec candidate, leaks: open+xstrdup
+popmaildir - runner
+poweroff - rare
+powertop - interactive, longterm
+printenv - NOFORK
+printf - NOFORK
+ps - noexec
+pscan - talks to network
+pstree - noexec
+pwd - NOFORK
+pwdx - NOFORK
+raidautorun - noexec. very simple. leaks: open+xioctl
+rdate - talks to network
+rdev - noexec. leaks: find_block_device -> readdir+xstrdup
+readlink - NOFORK
+readprofile - reads /boot/System.map and /proc/profile, better to free more memory by execing?
+realpath - NOFORK
+reboot - rare
+reformime - runner
+remove-shell - noexec. leaks: open+xfunc
+renice - noexec. nofork candidate(uses getpwnam, is that ok?)
+reset - noexec. spawner (execs "stty")
+resize - noexec. changes state (signal handlers)
+rev - runner
+rm - noexec. rm -i interactive
+rmdir - NOFORK
+rmmod - noexec
+route - talks to network (may query DNS to convert IPs to names)
+rpm - runner
+rpm2cpio - runner
+rtcwake - longterm: puts system to sleep, optimizing this for speed is pointless
+run-parts - longterm
+runlevel - noexec. can be nofork if "endutxent()" is called unconditionally, but too rare to bother?
+runsv - daemon
+runsvdir - daemon
+rx - runner
+script - longterm: pumps script output from slave pty
+scriptreplay - longterm: plays back "script" saved output, sleeping as necessary.
+sed - runner
+sendmail - runner
+seq - noexec. runner
+setarch - noexec. spawner
+setconsole - noexec
+setfont - noexec. leaks a lot of stuff
+setkeycodes - noexec
+setlogcons - noexec
+setpriv - spawner, changes state, let's play safe and not be noexec
+setserial - noexec
+setsid - spawner, uses fork_or_rexec() [not audited to work in noexec], let's play safe and not be noexec
+setuidgid - noexec. spawner
+sha1sum - noexec. runner
+sha256sum - noexec. runner
+sha3sum - noexec. runner
+sha512sum - noexec. runner
+showkey - interactive, longterm
+shred - runner
+shuf - noexec. runner
+slattach - longterm (may sleep forever), uses bb_common_bufsiz1
+sleep - longterm. Could be nofork, if not the problem of "killall sleep" not killing it.
+smemcap - runner
+softlimit - noexec. spawner
+sort - noexec. runner
+split - runner
+ssl_client - longterm
+start-stop-daemon - not noexec: uses bb_common_bufsiz1
+stat - noexec. nofork candidate(needs fewer allocs)
+strings - runner
+stty - noexec. nofork candidate: has no allocs or opens except xmove_fd(xopen("-F DEVICE"),STDIN). tcsetattr(STDIN) is not a problem: it would work the same across processes sharing this fd
+su - suid, spawner
+sulogin - noexec. spawner
+sum - runner
+sv - noexec. needs ^C (uses usleep(420000))
+svc - noexec. needs ^C (uses usleep(420000))
+svlogd - daemon
+swapoff - longterm: may cause memory pressure, execing is beneficial
+swapon - rare
+switch_root - spawner, rare, changes state (oh yes), execing may be important to free binary's inode
+sync - NOFORK
+sysctl - noexec. leaks: xstrdup+xmalloc_read
+syslogd - daemon
+tac - noexec. runner
+tail - runner
+tar - runner
+taskset - noexec. spawner
+tcpsvd - daemon
+tee - runner
+telnet - interactive, longterm
+telnetd - daemon
+test - NOFORK
+tftp - runner
+tftpd - daemon
+time - spawner, longterm, changes state (signals)
+timeout - spawner, longterm, changes state (signals)
+top - interactive, longterm
+touch - NOFORK
+tr - runner
+traceroute - suid, longterm
+traceroute6 - suid, longterm
+true - NOFORK
+truncate - NOFORK
+tty - NOFORK
+ttysize - NOFORK
+tunctl - noexec
+tune2fs - noexec. leaks: open+xfunc
+ubiattach - hardware
+ubidetach - hardware
+ubimkvol - hardware
+ubirename - hardware
+ubirmvol - hardware
+ubirsvol - hardware
+ubiupdatevol - hardware
+udhcpc - daemon
+udhcpd - daemon
+udpsvd - daemon
+uevent - daemon
+umount - noexec. leaks: nested xmalloc
+uname - NOFORK
+uncompress - runner
+unexpand - runner
+uniq - runner
+unix2dos - noexec. runner
+unlink - NOFORK
+unlzma - runner
+unlzop - runner
+unxz - runner
+unzip - runner
+uptime - noexec. nofork candidate(is getutxent ok?)
+users - noexec. nofork candidate(is getutxent ok?)
+usleep - NOFORK. But what about "killall usleep"?
+uudecode - runner
+uuencode - runner
+vconfig - noexec. leaks: xsocket+ioctl_or_perror_and_die
+vi - interactive, longterm
+vlock - suid
+volname - hardware (reads CDROM, this can take long-ish if need to spin up)
+w - noexec. nofork candidate(is getutxent ok?)
+wall - suid
+watch - longterm
+watchdog - daemon
+wc - runner
+wget - longterm
+which - NOFORK
+who - noexec. nofork candidate(is getutxent ok?)
+whoami - NOFORK
+whois - talks to network
+xargs - noexec. spawner
+xxd - noexec. runner
+xz - runner
+xzcat - runner
+yes - noexec. runner
+zcat - runner
+zcip - daemon
diff --git a/archival/ar.c b/archival/ar.c
index ea36bda88..d113bc6ca 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -254,11 +254,16 @@ int ar_main(int argc UNUSED_PARAM, char **argv)
 
         archive_handle = init_handle();
 
-        /* --: prepend '-' to the first argument if required */
-        /* -1: at least one param is reqd */
-        /* one of p,t,x[,r] is required */
-        opt_complementary = "--:-1:p:t:x"IF_FEATURE_AR_CREATE(":r");
-        opt = getopt32(argv, "voc""ptx"IF_FEATURE_AR_CREATE("r"));
+        /* prepend '-' to the first argument if required */
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
+        opt = getopt32(argv, "^"
+                "voc""ptx"IF_FEATURE_AR_CREATE("r")
+                "\0"
+                /* -1: at least one arg is reqd */
+                /* one of p,t,x[,r] is required */
+                "-1:p:t:x"IF_FEATURE_AR_CREATE(":r")
+        );
         argv += optind;
 
         t = opt / FIRST_CMD;
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index f91dd25eb..34a2e8e96 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -319,7 +319,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
 //config:       gunzip is used to decompress archives created by gzip.
-//config:       You can use the `-t' option to test the integrity of
+//config:       You can use the '-t' option to test the integrity of
 //config:       an archive, without decompressing it.
 //config:
 //config:config ZCAT
@@ -391,9 +391,10 @@ int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int gunzip_main(int argc UNUSED_PARAM, char **argv)
 {
 #if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
-        applet_long_options = gunzip_longopts;
-#endif
+        getopt32long(argv, "cfkvqdtn", gunzip_longopts);
+#else
         getopt32(argv, "cfkvqdtn");
+#endif
         argv += optind;
 
         /* If called as zcat...
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 0b9c508df..d578eb7ad 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -195,9 +195,11 @@ int bzip2_main(int argc UNUSED_PARAM, char **argv)
          * --best        alias for -9
          */
 
-        opt_complementary = "s2"; /* -s means -2 (compatibility) */
-        /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-        opt = getopt32(argv, "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs");
+        opt = getopt32(argv, "^"
+                /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
+                "cfkv" IF_FEATURE_BZIP2_DECOMPRESS("dt") "123456789qzs"
+                "\0" "s2" /* -s means -2 (compatibility) */
+        );
 #if ENABLE_FEATURE_BZIP2_DECOMPRESS /* bunzip2_main may not be visible... */
         if (opt & 0x30) // -d and/or -t
                 return bunzip2_main(argc, argv);
diff --git a/archival/cpio.c b/archival/cpio.c
index 38bab8257..f2165be3a 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -360,9 +360,8 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         char *cpio_owner;
         IF_FEATURE_CPIO_O(const char *cpio_fmt = "";)
         unsigned opt;
-
 #if ENABLE_LONG_OPTS
-        applet_long_options =
+        const char *long_opts =
                 "extract\0"      No_argument       "i"
                 "list\0"         No_argument       "t"
 #if ENABLE_FEATURE_CPIO_O
@@ -390,9 +389,9 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         /* -L makes sense only with -o or -p */
 
 #if !ENABLE_FEATURE_CPIO_O
-        opt = getopt32(argv, OPTION_STR, &cpio_filename, &cpio_owner);
+        opt = getopt32long(argv, OPTION_STR, long_opts, &cpio_filename, &cpio_owner);
 #else
-        opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"),
+        opt = getopt32long(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), long_opts,
                        &cpio_filename, &cpio_owner, &cpio_fmt);
 #endif
         argv += optind;
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 90ad8766c..852e0cac2 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1766,8 +1766,7 @@ int dpkg_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        IF_LONG_OPTS(applet_long_options = dpkg_longopts);
-        opt = getopt32(argv, "CilPruF:", &str_f);
+        opt = getopt32long(argv, "CilPruF:", dpkg_longopts, &str_f);
         argv += optind;
         //if (opt & OPT_configure) ... // -C
         if (opt & OPT_force) { // -F (--force in official dpkg)
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 029bc4af1..f6bf9eb04 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -80,8 +80,9 @@ int dpkg_deb_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         /* Must have 1 or 2 args */
-        opt_complementary = "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
-        opt = getopt32(argv, "cefXx");
+        opt = getopt32(argv, "^" "cefXx"
+                        "\0" "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX"
+        );
         argv += optind;
         //argc -= optind;
 
diff --git a/archival/gzip.c b/archival/gzip.c
index 4cf34ac28..9c53895e9 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2216,11 +2216,12 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
         SET_PTR_TO_GLOBALS((char *)xzalloc(sizeof(struct globals)+sizeof(struct globals2))
                         + sizeof(struct globals));
 
-#if ENABLE_FEATURE_GZIP_LONG_OPTIONS
-        applet_long_options = gzip_longopts;
-#endif
         /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
+#if ENABLE_FEATURE_GZIP_LONG_OPTIONS
+        opt = getopt32long(argv, "cfkv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789", gzip_longopts);
+#else
         opt = getopt32(argv, "cfkv" IF_FEATURE_GZIP_DECOMPRESS("dt") "qn123456789");
+#endif
 #if ENABLE_FEATURE_GZIP_DECOMPRESS /* gunzip_main may not be visible... */
         if (opt & 0x30) // -d and/or -t
                 return gunzip_main(argc, argv);
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 942e755b9..e1a8a7529 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -12,6 +12,8 @@ COMMON_FILES:= \
         data_extract_all.o \
         data_extract_to_stdout.o \
 \
+        unsafe_symlink_target.o \
+\
         filter_accept_all.o \
         filter_accept_list.o \
         filter_accept_reject_list.o \
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 1ce927c2f..e658444e0 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -129,9 +129,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
                         /* shared message */
                         bb_perror_msg("can't create %slink '%s' to '%s'",
-                                        "hard",
-                                        dst_name,
-                                        hard_link
+                                "hard", dst_name, hard_link
                         );
                 }
                 /* Hardlinks have no separate mode/ownership, skip chown/chmod */
@@ -181,7 +179,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 //TODO: what if file_header->link_target == NULL (say, corrupted tarball?)
 
                 /* To avoid a directory traversal attack via symlinks,
-                 * for certain link targets postpone creation of symlinks.
+                 * do not restore symlinks with ".." components
+                 * or symlinks starting with "/", unless a magic
+                 * envvar is set.
                  *
                  * For example, consider a .tar created via:
                  *  $ tar cvf bug.tar anything.txt
@@ -199,24 +199,17 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                  *
                  * Untarring bug.tar would otherwise place evil.py in '/tmp'.
                  */
-                if (file_header->link_target[0] == '/'
-                 || strstr(file_header->link_target, "..")
-                ) {
-                        llist_add_to(&archive_handle->symlink_placeholders,
-                                xasprintf("%s%c%s", file_header->name, '\0', file_header->link_target)
-                        );
-                        break;
-                }
-                res = symlink(file_header->link_target, dst_name);
-                if (res != 0
-                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
-                ) {
-                        /* shared message */
-                        bb_perror_msg("can't create %slink '%s' to '%s'",
-                                "sym",
-                                dst_name,
-                                file_header->link_target
-                        );
+                if (!unsafe_symlink_target(file_header->link_target)) {
+                        res = symlink(file_header->link_target, dst_name);
+                        if (res != 0
+                         && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
+                        ) {
+                                /* shared message */
+                                bb_perror_msg("can't create %slink '%s' to '%s'",
+                                        "sym",
+                                        dst_name, file_header->link_target
+                                );
+                        }
                 }
                 break;
         case S_IFSOCK:
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index 350e5358a..0be85500c 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -37,7 +37,6 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
  || !defined(put_unaligned_be32)
 # error get_unaligned_le32 accessors are not defined
 #endif
-#define get_le32(p) (*(uint32_t*)(p))
 
 #include "unxz/xz_dec_bcj.c"
 #include "unxz/xz_dec_lzma2.c"
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 641256787..7d912152c 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -251,18 +251,8 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
         return xstate;
 }
 
-/* Used by e.g. rpm which gives us a fd without filename,
- * thus we can't guess the format from filename's extension.
- */
-int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
+static void fork_transformer_and_free(transformer_state_t *xstate)
 {
-        transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
-
-        if (!xstate || !xstate->xformer) {
-                free(xstate);
-                return 1;
-        }
-
 # if BB_MMU
         fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
 # else
@@ -270,13 +260,39 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
          * an external unzipper that wants
          * file position at the start of the file.
          */
-        xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+        xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
         xstate->signature_skipped = 0;
         fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
 # endif
         free(xstate);
+}
+
+/* Used by e.g. rpm which gives us a fd without filename,
+ * thus we can't guess the format from filename's extension.
+ */
+int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
+{
+        transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+
+        if (!xstate->xformer) {
+                free(xstate);
+                return 1;
+        }
+
+        fork_transformer_and_free(xstate);
         return 0;
 }
+#if ENABLE_FEATURE_SEAMLESS_LZMA
+/* ...and custom version for LZMA */
+void FAST_FUNC setup_lzma_on_fd(int fd)
+{
+        transformer_state_t *xstate = xzalloc(sizeof(*xstate));
+        xstate->src_fd = fd;
+        xstate->xformer = unpack_lzma_stream;
+        USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
+        fork_transformer_and_free(xstate);
+}
+#endif
 
 static transformer_state_t *open_transformer(const char *fname, int fail_if_not_compressed)
 {
diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c
new file mode 100644
index 000000000..441ba8b24
--- /dev/null
+++ b/archival/libarchive/unsafe_symlink_target.c
@@ -0,0 +1,48 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+#include "bb_archive.h"
+
+int FAST_FUNC unsafe_symlink_target(const char *target)
+{
+        const char *dot;
+
+        if (target[0] == '/') {
+                const char *var;
+ unsafe:
+                var = getenv("EXTRACT_UNSAFE_SYMLINKS");
+                if (var) {
+                        if (LONE_CHAR(var, '1'))
+                                return 0; /* pretend it's safe */
+                        return 1; /* "UNSAFE!" */
+                }
+                bb_error_msg("skipping unsafe symlink to '%s' in archive,"
+                        " set %s=1 to extract",
+                        target,
+                        "EXTRACT_UNSAFE_SYMLINKS"
+                );
+                /* Prevent further messages */
+                setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0);
+                return 1; /* "UNSAFE!" */
+        }
+
+        dot = target;
+        for (;;) {
+                dot = strchr(dot, '.');
+                if (!dot)
+                        return 0; /* safe target */
+
+                /* Is it a path component starting with ".."? */
+                if ((dot[1] == '.')
+                 && (dot == target || dot[-1] == '/')
+                    /* Is it exactly ".."? */
+                 && (dot[2] == '/' || dot[2] == '\0')
+                ) {
+                        goto unsafe;
+                }
+                /* NB: it can even be trailing ".", should only add 1 */
+                dot += 1;
+        }
+}
diff --git a/archival/lzop.c b/archival/lzop.c
index df18ff170..1bf954f4f 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -1138,7 +1138,7 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
         /* -U is "anti -k", invert bit for bbunpack(): */
         option_mask32 ^= OPT_KEEP;
         /* -k disables -U (if any): */
-        /* opt_complementary = "k-U"; - nope, only handles -Uk, not -kU */
+        /* opt_complementary "k-U"? - nope, only handles -Uk, not -kU */
         if (option_mask32 & OPT_k)
                 option_mask32 |= OPT_KEEP;
 
diff --git a/archival/rpm.c b/archival/rpm.c
index 98039d499..790eeb59d 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config RPM
 //config:       bool "rpm (33 kb)"
 //config:       default y
@@ -14,19 +13,8 @@
 //config:       Mini RPM applet - queries and extracts RPM packages.
 
 //applet:IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_RPM) += rpm.o
 
-//usage:#define rpm_trivial_usage
-//usage:       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
-//usage:#define rpm_full_usage "\n\n"
-//usage:       "Manipulate RPM packages\n"
-//usage:     "\nCommands:"
-//usage:     "\n        -i      Install package"
-//usage:     "\n        -qp     Query package"
-//usage:     "\n        -qpi    Show information"
-//usage:     "\n        -qpl    List contents"
-//usage:     "\n        -qpd    List documents"
-//usage:     "\n        -qpc    List config files"
+//kbuild:lib-$(CONFIG_RPM) += rpm.o
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -68,6 +56,8 @@
 #define TAG_DIRINDEXES          1116
 #define TAG_BASENAMES           1117
 #define TAG_DIRNAMES            1118
+#define TAG_PAYLOADCOMPRESSOR   1125
+
 
 #define RPMFILE_CONFIG          (1 << 0)
 #define RPMFILE_DOC             (1 << 1)
@@ -91,148 +81,145 @@ typedef struct {
 
 struct globals {
         void *map;
-        rpm_index **mytags;
+        rpm_index *mytags;
         int tagcount;
+        unsigned mapsize, pagesize;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 
-static void extract_cpio(int fd, const char *source_rpm)
-{
-        archive_handle_t *archive_handle;
-
-        if (source_rpm != NULL) {
-                /* Binary rpm (it was built from some SRPM), install to root */
-                xchdir("/");
-        } /* else: SRPM, install to current dir */
-
-        /* Initialize */
-        archive_handle = init_handle();
-        archive_handle->seek = seek_by_read;
-        archive_handle->action_data = data_extract_all;
-#if 0 /* For testing (rpm -i only lists the files in internal cpio): */
-        archive_handle->action_header = header_list;
-        archive_handle->action_data = data_skip;
-#endif
-        archive_handle->ah_flags = ARCHIVE_RESTORE_DATE | ARCHIVE_CREATE_LEADING_DIRS
-                /* compat: overwrite existing files.
-                 * try "rpm -i foo.src.rpm" few times in a row -
-                 * standard rpm will not complain.
-                 */
-                | ARCHIVE_REPLACE_VIA_RENAME;
-        archive_handle->src_fd = fd;
-        /*archive_handle->offset = 0; - init_handle() did it */
-
-        setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_compressed:*/ 1);
-        while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
-                continue;
-}
-
-static rpm_index **rpm_gettags(int fd, int *num_tags)
+static int rpm_gettags(const char *filename)
 {
-        /* We should never need more than 200 (shrink via realloc later) */
-        rpm_index **tags = xzalloc(200 * sizeof(tags[0]));
-        int pass, tagindex = 0;
-
-        xlseek(fd, 96, SEEK_CUR); /* Seek past the unused lead */
+        rpm_index *tags;
+        int fd;
+        unsigned pass, idx;
+        unsigned storepos;
+
+        if (!filename) { /* rpm2cpio w/o filename? */
+                filename = bb_msg_standard_output;
+                fd = 0;
+        } else {
+                fd = xopen(filename, O_RDONLY);
+        }
 
+        storepos = xlseek(fd, 96, SEEK_CUR); /* Seek past the unused lead */
+        G.tagcount = 0;
+        tags = NULL;
+        idx = 0;
         /* 1st pass is the signature headers, 2nd is the main stuff */
         for (pass = 0; pass < 2; pass++) {
                 struct rpm_header header;
-                rpm_index *tmpindex;
-                int storepos;
+                unsigned cnt;
 
                 xread(fd, &header, sizeof(header));
                 if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER))
-                        return NULL; /* Invalid magic, or not version 1 */
+                        bb_error_msg_and_die("invalid RPM header magic in '%s'", filename);
                 header.size = ntohl(header.size);
-                header.entries = ntohl(header.entries);
-                storepos = xlseek(fd, 0, SEEK_CUR) + header.entries * 16;
-
-                while (header.entries--) {
-                        tmpindex = tags[tagindex++] = xmalloc(sizeof(*tmpindex));
-                        xread(fd, tmpindex, sizeof(*tmpindex));
-                        tmpindex->tag = ntohl(tmpindex->tag);
-                        tmpindex->type = ntohl(tmpindex->type);
-                        tmpindex->count = ntohl(tmpindex->count);
-                        tmpindex->offset = storepos + ntohl(tmpindex->offset);
+                cnt = ntohl(header.entries);
+                storepos += sizeof(header) + cnt * 16;
+
+                G.tagcount += cnt;
+                tags = xrealloc(tags, sizeof(tags[0]) * G.tagcount);
+                xread(fd, &tags[idx], sizeof(tags[0]) * cnt);
+                while (cnt--) {
+                        rpm_index *tag = &tags[idx];
+                        tag->tag = ntohl(tag->tag);
+                        tag->type = ntohl(tag->type);
+                        tag->count = ntohl(tag->count);
+                        tag->offset = storepos + ntohl(tag->offset);
                         if (pass == 0)
-                                tmpindex->tag -= 743;
+                                tag->tag -= 743;
+                        idx++;
                 }
-                storepos = xlseek(fd, header.size, SEEK_CUR); /* Seek past store */
                 /* Skip padding to 8 byte boundary after reading signature headers */
                 if (pass == 0)
-                        xlseek(fd, (-storepos) & 0x7, SEEK_CUR);
+                        while (header.size & 7)
+                                header.size++;
+                /* Seek past store */
+                storepos = xlseek(fd, header.size, SEEK_CUR);
         }
-        /* realloc tags to save space */
-        tags = xrealloc(tags, tagindex * sizeof(tags[0]));
-        *num_tags = tagindex;
-        /* All done, leave the file at the start of the gzipped cpio archive */
-        return tags;
+        G.mytags = tags;
+
+        /* Map the store */
+        storepos = (storepos + G.pagesize) & -(int)G.pagesize;
+        /* remember size for munmap */
+        G.mapsize = storepos;
+        /* some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
+        G.map = mmap(0, storepos, PROT_READ, MAP_PRIVATE, fd, 0);
+        if (G.map == MAP_FAILED)
+                bb_perror_msg_and_die("mmap '%s'", filename);
+
+        return fd;
 }
 
 static int bsearch_rpmtag(const void *key, const void *item)
 {
         int *tag = (int *)key;
-        rpm_index **tmp = (rpm_index **) item;
-        return (*tag - tmp[0]->tag);
-}
-
-static int rpm_getcount(int tag)
-{
-        rpm_index **found;
-        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
-        if (!found)
-                return 0;
-        return found[0]->count;
+        rpm_index *tmp = (rpm_index *) item;
+        return (*tag - tmp->tag);
 }
 
 static char *rpm_getstr(int tag, int itemindex)
 {
-        rpm_index **found;
-        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
-        if (!found || itemindex >= found[0]->count)
+        rpm_index *found;
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(G.mytags[0]), bsearch_rpmtag);
+        if (!found || itemindex >= found->count)
                 return NULL;
-        if (found[0]->type == RPM_STRING_TYPE
-         || found[0]->type == RPM_I18NSTRING_TYPE
-         || found[0]->type == RPM_STRING_ARRAY_TYPE
+        if (found->type == RPM_STRING_TYPE
+         || found->type == RPM_I18NSTRING_TYPE
+         || found->type == RPM_STRING_ARRAY_TYPE
         ) {
                 int n;
-                char *tmpstr = (char *) G.map + found[0]->offset;
+                char *tmpstr = (char *) G.map + found->offset;
                 for (n = 0; n < itemindex; n++)
                         tmpstr = tmpstr + strlen(tmpstr) + 1;
                 return tmpstr;
         }
         return NULL;
 }
+static char *rpm_getstr0(int tag)
+{
+        return rpm_getstr(tag, 0);
+}
+
+#if ENABLE_RPM
 
 static int rpm_getint(int tag, int itemindex)
 {
-        rpm_index **found;
+        rpm_index *found;
         char *tmpint;
 
         /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
          * it's ok to ignore it because tag won't be used as a pointer */
-        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
-        if (!found || itemindex >= found[0]->count)
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(G.mytags[0]), bsearch_rpmtag);
+        if (!found || itemindex >= found->count)
                 return -1;
 
-        tmpint = (char *) G.map + found[0]->offset;
-        if (found[0]->type == RPM_INT32_TYPE) {
+        tmpint = (char *) G.map + found->offset;
+        if (found->type == RPM_INT32_TYPE) {
                 tmpint += itemindex*4;
                 return ntohl(*(int32_t*)tmpint);
         }
-        if (found[0]->type == RPM_INT16_TYPE) {
+        if (found->type == RPM_INT16_TYPE) {
                 tmpint += itemindex*2;
                 return ntohs(*(int16_t*)tmpint);
         }
-        if (found[0]->type == RPM_INT8_TYPE) {
+        if (found->type == RPM_INT8_TYPE) {
                 tmpint += itemindex;
                 return *(int8_t*)tmpint;
         }
         return -1;
 }
 
+static int rpm_getcount(int tag)
+{
+        rpm_index *found;
+        found = bsearch(&tag, G.mytags, G.tagcount, sizeof(G.mytags[0]), bsearch_rpmtag);
+        if (!found)
+                return 0;
+        return found->count;
+}
+
 static void fileaction_dobackup(char *filename, int fileref)
 {
         struct stat oldfile;
@@ -273,11 +260,103 @@ static void loop_through_files(int filetag, void (*fileaction)(char *filename, i
         }
 }
 
+#if 0 //DEBUG
+static void print_all_tags(void)
+{
+        unsigned i = 0;
+        while (i < G.tagcount) {
+                rpm_index *tag = &G.mytags[i];
+                if (tag->type == RPM_STRING_TYPE
+                 || tag->type == RPM_I18NSTRING_TYPE
+                 || tag->type == RPM_STRING_ARRAY_TYPE
+                ) {
+                        unsigned n;
+                        char *str = (char *) G.map + tag->offset;
+
+                        printf("tag[%u] %08x type %08x offset %08x count %d '%s'\n",
+                                i, tag->tag, tag->type, tag->offset, tag->count, str
+                        );
+                        for (n = 1; n < tag->count; n++) {
+                                str += strlen(str) + 1;
+                                printf("\t'%s'\n", str);
+                        }
+                }
+                i++;
+        }
+}
+#else
+#define print_all_tags() ((void)0)
+#endif
+
+static void extract_cpio(int fd, const char *source_rpm)
+{
+        archive_handle_t *archive_handle;
+
+        if (source_rpm != NULL) {
+                /* Binary rpm (it was built from some SRPM), install to root */
+                xchdir("/");
+        } /* else: SRPM, install to current dir */
+
+        /* Initialize */
+        archive_handle = init_handle();
+        archive_handle->seek = seek_by_read;
+        archive_handle->action_data = data_extract_all;
+#if 0 /* For testing (rpm -i only lists the files in internal cpio): */
+        archive_handle->action_header = header_list;
+        archive_handle->action_data = data_skip;
+#endif
+        archive_handle->ah_flags = ARCHIVE_RESTORE_DATE | ARCHIVE_CREATE_LEADING_DIRS
+                /* compat: overwrite existing files.
+                 * try "rpm -i foo.src.rpm" few times in a row -
+                 * standard rpm will not complain.
+                 */
+                | ARCHIVE_REPLACE_VIA_RENAME;
+        archive_handle->src_fd = fd;
+        /*archive_handle->offset = 0; - init_handle() did it */
+
+        setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_compressed:*/ 1);
+        while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
+                continue;
+}
+
+//usage:#define rpm_trivial_usage
+//usage:       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
+//usage:#define rpm_full_usage "\n\n"
+//usage:       "Manipulate RPM packages\n"
+//usage:     "\nCommands:"
+//usage:     "\n        -i      Install package"
+//usage:     "\n        -qp     Query package"
+//usage:     "\n        -qpi    Show information"
+//usage:     "\n        -qpl    List contents"
+//usage:     "\n        -qpd    List documents"
+//usage:     "\n        -qpc    List config files"
+
+/* RPM version 4.13.0.1:
+ * Unlike -q, -i seems to imply -p: -i, -ip and -pi work the same.
+ * OTOH, with -q order is important: "-piq FILE.rpm" works as -qp, not -qpi
+ * (IOW: shows only package name, not package info).
+ * "-iq ARG" works as -q: treats ARG as package name, not a file.
+ *
+ * "man rpm" on -l option and options implying it:
+ * -l, --list           List files in package.
+ * -c, --configfiles    List only configuration files (implies -l).
+ * -d, --docfiles       List only documentation files (implies -l).
+ * -L, --licensefiles   List only license files (implies -l).
+ * --dump       Dump file information as follows (implies -l):
+ *              path size mtime digest mode owner group isconfig isdoc rdev symlink
+ * -s, --state  Display the states of files in the package (implies -l).
+ *              The state of each file is one of normal, not installed, or replaced.
+ *
+ * Looks like we can switch to getopt32 here: in practice, people
+ * do place -q first if they intend to use it (misinterpreting "-piq" wouldn't matter).
+ */
 int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm_main(int argc, char **argv)
 {
         int opt, func = 0;
-        const unsigned pagesize = getpagesize();
+
+        INIT_G();
+        G.pagesize = getpagesize();
 
         while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
                 switch (opt) {
@@ -289,17 +368,17 @@ int rpm_main(int argc, char **argv)
                         if (func) bb_show_usage();
                         func = rpm_query;
                         break;
-                case 'p': /* Query a package */
+                case 'p': /* Query a package (IOW: .rpm file, we are not querying RPMDB) */
                         func |= rpm_query_package;
                         break;
                 case 'l': /* List files in a package */
                         func |= rpm_query_list;
                         break;
-                case 'd': /* List doc files in a package (implies list) */
+                case 'd': /* List doc files in a package (implies -l) */
                         func |= rpm_query_list;
                         func |= rpm_query_list_doc;
                         break;
-                case 'c': /* List config files in a package (implies list) */
+                case 'c': /* List config files in a package (implies -l) */
                         func |= rpm_query_list;
                         func |= rpm_query_list_config;
                         break;
@@ -313,24 +392,18 @@ int rpm_main(int argc, char **argv)
                 bb_show_usage();
         }
 
-        while (*argv) {
+        for (;;) {
                 int rpm_fd;
-                unsigned mapsize;
                 const char *source_rpm;
 
-                rpm_fd = xopen(*argv++, O_RDONLY);
-                G.mytags = rpm_gettags(rpm_fd, &G.tagcount);
-                if (!G.mytags)
-                        bb_error_msg_and_die("error reading rpm header");
-                mapsize = xlseek(rpm_fd, 0, SEEK_CUR);
-                mapsize = (mapsize + pagesize) & -(int)pagesize;
-                /* Some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
-                G.map = mmap(0, mapsize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
-//FIXME: error check?
+                rpm_fd = rpm_gettags(*argv);
+                print_all_tags();
 
-                source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
+                source_rpm = rpm_getstr0(TAG_SOURCERPM);
 
                 if (func & rpm_install) {
+                        /* -i (and not -qi) */
+
                         /* Backup any config files */
                         loop_through_files(TAG_BASENAMES, fileaction_dobackup);
                         /* Extact the archive */
@@ -338,10 +411,13 @@ int rpm_main(int argc, char **argv)
                         /* Set the correct file uid/gid's */
                         loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
                 }
-                else if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
+                else
+                if ((func & (rpm_query|rpm_query_package)) == (rpm_query|rpm_query_package)) {
+                        /* -qp */
+
                         if (!(func & (rpm_query_info|rpm_query_list))) {
                                 /* If just a straight query, just give package name */
-                                printf("%s-%s-%s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_RELEASE, 0));
+                                printf("%s-%s-%s\n", rpm_getstr0(TAG_NAME), rpm_getstr0(TAG_VERSION), rpm_getstr0(TAG_RELEASE));
                         }
                         if (func & rpm_query_info) {
                                 /* Do the nice printout */
@@ -350,30 +426,33 @@ int rpm_main(int argc, char **argv)
                                 char bdatestring[50];
                                 const char *p;
 
-                                printf("%-12s: %s\n", "Name"        , rpm_getstr(TAG_NAME, 0));
+                                printf("%-12s: %s\n", "Name"        , rpm_getstr0(TAG_NAME));
                                 /* TODO compat: add "Epoch" here */
-                                printf("%-12s: %s\n", "Version"     , rpm_getstr(TAG_VERSION, 0));
-                                printf("%-12s: %s\n", "Release"     , rpm_getstr(TAG_RELEASE, 0));
+                                printf("%-12s: %s\n", "Version"     , rpm_getstr0(TAG_VERSION));
+                                printf("%-12s: %s\n", "Release"     , rpm_getstr0(TAG_RELEASE));
                                 /* add "Architecture" */
-                                printf("%-12s: %s\n", "Install Date", "(not installed)");
-                                printf("%-12s: %s\n", "Group"       , rpm_getstr(TAG_GROUP, 0));
+                                /* printf("%-12s: %s\n", "Install Date", "(not installed)"); - we don't know */
+                                printf("%-12s: %s\n", "Group"       , rpm_getstr0(TAG_GROUP));
                                 printf("%-12s: %d\n", "Size"        , rpm_getint(TAG_SIZE, 0));
-                                printf("%-12s: %s\n", "License"     , rpm_getstr(TAG_LICENSE, 0));
+                                printf("%-12s: %s\n", "License"     , rpm_getstr0(TAG_LICENSE));
                                 /* add "Signature" */
                                 printf("%-12s: %s\n", "Source RPM"  , source_rpm ? source_rpm : "(none)");
                                 bdate_time = rpm_getint(TAG_BUILDTIME, 0);
                                 bdate_ptm = localtime(&bdate_time);
                                 strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
                                 printf("%-12s: %s\n", "Build Date"  , bdatestring);
-                                printf("%-12s: %s\n", "Build Host"  , rpm_getstr(TAG_BUILDHOST, 0));
-                                p = rpm_getstr(TAG_PREFIXS, 0);
+                                printf("%-12s: %s\n", "Build Host"  , rpm_getstr0(TAG_BUILDHOST));
+                                p = rpm_getstr0(TAG_PREFIXS);
                                 printf("%-12s: %s\n", "Relocations" , p ? p : "(not relocatable)");
                                 /* add "Packager" */
-                                p = rpm_getstr(TAG_VENDOR, 0);
-                                printf("%-12s: %s\n", "Vendor"      , p ? p : "(none)");
-                                printf("%-12s: %s\n", "URL"         , rpm_getstr(TAG_URL, 0));
-                                printf("%-12s: %s\n", "Summary"     , rpm_getstr(TAG_SUMMARY, 0));
-                                printf("Description :\n%s\n", rpm_getstr(TAG_DESCRIPTION, 0));
+                                p = rpm_getstr0(TAG_VENDOR);
+                                if (p) /* rpm 4.13.0.1 does not show "(none)" for Vendor: */
+                                printf("%-12s: %s\n", "Vendor"      , p);
+                                p = rpm_getstr0(TAG_URL);
+                                if (p) /* rpm 4.13.0.1 does not show "(none)"/"(null)" for URL: */
+                                printf("%-12s: %s\n", "URL"         , p);
+                                printf("%-12s: %s\n", "Summary"     , rpm_getstr0(TAG_SUMMARY));
+                                printf("Description :\n%s\n", rpm_getstr0(TAG_DESCRIPTION));
                         }
                         if (func & rpm_query_list) {
                                 int count, it, flags;
@@ -396,10 +475,85 @@ int rpm_main(int argc, char **argv)
                                                 rpm_getstr(TAG_BASENAMES, it));
                                 }
                         }
+                } else {
+                        /* Unsupported (help text shows what we support) */
+                        bb_show_usage();
                 }
-                munmap(G.map, mapsize);
+                if (!*++argv)
+                        break;
+                munmap(G.map, G.mapsize);
                 free(G.mytags);
                 close(rpm_fd);
         }
+
         return 0;
 }
+
+#endif /* RPM */
+
+/*
+ * Mini rpm2cpio implementation for busybox
+ *
+ * Copyright (C) 2001 by Laurence Anderson
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config RPM2CPIO
+//config:       bool "rpm2cpio (20 kb)"
+//config:       default y
+//config:       help
+//config:       Converts a RPM file into a CPIO archive.
+
+//applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_RPM2CPIO) += rpm.o
+
+//usage:#define rpm2cpio_trivial_usage
+//usage:       "PACKAGE.rpm"
+//usage:#define rpm2cpio_full_usage "\n\n"
+//usage:       "Output a cpio archive of the rpm file"
+
+#if ENABLE_RPM2CPIO
+
+/* No getopt required */
+int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *str;
+        int rpm_fd;
+
+        INIT_G();
+        G.pagesize = getpagesize();
+
+        rpm_fd = rpm_gettags(argv[1]);
+
+        //if (SEAMLESS_COMPRESSION) - we do this at the end instead.
+        //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
+        //      signal(SIGCHLD, check_errors_in_children);
+
+        if (ENABLE_FEATURE_SEAMLESS_LZMA
+         && (str = rpm_getstr0(TAG_PAYLOADCOMPRESSOR)) != NULL
+         && strcmp(str, "lzma") == 0
+        ) {
+                // lzma compression can't be detected
+                // set up decompressor without detection
+                setup_lzma_on_fd(rpm_fd);
+        } else {
+                setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
+        }
+
+        if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
+                bb_error_msg_and_die("error unpacking");
+
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                close(rpm_fd);
+        }
+
+        if (SEAMLESS_COMPRESSION) {
+                check_errors_in_children(0);
+                return bb_got_signal;
+        }
+        return EXIT_SUCCESS;
+}
+
+#endif /* RPM2CPIO */
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
deleted file mode 100644
index 3e4a6a249..000000000
--- a/archival/rpm2cpio.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Mini rpm2cpio implementation for busybox
- *
- * Copyright (C) 2001 by Laurence Anderson
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-
-//config:config RPM2CPIO
-//config:       bool "rpm2cpio (20 kb)"
-//config:       default y
-//config:       help
-//config:       Converts a RPM file into a CPIO archive.
-
-//applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
-
-//usage:#define rpm2cpio_trivial_usage
-//usage:       "package.rpm"
-//usage:#define rpm2cpio_full_usage "\n\n"
-//usage:       "Output a cpio archive of the rpm file"
-
-#include "libbb.h"
-#include "bb_archive.h"
-#include "rpm.h"
-
-enum { rpm_fd = STDIN_FILENO };
-
-static unsigned skip_header(void)
-{
-        struct rpm_header header;
-        unsigned len;
-
-        xread(rpm_fd, &header, sizeof(header));
-//      if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC_STR, 3) != 0) {
-//              bb_error_msg_and_die("invalid RPM header magic");
-//      }
-//      if (header.version != 1) {
-//              bb_error_msg_and_die("unsupported RPM header version");
-//      }
-        if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER)) {
-                bb_error_msg_and_die("invalid RPM header magic or unsupported version");
-                // ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_MAGICnVER));
-        }
-
-        /* Seek past index entries, and past store */
-        len = 16 * ntohl(header.entries) + ntohl(header.size);
-        seek_by_jump(rpm_fd, len);
-
-        return sizeof(header) + len;
-}
-
-/* No getopt required */
-int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
-{
-        struct rpm_lead lead;
-        unsigned pos;
-
-        if (argv[1]) {
-                xmove_fd(xopen(argv[1], O_RDONLY), rpm_fd);
-        }
-        xread(rpm_fd, &lead, sizeof(lead));
-
-        /* Just check the magic, the rest is irrelevant */
-        if (lead.magic != htonl(RPM_LEAD_MAGIC)) {
-                bb_error_msg_and_die("invalid RPM magic");
-        }
-
-        /* Skip the signature header, align to 8 bytes */
-        pos = skip_header();
-        seek_by_jump(rpm_fd, (-(int)pos) & 7);
-
-        /* Skip the main header */
-        skip_header();
-
-        //if (SEAMLESS_COMPRESSION)
-        //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
-        //      signal(SIGCHLD, check_errors_in_children);
-
-        /* This works, but doesn't report uncompress errors (they happen in child) */
-        setup_unzip_on_fd(rpm_fd, /*fail_if_not_compressed:*/ 1);
-        if (bb_copyfd_eof(rpm_fd, STDOUT_FILENO) < 0)
-                bb_error_msg_and_die("error unpacking");
-
-        if (ENABLE_FEATURE_CLEAN_UP) {
-                close(rpm_fd);
-        }
-
-        if (SEAMLESS_COMPRESSION) {
-                check_errors_in_children(0);
-                return bb_got_signal;
-        }
-        return EXIT_SUCCESS;
-}
diff --git a/archival/tar.c b/archival/tar.c
index d90a5dc4f..503444796 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -278,23 +278,6 @@ static void chksum_and_xwrite(int fd, struct tar_header_t* hp)
         xwrite(fd, hp, sizeof(*hp));
 }
 
-static void replace_symlink_placeholders(llist_t *list)
-{
-        while (list) {
-                char *target;
-
-                target = list->data + strlen(list->data) + 1;
-                if (symlink(target, list->data)) {
-                        /* shared message */
-                        bb_error_msg_and_die("can't create %slink '%s' to '%s'",
-                                "sym",
-                                list->data, target
-                        );
-                }
-                list = list->link;
-        }
-}
-
 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
 static void writeLongname(int fd, int type, const char *name, int dir)
 {
@@ -969,6 +952,11 @@ static const char tar_longopts[] ALIGN1 =
         "exclude\0"             Required_argument "\xff"
 # endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,tar_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -995,21 +983,8 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 tar_handle->ah_flags |= ARCHIVE_DONT_RESTORE_PERM;
 
         /* Prepend '-' to the first argument if required */
-        opt_complementary = "--:" // first arg is options
-                "tt:vv:" // count -t,-v
-#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
-                "\xff::" // --exclude=PATTERN is a list
-#endif
-                IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
-                IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
-                IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
-#if ENABLE_FEATURE_TAR_LONG_OPTIONS
-                ":\xf9+" // --strip-components=NUM
-#endif
-        ;
-#if ENABLE_FEATURE_TAR_LONG_OPTIONS
-        applet_long_options = tar_longopts;
-#endif
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                argv[1] = xasprintf("-%s", argv[1]);
 #if ENABLE_DESKTOP
         /* Lie to buildroot when it starts asking stupid questions. */
         if (argv[1] && strcmp(argv[1], "--version") == 0) {
@@ -1046,7 +1021,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 #endif
-        opt = getopt32(argv,
+        opt = GETOPT32(argv, "^"
                 "txC:f:Oopvk"
                 IF_FEATURE_TAR_CREATE(   "ch"    )
                 IF_FEATURE_SEAMLESS_BZ2( "j"     )
@@ -1057,6 +1032,18 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 IF_FEATURE_SEAMLESS_Z(   "Z"     )
                 IF_FEATURE_TAR_NOPRESERVE_TIME("m")
                 IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
+                "\0"
+                "tt:vv:" // count -t,-v
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+                "\xff::" // --exclude=PATTERN is a list
+#endif
+                IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
+                IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
+                IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+                ":\xf9+" // --strip-components=NUM
+#endif
+                LONGOPTS
                 , &base_dir // -C dir
                 , &tar_filename // -f filename
                 IF_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
@@ -1280,8 +1267,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         while (get_header_tar(tar_handle) == EXIT_SUCCESS)
                 bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */
 
-        replace_symlink_placeholders(tar_handle->symlink_placeholders);
-
         /* Check that every file that should have been extracted was */
         while (tar_handle->accept) {
                 if (!find_list_entry(tar_handle->reject, tar_handle->accept->data)
diff --git a/archival/unzip.c b/archival/unzip.c
index f37ea3519..233487697 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -371,9 +371,15 @@ static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn)
                 target[xstate.mem_output_size] = '\0';
 #endif
         }
+        if (!unsafe_symlink_target(target)) {
 //TODO: libbb candidate
-        if (symlink(target, dst_fn))
-                bb_perror_msg_and_die("can't create symlink '%s'", dst_fn);
+                if (symlink(target, dst_fn)) {
+                        /* shared message */
+                        bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
+                                "sym", dst_fn, target
+                        );
+                }
+        }
         free(target);
 }
 #endif
diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig
index 6ff68a092..415f5a802 100644
--- a/configs/TEST_nommu_defconfig
+++ b/configs/TEST_nommu_defconfig
@@ -37,7 +37,6 @@ CONFIG_SELINUX=y
 CONFIG_FEATURE_PREFER_APPLETS=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
 
 #
 # Build Options
diff --git a/configs/TEST_noprintf_defconfig b/configs/TEST_noprintf_defconfig
index 4b2ef402a..9b378fd55 100644
--- a/configs/TEST_noprintf_defconfig
+++ b/configs/TEST_noprintf_defconfig
@@ -47,7 +47,6 @@ CONFIG_FEATURE_PIDFILE=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_SYSLOG is not set
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig
index 52f3e4670..4ac62b9da 100644
--- a/configs/TEST_rh9_defconfig
+++ b/configs/TEST_rh9_defconfig
@@ -46,7 +46,6 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
 
 #
 # Build Options
diff --git a/configs/android2_defconfig b/configs/android2_defconfig
index 9202320a4..03323654d 100644
--- a/configs/android2_defconfig
+++ b/configs/android2_defconfig
@@ -49,7 +49,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig
index 1901bdbb0..6b640bfb7 100644
--- a/configs/android_502_defconfig
+++ b/configs/android_502_defconfig
@@ -123,7 +123,6 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/configs/android_defconfig b/configs/android_defconfig
index ea6e8a79e..3b34f37aa 100644
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -49,7 +49,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index 61871fcb1..7f65d544c 100644
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -52,7 +52,6 @@ CONFIG_PID_FILE_PATH=""
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig
index 54aa44470..ee370a61d 100644
--- a/configs/cygwin_defconfig
+++ b/configs/cygwin_defconfig
@@ -49,7 +49,6 @@ CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/configs/freebsd_defconfig b/configs/freebsd_defconfig
index fadbca13b..47e705963 100644
--- a/configs/freebsd_defconfig
+++ b/configs/freebsd_defconfig
@@ -49,7 +49,6 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
 
 #
 # Build Options
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index d8152de6b..75380a90b 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -14,7 +14,7 @@
 //config:       This program is used to change to another terminal.
 //config:       Example: chvt 4 (change to terminal /dev/tty4)
 
-//applet:IF_CHVT(APPLET(chvt, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_CHVT(APPLET_NOEXEC(chvt, chvt, BB_DIR_USR_BIN, BB_SUID_DROP, chvt))
 
 //kbuild:lib-$(CONFIG_CHVT) += chvt.o
 
diff --git a/console-tools/clear.c b/console-tools/clear.c
index 13eec498b..3cc16257b 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -12,7 +12,7 @@
 //config:       help
 //config:       This program clears the terminal screen.
 
-//applet:IF_CLEAR(APPLET(clear, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_CLEAR(APPLET_NOFORK(clear, clear, BB_DIR_USR_BIN, BB_SUID_DROP, clear))
 
 //kbuild:lib-$(CONFIG_CLEAR) += clear.o
 
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 6ffb1471e..05731fb78 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -14,7 +14,7 @@
 //config:       help
 //config:       This program deallocates unused virtual consoles.
 
-//applet:IF_DEALLOCVT(APPLET(deallocvt, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_DEALLOCVT(APPLET_NOEXEC(deallocvt, deallocvt, BB_DIR_USR_BIN, BB_SUID_DROP, deallocvt))
 
 //kbuild:lib-$(CONFIG_DEALLOCVT) += deallocvt.o
 
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index d4e2cf281..b803e579a 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -15,7 +15,8 @@
 //config:       This program dumps the kernel's keyboard translation table to
 //config:       stdout, in binary format. You can then use loadkmap to load it.
 
-//applet:IF_DUMPKMAP(APPLET(dumpkmap, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_DUMPKMAP(APPLET_NOEXEC(dumpkmap, dumpkmap, BB_DIR_BIN, BB_SUID_DROP, dumpkmap))
+/* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
 
 //kbuild:lib-$(CONFIG_DUMPKMAP) += dumpkmap.o
 
@@ -47,8 +48,6 @@ int dumpkmap_main(int argc UNUSED_PARAM, char **argv)
 {
         struct kbentry ke;
         int i, j, fd;
-#define flags bb_common_bufsiz1
-        setup_common_bufsiz();
 
         /* When user accidentally runs "dumpkmap FILE"
          * instead of "dumpkmap >FILE", we'd dump binary stuff to tty.
@@ -60,19 +59,8 @@ int dumpkmap_main(int argc UNUSED_PARAM, char **argv)
 
         fd = get_console_fd_or_die();
 
-#if 0
-        write(STDOUT_FILENO, "bkeymap", 7);
-        /* Here we want to set everything to 0 except for indexes:
-         * [0-2] [4-6] [8-10] [12]
-         */
-        /*memset(flags, 0x00, MAX_NR_KEYMAPS); - already is */
-        memset(flags, 0x01, 13);
-        flags[3] = flags[7] = flags[11] = 0;
-        /* dump flags */
-        write(STDOUT_FILENO, flags, MAX_NR_KEYMAPS);
-#define flags7 flags
-#else
-        /* Same effect */
+#define flags bb_common_bufsiz1
+        setup_common_bufsiz();
         /*                     0 1 2 3 4 5 6 7 8 9 a b c=12 */
         memcpy(flags, "bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1",
         /* Can use sizeof, or sizeof-1. sizeof is even, using that */
@@ -80,7 +68,6 @@ int dumpkmap_main(int argc UNUSED_PARAM, char **argv)
         );
         write(STDOUT_FILENO, flags, 7 + MAX_NR_KEYMAPS);
 #define flags7 (flags + 7)
-#endif
 
         for (i = 0; i < 13; i++) {
                 if (flags7[i]) {
diff --git a/console-tools/fgconsole.c b/console-tools/fgconsole.c
index 64311f6ea..a353becd5 100644
--- a/console-tools/fgconsole.c
+++ b/console-tools/fgconsole.c
@@ -13,7 +13,7 @@
 //config:       help
 //config:       This program prints active (foreground) console number.
 
-//applet:IF_FGCONSOLE(APPLET(fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_FGCONSOLE(APPLET_NOEXEC(fgconsole, fgconsole, BB_DIR_USR_BIN, BB_SUID_DROP, fgconsole))
 
 //kbuild:lib-$(CONFIG_FGCONSOLE) += fgconsole.o
 
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index d81c56e92..f16449dcd 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -15,19 +15,19 @@
 //config:       help
 //config:       This program reports and sets keyboard mode.
 
-//applet:IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_KBD_MODE(APPLET_NOEXEC(kbd_mode, kbd_mode, BB_DIR_BIN, BB_SUID_DROP, kbd_mode))
 
 //kbuild:lib-$(CONFIG_KBD_MODE) += kbd_mode.o
 
 //usage:#define kbd_mode_trivial_usage
 //usage:       "[-a|k|s|u] [-C TTY]"
 //usage:#define kbd_mode_full_usage "\n\n"
-//usage:       "Report or set the keyboard mode\n"
+//usage:       "Report or set VT console keyboard mode\n"
 //usage:     "\n        -a      Default (ASCII)"
-//usage:     "\n        -k      Medium-raw (keyboard)"
+//usage:     "\n        -k      Medium-raw (keycode)"
 //usage:     "\n        -s      Raw (scancode)"
 //usage:     "\n        -u      Unicode (utf-8)"
-//usage:     "\n        -C TTY  Affect TTY instead of /dev/tty"
+//usage:     "\n        -C TTY  Affect TTY"
 
 #include "libbb.h"
 #include <linux/kd.h>
@@ -43,11 +43,20 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
         };
         int fd;
         unsigned opt;
-        const char *tty_name = CURRENT_TTY;
+        const char *tty_name;
 
         opt = getopt32(argv, "sakuC:", &tty_name);
-        fd = xopen_nonblocking(tty_name);
-        opt &= 0xf; /* clear -C bit, see (*) */
+        if (opt & 0x10) {
+                opt &= 0xf; /* clear -C bit, see (*) */
+                fd = xopen_nonblocking(tty_name);
+        } else {
+                /* kbd-2.0.3 tries in sequence:
+                 * fd#0, /dev/tty, /dev/tty0.
+                 * get_console_fd_or_die: /dev/console, /dev/tty0, /dev/tty.
+                 * kbd-2.0.3 checks KDGKBTYPE, get_console_fd_or_die checks too.
+                 */
+                fd = get_console_fd_or_die();
+        }
 
         if (!opt) { /* print current setting */
                 const char *mode = "unknown";
@@ -62,9 +71,19 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
                         mode = "mediumraw (keycode)";
                 else if (m == K_UNICODE)
                         mode = "Unicode (UTF-8)";
+                else if (m == 4 /*K_OFF*/) /* kbd-2.0.3 does not show this mode, says "unknown" */
+                        mode = "off";
                 printf("The keyboard is in %s mode\n", mode);
         } else {
-                /* here we depend on specific bits assigned to options (*) */
+                /* here we depend on specific bits assigned to options (*)
+                 * KDSKBMODE constants have these values:
+                 * #define K_RAW           0x00
+                 * #define K_XLATE         0x01
+                 * #define K_MEDIUMRAW     0x02
+                 * #define K_UNICODE       0x03
+                 * #define K_OFF           0x04
+                 * (looks like "-ak" together would cause the same effect as -u)
+                 */
                 opt = opt & UNICODE ? 3 : opt >> 1;
                 /* double cast prevents warnings about widening conversion */
                 xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt);
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 6dc8fa831..81d0c3db4 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -51,31 +51,12 @@
 //config:       default y
 //config:       depends on LOADFONT || SETFONT
 
-//applet:IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
-//applet:IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_LOADFONT(APPLET_NOEXEC(loadfont, loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP, loadfont))
+//applet:IF_SETFONT(APPLET_NOEXEC(setfont, setfont, BB_DIR_USR_SBIN, BB_SUID_DROP, setfont))
 
 //kbuild:lib-$(CONFIG_LOADFONT) += loadfont.o
 //kbuild:lib-$(CONFIG_SETFONT) += loadfont.o
 
-//usage:#define loadfont_trivial_usage
-//usage:       "< font"
-//usage:#define loadfont_full_usage "\n\n"
-//usage:       "Load a console font from stdin"
-/* //usage:     "\n     -C TTY  Affect TTY instead of /dev/tty" */
-//usage:
-//usage:#define loadfont_example_usage
-//usage:       "$ loadfont < /etc/i18n/fontname\n"
-//usage:
-//usage:#define setfont_trivial_usage
-//usage:       "FONT [-m MAPFILE] [-C TTY]"
-//usage:#define setfont_full_usage "\n\n"
-//usage:       "Load a console font\n"
-//usage:     "\n        -m MAPFILE      Load console screen map"
-//usage:     "\n        -C TTY          Affect TTY instead of /dev/tty"
-//usage:
-//usage:#define setfont_example_usage
-//usage:       "$ setfont -m koi8-r /etc/i18n/fontname\n"
-
 #include "libbb.h"
 #include <sys/kd.h>
 
@@ -352,6 +333,14 @@ static void do_load(int fd, unsigned char *buffer, size_t len)
 
 
 #if ENABLE_LOADFONT
+//usage:#define loadfont_trivial_usage
+//usage:       "< font"
+//usage:#define loadfont_full_usage "\n\n"
+//usage:       "Load a console font from stdin"
+/* //usage:     "\n     -C TTY  Affect TTY instead of /dev/tty" */
+//usage:
+//usage:#define loadfont_example_usage
+//usage:       "$ loadfont < /etc/i18n/fontname\n"
 int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int loadfont_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -359,8 +348,7 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
         unsigned char *buffer;
 
         // no arguments allowed!
-        opt_complementary = "=0";
-        getopt32(argv, "");
+        getopt32(argv, "^" "" "\0" "=0");
 
         /*
          * We used to look at the length of the input file
@@ -380,11 +368,9 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
 }
 #endif
 
-#if ENABLE_SETFONT
-
-/*
-kbd-1.12:
 
+#if ENABLE_SETFONT
+/* kbd-1.12:
 setfont [-O font+umap.orig] [-o font.orig] [-om cmap.orig]
 [-ou umap.orig] [-N] [font.new ...] [-m cmap] [-u umap] [-C console]
 [-hNN] [-v] [-V]
@@ -414,8 +400,17 @@ setfont [-O font+umap.orig] [-o font.orig] [-om cmap.orig]
 -v     Verbose
 -V     Version
 */
+//usage:#define setfont_trivial_usage
+//usage:       "FONT [-m MAPFILE] [-C TTY]"
+//usage:#define setfont_full_usage "\n\n"
+//usage:       "Load a console font\n"
+//usage:     "\n        -m MAPFILE      Load console screen map"
+//usage:     "\n        -C TTY          Affect TTY instead of /dev/tty"
+//usage:
+//usage:#define setfont_example_usage
+//usage:       "$ setfont -m koi8-r /etc/i18n/fontname\n"
 
-#if ENABLE_FEATURE_SETFONT_TEXTUAL_MAP
+# if ENABLE_FEATURE_SETFONT_TEXTUAL_MAP
 static int ctoi(char *s)
 {
         if (s[0] == '\'' && s[1] != '\0' && s[2] == '\'' && s[3] == '\0')
@@ -429,7 +424,7 @@ static int ctoi(char *s)
                 return -1;
         return xstrtoul(s, 0);
 }
-#endif
+# endif
 
 int setfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setfont_main(int argc UNUSED_PARAM, char **argv)
@@ -441,8 +436,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
         char *mapfilename;
         const char *tty_name = CURRENT_TTY;
 
-        opt_complementary = "=1";
-        opts = getopt32(argv, "m:C:", &mapfilename, &tty_name);
+        opts = getopt32(argv, "^" "m:C:" "\0" "=1", &mapfilename, &tty_name);
         argv += optind;
 
         fd = xopen_nonblocking(tty_name);
@@ -480,7 +474,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
                         if (len == 2*E_TABSZ)
                                 mode = PIO_UNISCRNMAP;
                 }
-#if ENABLE_FEATURE_SETFONT_TEXTUAL_MAP
+# if ENABLE_FEATURE_SETFONT_TEXTUAL_MAP
                 // assume textual Unicode console maps:
                 // 0x00 U+0000  #  NULL (NUL)
                 // 0x01 U+0001  #  START OF HEADING (SOH)
@@ -527,7 +521,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
                         }
 #undef unicodes
                 }
-#endif // ENABLE_FEATURE_SETFONT_TEXTUAL_MAP
+# endif // ENABLE_FEATURE_SETFONT_TEXTUAL_MAP
 
                 // do set screen map
                 xioctl(fd, mode, map);
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 839dc2083..404aba1fb 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -14,7 +14,7 @@
 //config:       This program loads a keyboard translation table from
 //config:       standard input.
 
-//applet:IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_LOADKMAP(APPLET_NOEXEC(loadkmap, loadkmap, BB_DIR_SBIN, BB_SUID_DROP, loadkmap))
 
 //kbuild:lib-$(CONFIG_LOADKMAP) += loadkmap.o
 
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index f3db28367..423122fe9 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -99,7 +99,7 @@ static int find_free_vtno(void)
         /*xfunc_error_retval = 3; - do we need compat? */
         if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0)
                 bb_perror_msg_and_die("can't find open VT");
-// Not really needed, grep for DAEMON_ONLY_SANITIZE
+// Not really needed, grep for DAEMON_CLOSE_EXTRA_FDS
 //      if (fd > 2)
 //              close(fd);
         return vtno;
@@ -155,7 +155,7 @@ int openvt_main(int argc UNUSED_PARAM, char **argv)
         /* Grab new VT */
         sprintf(vtname, VC_FORMAT, vtno);
         /* (Try to) clean up stray open fds above fd 2 */
-        bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS | DAEMON_ONLY_SANITIZE, NULL);
+        bb_daemon_helper(DAEMON_CLOSE_EXTRA_FDS);
         close(STDIN_FILENO);
         /*setsid(); - BAD IDEA: after we exit, child is SIGHUPed... */
         xopen(vtname, O_RDWR);
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 04e5b0ca1..f2b900ddb 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -16,7 +16,7 @@
 //config:       This program is used to reset the terminal screen, if it
 //config:       gets messed up.
 
-//applet:IF_RESET(APPLET(reset, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_RESET(APPLET_NOEXEC(reset, reset, BB_DIR_USR_BIN, BB_SUID_DROP, reset))
 
 //kbuild:lib-$(CONFIG_RESET) += reset.o
 
diff --git a/console-tools/resize.c b/console-tools/resize.c
index 62928a01e..8aa487c41 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -23,7 +23,8 @@
 //config:       E.g.:
 //config:       COLUMNS=80;LINES=44;export COLUMNS LINES;
 
-//applet:IF_RESIZE(APPLET(resize, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_RESIZE(APPLET_NOEXEC(resize, resize, BB_DIR_USR_BIN, BB_SUID_DROP, resize))
+/* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
 
 //kbuild:lib-$(CONFIG_RESIZE) += resize.o
 
@@ -63,6 +64,7 @@ int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
          */
 
         tcgetattr(STDERR_FILENO, old_termios_p); /* fiddle echo */
+//TODO: die if the above fails?
         memcpy(&new, old_termios_p, sizeof(new));
         new.c_cflag |= (CLOCAL | CREAD);
         new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index ad0f756ca..bad2b76e4 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -12,23 +12,31 @@
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:       This program redirects the system console to another device,
+//config:       Redirect writes to /dev/console to another device,
 //config:       like the current tty while logged in via telnet.
+//config:       This does not redirect kernel log, only writes
+//config:       from user space.
 //config:
 //config:config FEATURE_SETCONSOLE_LONG_OPTIONS
 //config:       bool "Enable long options"
 //config:       default y
 //config:       depends on SETCONSOLE && LONG_OPTS
 
-//applet:IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_SETCONSOLE(APPLET_NOEXEC(setconsole, setconsole, BB_DIR_SBIN, BB_SUID_DROP, setconsole))
 
 //kbuild:lib-$(CONFIG_SETCONSOLE) += setconsole.o
 
 //usage:#define setconsole_trivial_usage
-//usage:       "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
+//usage:       "[-r] [DEVICE]"
 //usage:#define setconsole_full_usage "\n\n"
-//usage:       "Redirect system console output to DEVICE (default: /dev/tty)\n"
-//usage:     "\n        -r      Reset output to /dev/console"
+//usage:       "Make writes to /dev/console appear on DEVICE (default: /dev/tty)."
+//usage:   "\n""Does not redirect kernel log output or reads from /dev/console."
+//usage:   "\n"
+//usage:   "\n""        -r      Reset: writes to /dev/console go to kernel log tty(s)"
+
+/* It was a bbox-specific invention, but SUSE does have a similar utility.
+ * SUSE has no -r option, though.
+ */
 
 #include "libbb.h"
 
@@ -36,17 +44,10 @@ int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setconsole_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *device = CURRENT_TTY;
-        bool reset;
-
-#if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
-        static const char setconsole_longopts[] ALIGN1 =
-                "reset\0" No_argument "r"
-                ;
-        applet_long_options = setconsole_longopts;
-#endif
+        int reset;
+
         /* at most one non-option argument */
-        opt_complementary = "?1";
-        reset = getopt32(argv, "r");
+        reset = getopt32(argv, "^" "r" "\0" "?1");
 
         argv += 1 + reset;
         if (*argv) {
@@ -56,6 +57,9 @@ int setconsole_main(int argc UNUSED_PARAM, char **argv)
                         device = DEV_CONSOLE;
         }
 
+//TODO: fails if TIOCCONS redir is already active to some tty.
+//I think SUSE version first does TIOCCONS on /dev/console fd (iow: resets)
+//then TIOCCONS to new tty?
         xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL);
         return EXIT_SUCCESS;
 }
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 543fbe3e0..1363ac9d1 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -16,17 +16,16 @@
 //config:       This program loads entries into the kernel's scancode-to-keycode
 //config:       map, allowing unusual keyboards to generate usable keycodes.
 
-//applet:IF_SETKEYCODES(APPLET(setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_SETKEYCODES(APPLET_NOEXEC(setkeycodes, setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP, setkeycodes))
 
 //kbuild:lib-$(CONFIG_SETKEYCODES) += setkeycodes.o
 
 //usage:#define setkeycodes_trivial_usage
-//usage:       "SCANCODE KEYCODE..."
+//usage:       "{ SCANCODE KEYCODE }..."
 //usage:#define setkeycodes_full_usage "\n\n"
-//usage:       "Set entries into the kernel's scancode-to-keycode map,\n"
+//usage:       "Modify kernel's scancode-to-keycode map,\n"
 //usage:       "allowing unusual keyboards to generate usable keycodes.\n\n"
-//usage:       "SCANCODE may be either xx or e0xx (hexadecimal),\n"
-//usage:       "and KEYCODE is given in decimal."
+//usage:       "SCANCODE is either xx or e0xx (hexadecimal), KEYCODE is decimal."
 //usage:
 //usage:#define setkeycodes_example_usage
 //usage:       "$ setkeycodes e030 127\n"
@@ -45,7 +44,6 @@ int setkeycodes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setkeycodes_main(int argc, char **argv)
 {
         int fd;
-        struct kbkeycode a;
 
         if (!(argc & 1) /* if even */ || argc < 2) {
                 bb_show_usage();
@@ -54,7 +52,10 @@ int setkeycodes_main(int argc, char **argv)
         fd = get_console_fd_or_die();
 
         while (argv[1]) {
-                int sc = xstrtoul_range(argv[1], 16, 0, 0xe07f);
+                struct kbkeycode a;
+                int sc;
+
+                sc = xstrtoul_range(argv[1], 16, 0, 0xe07f);
                 if (sc >= 0xe000) {
                         sc -= 0xe000;
                         sc += 0x0080;
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index 1b5814eee..6778a4d2b 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -15,14 +15,26 @@
 //config:       help
 //config:       This program redirects the output console of kernel messages.
 
-//applet:IF_SETLOGCONS(APPLET(setlogcons, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_SETLOGCONS(APPLET_NOEXEC(setlogcons, setlogcons, BB_DIR_USR_SBIN, BB_SUID_DROP, setlogcons))
 
 //kbuild:lib-$(CONFIG_SETLOGCONS) += setlogcons.o
 
 //usage:#define setlogcons_trivial_usage
 //usage:       "[N]"
 //usage:#define setlogcons_full_usage "\n\n"
-//usage:       "Redirect the kernel output to console N. Default:0 (current console)"
+//usage:       "Pin kernel output to VT console N. Default:0 (do not pin)"
+
+// Comment from kernel source:
+/* ...
+ * By default, the kernel messages are always printed on the current virtual
+ * console. However, the user may modify that default with the
+ * TIOCL_SETKMSGREDIRECT ioctl call.
+ *
+ * This function sets the kernel message console to be @new. It returns the old
+ * virtual console number. The virtual terminal number 0 (both as parameter and
+ * return value) means no redirection (i.e. always printed on the currently
+ * active console).
+ */
 
 #include "libbb.h"
 
@@ -33,8 +45,8 @@ int setlogcons_main(int argc UNUSED_PARAM, char **argv)
                 char fn;
                 char subarg;
         } arg = {
-                11, /* redirect kernel messages */
-                0   /* to specified console (current as default) */
+                11, /* redirect kernel messages (TIOCL_SETKMSGREDIRECT) */
+                0
         };
 
         if (argv[1])
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
 
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index c6a90a486..e4d61df35 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -159,10 +159,15 @@ static const char runparts_longopts[] ALIGN1 =
         "reverse\0" No_argument       "\xf0"
         "test\0"    No_argument       "\xf1"
         "exit-on-error\0" No_argument "\xf2"
-#if ENABLE_FEATURE_RUN_PARTS_FANCY
+# if ENABLE_FEATURE_RUN_PARTS_FANCY
         "list\0"    No_argument       "\xf3"
-#endif
+# endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,runparts_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int run_parts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -175,12 +180,10 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
-        applet_long_options = runparts_longopts;
-#endif
         /* We require exactly one argument: the directory name */
-        opt_complementary = "=1";
-        getopt32(argv, "a:*u:", &arg_list, &umask_p);
+        GETOPT32(argv, "^" "a:*u:" "\0" "=1" LONGOPTS,
+                        &arg_list, &umask_p
+        );
 
         umask(xstrtou_range(umask_p, 8, 0, 07777));
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 9d60b2c7f..c8b7fa8f2 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -79,6 +79,7 @@ Misc options:
 //config:       -N|--nicelevel N
 
 //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
+/* not NOEXEC: uses bb_common_bufsiz1 */
 
 //kbuild:lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
 
@@ -86,44 +87,15 @@ Misc options:
 //usage:       "[OPTIONS] [-S|-K] ... [-- ARGS...]"
 //usage:#define start_stop_daemon_full_usage "\n\n"
 //usage:       "Search for matching processes, and then\n"
-//usage:       "-K: stop all matching processes.\n"
-//usage:       "-S: start a process unless a matching process is found.\n"
-//usage:        IF_FEATURE_START_STOP_DAEMON_LONG_OPTIONS(
-//usage:     "\nProcess matching:"
-//usage:     "\n        -u,--user USERNAME|UID  Match only this user's processes"
-//usage:     "\n        -n,--name NAME          Match processes with NAME"
-//usage:     "\n                                in comm field in /proc/PID/stat"
-//usage:     "\n        -x,--exec EXECUTABLE    Match processes with this command"
-//usage:     "\n                                in /proc/PID/{exe,cmdline}"
-//usage:     "\n        -p,--pidfile FILE       Match a process with PID from the file"
-//usage:     "\n        All specified conditions must match"
-//usage:     "\n-S only:"
-//usage:     "\n        -x,--exec EXECUTABLE    Program to run"
-//usage:     "\n        -a,--startas NAME       Zeroth argument"
-//usage:     "\n        -b,--background         Background"
-//usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
-//usage:     "\n        -N,--nicelevel N        Change nice level"
-//usage:        )
-//usage:     "\n        -c,--chuid USER[:[GRP]] Change to user/group"
-//usage:     "\n        -m,--make-pidfile       Write PID to the pidfile specified by -p"
-//usage:     "\n-K only:"
-//usage:     "\n        -s,--signal SIG         Signal to send"
-//usage:     "\n        -t,--test               Match only, exit with 0 if a process is found"
-//usage:     "\nOther:"
-//usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
-//usage:     "\n        -o,--oknodo             Exit with status 0 if nothing is done"
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:        )
-//usage:     "\n        -q,--quiet              Quiet"
-//usage:        )
-//usage:        IF_NOT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS(
+//usage:       "-K: stop all matching processes\n"
+//usage:       "-S: start a process unless a matching process is found\n"
 //usage:     "\nProcess matching:"
 //usage:     "\n        -u USERNAME|UID Match only this user's processes"
 //usage:     "\n        -n NAME         Match processes with NAME"
 //usage:     "\n                        in comm field in /proc/PID/stat"
 //usage:     "\n        -x EXECUTABLE   Match processes with this command"
 //usage:     "\n                        command in /proc/PID/cmdline"
-//usage:     "\n        -p FILE         Match a process with PID from the file"
+//usage:     "\n        -p FILE         Match a process with PID from FILE"
 //usage:     "\n        All specified conditions must match"
 //usage:     "\n-S only:"
 //usage:     "\n        -x EXECUTABLE   Program to run"
@@ -132,18 +104,17 @@ Misc options:
 //usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
 //usage:     "\n        -N N            Change nice level"
 //usage:        )
-//usage:     "\n        -c USER[:[GRP]] Change to user/group"
-//usage:     "\n        -m              Write PID to the pidfile specified by -p"
+//usage:     "\n        -c USER[:[GRP]] Change user/group"
+//usage:     "\n        -m              Write PID to pidfile specified by -p"
 //usage:     "\n-K only:"
 //usage:     "\n        -s SIG          Signal to send"
-//usage:     "\n        -t              Match only, exit with 0 if a process is found"
+//usage:     "\n        -t              Match only, exit with 0 if found"
 //usage:     "\nOther:"
 //usage:        IF_FEATURE_START_STOP_DAEMON_FANCY(
 //usage:     "\n        -o              Exit with status 0 if nothing is done"
 //usage:     "\n        -v              Verbose"
 //usage:        )
 //usage:     "\n        -q              Quiet"
-//usage:        )
 
 #include <sys/resource.h>
 
@@ -409,11 +380,11 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
         "quiet\0"        No_argument       "q"
         "test\0"         No_argument       "t"
         "make-pidfile\0" No_argument       "m"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+# if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
         "oknodo\0"       No_argument       "o"
         "verbose\0"      No_argument       "v"
         "nicelevel\0"    Required_argument "N"
-#endif
+# endif
         "startas\0"      Required_argument "a"
         "name\0"         Required_argument "n"
         "signal\0"       Required_argument "s"
@@ -421,10 +392,15 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
         "chuid\0"        Required_argument "c"
         "exec\0"         Required_argument "x"
         "pidfile\0"      Required_argument "p"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+# if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
         "retry\0"        Required_argument "R"
-#endif
+# endif
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS start_stop_daemon_longopts,
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int start_stop_daemon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -445,19 +421,18 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
-        applet_long_options = start_stop_daemon_longopts;
-#endif
-
-        /* -K or -S is required; they are mutually exclusive */
-        /* -p is required if -m is given */
-        /* -xpun (at least one) is required if -K is given */
-        /* -xa (at least one) is required if -S is given */
-        /* -q turns off -v */
-        opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"
-                IF_FEATURE_START_STOP_DAEMON_FANCY("q-v");
-        opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"
-                IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
+        opt = GETOPT32(argv, "^"
+                "KSbqtma:n:s:u:c:x:p:"
+                IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:")
+                        /* -K or -S is required; they are mutually exclusive */
+                        /* -p is required if -m is given */
+                        /* -xpun (at least one) is required if -K is given */
+                        /* -xa (at least one) is required if -S is given */
+                        /* -q turns off -v */
+                        "\0"
+                        "K:S:K--S:S--K:m?p:K?xpun:S?xa"
+                        IF_FEATURE_START_STOP_DAEMON_FANCY("q-v"),
+                LONGOPTS
                 &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
                 IF_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
                 /* We accept and ignore -R <param> / --retry <param> */
@@ -516,6 +491,11 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                 /* DAEMON_DEVNULL_STDIO is superfluous -
                  * it's always done by bb_daemonize() */
 #else
+                /* Daemons usually call bb_daemonize_or_rexec(), but SSD can do
+                 * without: SSD is not itself a daemon, it _execs_ a daemon.
+                 * The usual NOMMU problem of "child can't run indefinitely,
+                 * it must exec" does not bite us: we exec anyway.
+                 */
                 pid_t pid = xvfork();
                 if (pid != 0) {
                         /* parent */
@@ -525,12 +505,8 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                 }
                 /* Child */
                 setsid(); /* detach from controlling tty */
-                /* Redirect stdio to /dev/null, close extra FDs.
-                 * We do not actually daemonize because of DAEMON_ONLY_SANITIZE */
-                bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO
-                        + DAEMON_CLOSE_EXTRA_FDS
-                        + DAEMON_ONLY_SANITIZE,
-                        NULL /* argv, unused */ );
+                /* Redirect stdio to /dev/null, close extra FDs */
+                bb_daemon_helper(DAEMON_DEVNULL_STDIO + DAEMON_CLOSE_EXTRA_FDS);
 #endif
         }
         if (opt & OPT_MAKEPID) {
diff --git a/debianutils/which.c b/debianutils/which.c
index 23a481438..fbfd19cdc 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -12,7 +12,7 @@
 //config:       which is used to find programs in your PATH and
 //config:       print out their pathnames.
 
-//applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_WHICH(APPLET_NOFORK(which, which, BB_DIR_USR_BIN, BB_SUID_DROP, which))
 
 //kbuild:lib-$(CONFIG_WHICH) += which.o
 
@@ -37,8 +37,7 @@ int which_main(int argc UNUSED_PARAM, char **argv)
         if (!env_path)
                 env_path = bb_default_root_path;
 
-        opt_complementary = "-1"; /* at least one argument */
-        getopt32(argv, "a");
+        getopt32(argv, "^" "a" "\0" "-1"/*at least one arg*/);
         argv += optind;
 
         do {
@@ -73,6 +72,8 @@ int which_main(int argc UNUSED_PARAM, char **argv)
                         char *tmp;
 
                         path = tmp = xstrdup(env_path);
+//NOFORK FIXME: nested xmallocs (one is inside find_executable())
+//can leak memory on failure
                         while ((p = find_executable(*argv, &tmp)) != NULL) {
                                 missing = 0;
                                 puts(p);
diff --git a/docs/new-applet-HOWTO.txt b/docs/new-applet-HOWTO.txt
index 078e77bce..619d47fb8 100644
--- a/docs/new-applet-HOWTO.txt
+++ b/docs/new-applet-HOWTO.txt
@@ -147,17 +147,17 @@ Placement / Directory
 
 Find the appropriate directory for your new applet.
 
-Add the kbuild snippet to the .c file:
-
-//kbuild:lib-$(CONFIG_MU) += mu.o
-
 Add the config snippet to the .c file:
 
 //config:config MU
 //config:       bool "MU"
 //config:       default y
 //config:       help
-//config:         Returns an indeterminate value.
+//config:       Returns an indeterminate value.
+
+Add the kbuild snippet to the .c file:
+
+//kbuild:lib-$(CONFIG_MU) += mu.o
 
 
 Usage String(s)
@@ -168,8 +168,9 @@ This should look like the following:
 
 //usage:#define mu_trivial_usage
 //usage:        "[-abcde] FILE..."
-//usage:#define mu_full_usage
-//usage:        "Returns an indeterminate value\n"
+//usage:#define mu_full_usage "\n\n"
+//usage:        "Returns an indeterminate value"
+//usage:     "\n"
 //usage:     "\n        -a      First function"
 //usage:     "\n        -b      Second function"
 //usage:        ...
diff --git a/docs/nofork_noexec.txt b/docs/nofork_noexec.txt
index a24dd9c27..9d210a1c9 100644
--- a/docs/nofork_noexec.txt
+++ b/docs/nofork_noexec.txt
@@ -10,13 +10,8 @@ of reimplemented Unix commands, and we can do the same trick
 for speeding up busybox shells, and more. NOEXEC and NOFORK applets
 are exactly those applets which are eligible for these tricks.
 
-Applet will be subject to NOFORK/NOEXEC tricks if it is marked as such
-in applets.h. FEATURE_PREFER_APPLETS is a config option which
-globally enables usage of NOFORK/NOEXEC tricks.
-If it is enabled, FEATURE_SH_STANDALONE can be enabled too,
-and then shells will use NOFORK/NOEXEC tricks for ordinary commands.
-NB: shell builtins use these tricks regardless of FEATURE_SH_STANDALONE
-or FEATURE_PREFER_APPLETS.
+Applet will be subject to NOFORK/NOEXEC tricks only if it is marked
+as such in applets.src.h or in their inline "//applet:" directives.
 
 In C, if you want to call a program and wait for it, use
 spawn_and_wait(argv), BB_EXECVP(prog,argv) or BB_EXECLP(prog,argv0,...).
@@ -24,6 +19,31 @@ They check whether program name is an applet name and optionally
 do NOFORK/NOEXEC thing depending on configuration.
 
 
+        Relevant CONFIG options
+
+FEATURE_PREFER_APPLETS
+  Globally enables NOFORK/NOEXEC tricks for such programs as xargs
+  and find:
+  BB_EXECVP(cmd, argv) will try to exec /proc/self/exe
+  if command's name matches some applet name;
+  spawn_and_wait(argv) will do NOFORK/NOEXEC tricks
+
+//TODO: the above two things probably should have separate options?
+
+FEATURE_SH_STANDALONE
+  shells will try to exec /proc/self/exe if command's name matches
+  some applet name; shells will do NOEXEC trick on NOEXEC applets
+
+//TODO: split (same as for PREFER_APPLETS)
+
+FEATURE_SH_NOFORK
+  shells will do NOFORK trick on NOFORK applets
+
+NB: shell builtins use these tricks regardless of FEATURE_SH_STANDALONE,
+FEATURE_PREFER_APPLETS or FEATURE_SH_NOFORK. In effect, builtins
+are "always NOFORK".
+
+
         NOEXEC
 
 NOEXEC applet should work correctly if another applet forks and then
@@ -52,6 +72,9 @@ xargs, find, shells do it (grep for "spawn_and_wait" and
 This poses much more serious limitations on what applet can do:
 
 * all NOEXEC limitations apply.
+* do not run for a long time or wait for user input:
+  hush shell only handles signals (like ^C) after you return
+  from APPLET_main().
 * do not ever exit() or exec().
   - xfuncs are okay. They are using special trick to return
     to the caller applet instead of dying when they detect "x" condition.
@@ -61,15 +84,27 @@ This poses much more serious limitations on what applet can do:
 * do not use shared global data, or save/restore shared global data
   (e.g. bb_common_bufsiz1) prior to returning.
   - getopt32() is ok to use. You do not need to save/restore option_mask32,
-    it is already done by core code.
+    xfunc_error_retval, and logmode - it is already done by core code.
 * if you allocate memory, you can use xmalloc() only on the very first
   allocation. All other allocations should use malloc[_or_warn]().
   After first allocation, you cannot use any xfuncs.
   Otherwise, failing xfunc will return to caller applet
   without freeing malloced data!
-* All allocated data, opened files, signal handlers, termios settings,
-  O_NONBLOCK flags etc should be freed/closed/restored prior to return.
-* ...
+* the same applies to other resources, such as open fds: no xfuncs after
+  acquiring them!
+* All allocated data, opened files, signal handlers, termios settings
+  etc should be freed/closed/restored prior to return.
+
+Currently, ash shell signal handling is implemented in a way that signals
+have non-SA_RESTARTed handlers. This means that system calls can
+return EINTR. An example of such problem is "yes" applet:
+it is implemented so that it has a writing loop, this loop is exited on
+any write error, and in the case of user pressing ^C the error was EINTR.
+The problem is, the error causes stdout FILE* object to get into error
+state, needing clearerr() - or else subsequent shell output will also
+not work. ("yes" has been downgraded to NOEXEC, since hush signal handling
+does not have this problem - which makes "yes" to not exit on ^C (bug).
+But stray EINTRs can be seen in any NOFORK under ash, until ash is fixed).
 
 NOFORK applets give the most of speed advantage, but are trickiest
 to implement. In order to minimize amount of bugs and maintenance,
@@ -79,6 +114,8 @@ frequently executed from shell/find/xargs, particularly in shell
 script loops. Applets which mess with signal handlers, termios etc
 are probably not worth the effort.
 
+Applets which must be interruptible by ^C in shells can not be NOFORKs.
+
 Any NOFORK applet is also a NOEXEC applet.
 
 
@@ -91,11 +128,11 @@ API to call NOFORK applets is two functions:
 
 First one is directly used by shells if FEATURE_SH_NOFORK=y.
 Second one is used by many applets, but main users are xargs and find.
-It itself calls run_nofork_applet(), if argv[0] turned out to be a name
+It itself calls run_nofork_applet(), if argv[0] is a name
 of a NOFORK applet.
 
 run_nofork_applet() saves/inits/restores option parsing, xfunc_error_retval,
-applet_name. Thus, for example, caller does not need to worry about
+logmode, applet_name. Thus, for example, caller does not need to worry about
 option_mask32 getting trashed.
 
 
@@ -104,22 +141,3 @@ option_mask32 getting trashed.
 It's the same trusty spawn_and_wait(argv). If FEATURE_PREFER_APPLETS=y,
 it does NOEXEC trick. It resets xfunc_error_retval = 1 and
 logmode = LOGMODE_STDIO in the child.
-
-
-        Relevant CONFIG options
-
-FEATURE_PREFER_APPLETS
-  BB_EXECVP(cmd, argv) will try to exec /proc/self/exe
-  if command's name matches some applet name;
-  spawn_and_wait(argv) will do NOFORK/NOEXEC tricks
-
-//TODO: the above two things probably should have separate options?
-
-FEATURE_SH_STANDALONE
-  shells will try to exec /proc/self/exe if command's name matches
-  some applet name; shells will do NOEXEC trick on NOEXEC applets
-
-//TODO: split (same as for PREFER_APPLETS)
-
-FEATURE_SH_NOFORK
-  shells will do NOFORK trick on NOFORK applets
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c
index 72327d728..76a5253b6 100644
--- a/e2fsprogs/chattr.c
+++ b/e2fsprogs/chattr.c
@@ -15,14 +15,17 @@
 //config:       help
 //config:       chattr changes the file attributes on a second extended file system.
 
-//applet:IF_CHATTR(APPLET(chattr, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_CHATTR(APPLET_NOEXEC(chattr, chattr, BB_DIR_BIN, BB_SUID_DROP, chattr))
 
 //kbuild:lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o
 
 //usage:#define chattr_trivial_usage
-//usage:       "[-R] [-+=AacDdijsStTu] [-v VERSION] [FILE]..."
+//usage:       "[-R] [-v VERSION] [-+=AacDdijsStTu] FILE..."
 //usage:#define chattr_full_usage "\n\n"
 //usage:       "Change ext2 file attributes\n"
+//usage:     "\n        -R      Recurse"
+//usage:     "\n        -v VER  Set version/generation number"
+//-V, -f accepted but ignored
 //usage:     "\nModifiers:"
 //usage:     "\n        -,+,=   Remove/add/set attributes"
 //usage:     "\nAttributes:"
@@ -37,8 +40,6 @@
 //usage:     "\n        S       Write synchronously"
 //usage:     "\n        t       Disable tail-merging of partial blocks with other files"
 //usage:     "\n        u       Allow file to be undeleted"
-//usage:     "\n        -R      Recurse"
-//usage:     "\n        -v VER  Set version/generation number"
 
 #include "libbb.h"
 #include "e2fs_lib.h"
@@ -52,7 +53,7 @@ struct globals {
         unsigned long version;
         unsigned long af;
         unsigned long rf;
-        smallint flags;
+        int flags;
         smallint recursive;
 };
 
@@ -64,10 +65,11 @@ static unsigned long get_flag(char c)
         bb_show_usage();
 }
 
-static int decode_arg(const char *arg, struct globals *gp)
+static char** decode_arg(char **argv, struct globals *gp)
 {
         unsigned long *fl;
-        char opt = *arg++;
+        const char *arg = *argv;
+        char opt = *arg;
 
         fl = &gp->af;
         if (opt == '-') {
@@ -75,15 +77,43 @@ static int decode_arg(const char *arg, struct globals *gp)
                 fl = &gp->rf;
         } else if (opt == '+') {
                 gp->flags |= OPT_ADD;
-        } else if (opt == '=') {
+        } else { /* if (opt == '=') */
                 gp->flags |= OPT_SET;
-        } else
-                return 0;
+        }
 
-        while (*arg)
-                *fl |= get_flag(*arg++);
+        while (*++arg) {
+                if (opt == '-') {
+//e2fsprogs-1.43.1 accepts:
+// "-RRR", "-RRRv VER" and even "-ARRRva VER" and "-vvv V1 V2 V3"
+// but not "-vVER".
+// IOW: options are parsed as part of "remove attrs" strings,
+// if "v" is seen, next argv[] is VER, even if more opts/attrs follow in this argv[]!
+                        if (*arg == 'R') {
+                                gp->recursive = 1;
+                                continue;
+                        }
+                        if (*arg == 'V') {
+                                /*"verbose and print program version" (nop for now) */;
+                                continue;
+                        }
+                        if (*arg == 'f') {
+                                /*"suppress most error messages" (nop) */;
+                                continue;
+                        }
+                        if (*arg == 'v') {
+                                if (!*++argv)
+                                        bb_show_usage();
+                                gp->version = xatoul(*argv);
+                                gp->flags |= OPT_SET_VER;
+                                continue;
+                        }
+//TODO: "-p PROJECT_NUM" ?
+                        /* not a known option, try as an attribute */
+                }
+                *fl |= get_flag(*arg);
+        }
 
-        return 1;
+        return argv;
 }
 
 static void change_attributes(const char *name, struct globals *gp);
@@ -133,7 +163,7 @@ static void change_attributes(const char *name, struct globals *gp)
                         fsflags &= ~gp->rf;
                 /*if (gp->flags & OPT_ADD) - not needed, af is zero otherwise */
                         fsflags |= gp->af;
-                /* What is this? And why it's not done for SET case? */
+// What is this? And why it's not done for SET case?
                 if (!S_ISDIR(st.st_mode))
                         fsflags &= ~EXT2_DIRSYNC_FL;
         }
@@ -149,36 +179,22 @@ int chattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int chattr_main(int argc UNUSED_PARAM, char **argv)
 {
         struct globals g;
-        char *arg;
 
         memset(&g, 0, sizeof(g));
 
         /* parse the args */
-        while ((arg = *++argv)) {
-                /* take care of -R and -v <version> */
-                if (arg[0] == '-'
-                 && (arg[1] == 'R' || arg[1] == 'v')
-                 && !arg[2]
-                ) {
-                        if (arg[1] == 'R') {
-                                g.recursive = 1;
-                                continue;
-                        }
-                        /* arg[1] == 'v' */
-                        if (!*++argv)
-                                bb_show_usage();
-                        g.version = xatoul(*argv);
-                        g.flags |= OPT_SET_VER;
-                        continue;
-                }
-
-                if (!decode_arg(arg, &g))
+        for (;;) {
+                char *arg = *++argv;
+                if (!arg)
+                        bb_show_usage();
+                if (arg[0] != '-' && arg[0] != '+' && arg[0] != '=')
                         break;
+
+                argv = decode_arg(argv, &g);
         }
+        /* note: on loop exit, remaining argv[] is never empty */
 
         /* run sanity checks on all the arguments given us */
-        if (!*argv)
-                bb_show_usage();
         if ((g.flags & OPT_SET) && (g.flags & (OPT_ADD|OPT_REM)))
                 bb_error_msg_and_die("= is incompatible with - and +");
         if (g.rf & g.af)
diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h
index f2ae56f43..ae28c353b 100644
--- a/e2fsprogs/e2fs_lib.h
+++ b/e2fsprogs/e2fs_lib.h
@@ -26,7 +26,7 @@ int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_f
 #define fgetflags(name, flags) fgetsetflags(name, flags, 0)
 #define fsetflags(name, flags) fgetsetflags(name, NULL, flags)
 
-/* Must be 1 for compatibility with `int long_format'. */
+/* Must be 1 for compatibility with 'int long_format'. */
 #define PFOPT_LONG  1
 /* Print file attributes on an ext2 file system */
 void print_e2flags(FILE *f, unsigned long flags, unsigned options);
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index 756d26832..56c1187c1 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -16,7 +16,8 @@
 //config:       help
 //config:       lsattr lists the file attributes on a second extended file system.
 
-//applet:IF_LSATTR(APPLET(lsattr, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_LSATTR(APPLET_NOEXEC(lsattr, lsattr, BB_DIR_BIN, BB_SUID_DROP, lsattr))
+/* ls is NOEXEC, so we should be too! ;) */
 
 //kbuild:lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o
 
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 95411db5f..a1caf011c 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -13,7 +13,7 @@
 //config:       tune2fs allows the system administrator to adjust various tunable
 //config:       filesystem parameters on Linux ext2/ext3 filesystems.
 
-//applet:IF_TUNE2FS(APPLET(tune2fs, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_TUNE2FS(APPLET_NOEXEC(tune2fs, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, tune2fs))
 
 //TODO alias to "tune2fs -L LABEL": //applet:IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, e2label))
 
@@ -71,8 +71,7 @@ int tune2fs_main(int argc UNUSED_PARAM, char **argv)
         struct ext2_super_block *sb;
         int fd;
 
-        opt_complementary = "=1";
-        opts = getopt32(argv, "L:c:i:C:", &label, &str_c, &str_i, &str_C);
+        opts = getopt32(argv, "^" "L:c:i:C:" "\0" "=1", &label, &str_c, &str_i, &str_C);
         if (!opts)
                 bb_show_usage();
         argv += optind; // argv[0] -- device
diff --git a/editors/awk.c b/editors/awk.c
index 56688d72c..2fc7d6102 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -70,7 +70,11 @@
 #endif
 
 
-#define OPTSTR_AWK \
+/* "+": stop on first non-option:
+ * $ awk 'BEGIN { for(i=1; i<ARGC; ++i) { print i ": " ARGV[i] }}' -argz
+ * 1: -argz
+ */
+#define OPTSTR_AWK "+" \
         "F:v:*f:*" \
         IF_FEATURE_AWK_GNU_EXTENSIONS("e:*") \
         "W:"
@@ -230,7 +234,7 @@ typedef struct tsplitter_s {
  */
 #define TC_LENGTH       (1 << 20)
 #define TC_GETLINE      (1 << 21)
-#define TC_FUNCDECL     (1 << 22)               /* `function' `func' */
+#define TC_FUNCDECL     (1 << 22)               /* 'function' 'func' */
 #define TC_BEGIN        (1 << 23)
 #define TC_END          (1 << 24)
 #define TC_EOF          (1 << 25)
diff --git a/editors/cmp.c b/editors/cmp.c
index f53d9603c..ec86c0ce2 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -36,7 +36,7 @@ static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"u, line %u
 // This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%"OFF_FMT"u %o %o\n"
 static const char fmt_l_opt[] ALIGN1 = "%.0s%.0s%"OFF_FMT"u %3o %3o\n";
 
-static const char opt_chars[] ALIGN1 = "sl";
+#define OPT_STR "sl"
 #define CMP_OPT_s (1<<0)
 #define CMP_OPT_l (1<<1)
 
@@ -52,11 +52,13 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         int retval = 0;
 
-        opt_complementary = "-1"
+        opt = getopt32(argv, "^"
+                        OPT_STR
+                        "\0" "-1"
                         IF_DESKTOP(":?4")
                         IF_NOT_DESKTOP(":?2")
-                        ":l--s:s--l";
-        opt = getopt32(argv, opt_chars);
+                        ":l--s:s--l"
+        );
         argv += optind;
 
         filename1 = *argv;
diff --git a/editors/diff.c b/editors/diff.c
index 62f558944..1ff399ffb 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -988,6 +988,11 @@ static const char diff_longopts[] ALIGN1 =
         "starting-file\0"            Required_argument "S"
         "minimal\0"                  No_argument       "d"
         ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,diff_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -1000,11 +1005,8 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         /* exactly 2 params; collect multiple -L <label>; -U N */
-        opt_complementary = "=2";
-#if ENABLE_FEATURE_DIFF_LONG_OPTIONS
-        applet_long_options = diff_longopts;
-#endif
-        getopt32(argv, "abdiL:*NqrsS:tTU:+wupBE",
+        GETOPT32(argv, "^" "abdiL:*NqrsS:tTU:+wupBE" "\0" "=2"
+                        LONGOPTS,
                         &L_arg, &s_start, &opt_U_context);
         argv += optind;
         while (L_arg)
diff --git a/editors/ed.c b/editors/ed.c
index 7f21ded92..05797692c 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -360,7 +360,7 @@ static void addLines(int num)
                  * 0  on ctrl-C,
                  * >0 length of input string, including terminating '\n'
                  */
-                len = read_line_input(NULL, "", buf, sizeof(buf), /*timeout*/ -1);
+                len = read_line_input(NULL, "", buf, sizeof(buf));
                 if (len <= 0) {
                         /* Previously, ctrl-C was exiting to shell.
                          * Now we exit to ed prompt. Is in important? */
@@ -789,7 +789,7 @@ static void doCommands(void)
                  * 0  on ctrl-C,
                  * >0 length of input string, including terminating '\n'
                  */
-                len = read_line_input(NULL, ": ", buf, sizeof(buf), /*timeout*/ -1);
+                len = read_line_input(NULL, ": ", buf, sizeof(buf));
                 if (len <= 0)
                         return;
                 while (len && isspace(buf[--len]))
@@ -892,7 +892,7 @@ static void doCommands(void)
                         }
                         if (!dirty)
                                 return;
-                        len = read_line_input(NULL, "Really quit? ", buf, 16, /*timeout*/ -1);
+                        len = read_line_input(NULL, "Really quit? ", buf, 16);
                         /* read error/EOF - no way to continue */
                         if (len < 0)
                                 return;
diff --git a/editors/patch_bbox.c b/editors/patch_bbox.c
index aae7b7987..8e09ef488 100644
--- a/editors/patch_bbox.c
+++ b/editors/patch_bbox.c
@@ -111,10 +111,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         "no-backup-if-mismatch\0" No_argument       "\xff" /*ignored*/
 # endif
                         ;
-                applet_long_options = patch_longopts;
 #endif
                 /* -f,-E,-g are ignored */
-                opt = getopt32(argv, "p:i:RN""fEg:", &p, &i, NULL);
+                opt = getopt32long(argv, "p:i:RN""fEg:", patch_longopts, &p, &i, NULL);
                 if (opt & OPT_R)
                         plus = '-';
                 patch_level = xatoi(p); /* can be negative! */
diff --git a/editors/sed.c b/editors/sed.c
index e10078b7c..d6e25aedc 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -68,8 +68,8 @@
 //applet:IF_SED(APPLET(sed, BB_DIR_BIN, BB_SUID_DROP))
 
 //usage:#define sed_trivial_usage
-//usage:       "[-inrE] [-f FILE]... [-e CMD]... [FILE]...\n"
-//usage:       "or: sed [-inrE] CMD [FILE]..."
+//usage:       "[-i[SFX]] [-nrE] [-f FILE]... [-e CMD]... [FILE]...\n"
+//usage:       "or: sed [-i[SFX]] [-nrE] CMD [FILE]..."
 //usage:#define sed_full_usage "\n\n"
 //usage:       "        -e CMD  Add CMD to sed commands to be executed"
 //usage:     "\n        -f FILE Add FILE contents to sed commands to be executed"
@@ -1512,21 +1512,21 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
         /* do normal option parsing */
         opt_e = opt_f = NULL;
         opt_i = NULL;
-        opt_complementary = "nn"; /* count -n */
-
-        IF_LONG_OPTS(applet_long_options = sed_longopts);
-
         /* -i must be first, to match OPT_in_place definition */
         /* -E is a synonym of -r:
          * GNU sed 4.2.1 mentions it in neither --help
          * nor manpage, but does recognize it.
          */
-        opt = getopt32(argv, "i::rEne:*f:*", &opt_i, &opt_e, &opt_f,
-                            &G.be_quiet); /* counter for -n */
+        opt = getopt32long(argv, "^"
+                        "i::rEne:*f:*"
+                        "\0" "nn"/*count -n*/,
+                        sed_longopts,
+                        &opt_i, &opt_e, &opt_f,
+                        &G.be_quiet); /* counter for -n */
         //argc -= optind;
         argv += optind;
         if (opt & OPT_in_place) { // -i
-                atexit(cleanup_outname);
+                die_func = cleanup_outname;
         }
         if (opt & (2|4))
                 G.regex_type |= REG_EXTENDED; // -r or -E
diff --git a/findutils/find.c b/findutils/find.c
index 69baf065d..5857a3f44 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -15,7 +15,7 @@
  * # find file.txt -exec 'echo {}' '{}  {}' ';'
  * find: echo file.txt: No such file or directory
  * # find file.txt -exec 'echo' '{}  {}' '; '
- * find: missing argument to `-exec'
+ * find: missing argument to '-exec'
  * # find file.txt -exec 'echo {}' '{}  {}' ';' junk
  * find: paths must precede expression
  * # find file.txt -exec 'echo {}' '{}  {}' ';' junk ';'
diff --git a/findutils/grep.c b/findutils/grep.c
index 568ab12c2..7c5f73d2f 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -107,6 +107,7 @@
 //usage:#define fgrep_trivial_usage NOUSAGE_STR
 //usage:#define fgrep_full_usage ""
 
+/* -e,-f are lists; -m,-A,-B,-C have numeric param */
 #define OPTSTR_GREP \
         "lnqvscFiHhe:*f:*Lorm:+wx" \
         IF_FEATURE_GREP_CONTEXT("A:+B:+C:+") \
@@ -686,11 +687,9 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 
         /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
-        /* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
-         * -m,-A,-B,-C have numeric param */
-        opt_complementary = "H-h:C-AB";
+        /* -H unsets -h; -C unsets -A,-B */
         opts = getopt32(argv,
-                OPTSTR_GREP,
+                "^" OPTSTR_GREP "\0" "H-h:C-AB",
                 &pattern_head, &fopt, &max_matches,
                 &lines_after, &lines_before, &Copt);
 
@@ -716,9 +715,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
         }
 #else
         /* with auto sanity checks */
-        /* -H unsets -h; -c,-q or -l unset -n; -e,-f are lists; -m N */
-        opt_complementary = "H-h:c-n:q-n:l-n:";
-        getopt32(argv, OPTSTR_GREP,
+        getopt32(argv, "^" OPTSTR_GREP "\0" "H-h:c-n:q-n:l-n:", // why trailing ":"?
                 &pattern_head, &fopt, &max_matches);
 #endif
         invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
diff --git a/findutils/xargs.c b/findutils/xargs.c
index e5384d14c..97afef039 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -508,13 +508,8 @@ int xargs_main(int argc, char **argv)
 
         INIT_G();
 
-#if ENABLE_DESKTOP && ENABLE_LONG_OPTS
-        /* For example, Fedora's build system uses --no-run-if-empty */
-        applet_long_options =
-                "no-run-if-empty\0" No_argument "r"
-                ;
-#endif
-        opt = getopt32(argv, OPTION_STR,
+        opt = getopt32long(argv, OPTION_STR,
+                "no-run-if-empty\0" No_argument "r",
                 &max_args, &max_chars, &G.eof_str, &G.eof_str
                 IF_FEATURE_XARGS_SUPPORT_REPL_STR(, &G.repl_str, &G.repl_str)
         );
diff --git a/include/bb_archive.h b/include/bb_archive.h
index c118fa7ec..acb3c3cbd 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -74,9 +74,6 @@ typedef struct archive_handle_t {
         /* Currently processed file's header */
         file_header_t *file_header;
 
-        /* List of symlink placeholders */
-        llist_t *symlink_placeholders;
-
         /* Process the header component, e.g. tar -t */
         void FAST_FUNC (*action_header)(const file_header_t *);
 
@@ -210,6 +207,7 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC;
 void seek_by_read(int fd, off_t amount) FAST_FUNC;
 
 const char *strip_unsafe_prefix(const char *str) FAST_FUNC;
+int unsafe_symlink_target(const char *target) FAST_FUNC;
 
 void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC;
 const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC;
diff --git a/include/libbb.h b/include/libbb.h
index 61ceb6085..6073cbf4a 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -365,7 +365,7 @@ unsigned long long monotonic_ms(void) FAST_FUNC;
 unsigned monotonic_sec(void) FAST_FUNC;
 
 extern void chomp(char *s) FAST_FUNC;
-extern void trim(char *s) FAST_FUNC;
+extern char *trim(char *s) FAST_FUNC;
 extern char *skip_whitespace(const char *) FAST_FUNC;
 extern char *skip_non_whitespace(const char *) FAST_FUNC;
 extern char *skip_dev_pfx(const char *tty_name) FAST_FUNC;
@@ -886,7 +886,7 @@ unsigned bb_clk_tck(void) FAST_FUNC;
 
 #if SEAMLESS_COMPRESSION
 /* Autodetects gzip/bzip2 formats. fd may be in the middle of the file! */
-extern int setup_unzip_on_fd(int fd, int fail_if_not_compressed) FAST_FUNC;
+int setup_unzip_on_fd(int fd, int fail_if_not_compressed) FAST_FUNC;
 /* Autodetects .gz etc */
 extern int open_zipped(const char *fname, int fail_if_not_compressed) FAST_FUNC;
 extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC;
@@ -895,6 +895,8 @@ extern void *xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p)
 # define open_zipped(fname, fail_if_not_compressed)  open((fname), O_RDONLY);
 # define xmalloc_open_zipped_read_close(fname, maxsz_p) xmalloc_open_read_close((fname), (maxsz_p))
 #endif
+/* lzma has no signature, need a little helper. NB: exist only for ENABLE_FEATURE_SEAMLESS_LZMA=y */
+void setup_lzma_on_fd(int fd) FAST_FUNC;
 
 extern ssize_t safe_write(int fd, const void *buf, size_t count) FAST_FUNC;
 // NB: will return short write on error, not -1,
@@ -1138,9 +1140,15 @@ int wait_for_exitstatus(pid_t pid) FAST_FUNC;
 int spawn_and_wait(char **argv) FAST_FUNC;
 /* Does NOT check that applet is NOFORK, just blindly runs it */
 int run_nofork_applet(int applet_no, char **argv) FAST_FUNC;
+void run_noexec_applet_and_exit(int a, const char *name, char **argv) NORETURN FAST_FUNC;
 #ifndef BUILD_INDIVIDUAL
-extern int find_applet_by_name(const char *name) FAST_FUNC;
-extern void run_applet_no_and_exit(int a, const char *name, char **argv) NORETURN FAST_FUNC;
+int find_applet_by_name(const char *name) FAST_FUNC;
+void run_applet_no_and_exit(int a, const char *name, char **argv) NORETURN FAST_FUNC;
+#endif
+#if defined(__linux__)
+void set_task_comm(const char *comm) FAST_FUNC;
+#else
+# define set_task_comm(name) ((void)0)
 #endif
 #if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_NOFORK
 extern int long_running_applet(int applet_no) FAST_FUNC;
@@ -1198,21 +1206,26 @@ enum {
 #endif
 void bb_daemonize_or_rexec(int flags, char **argv) FAST_FUNC;
 void bb_sanitize_stdio(void) FAST_FUNC;
+#define bb_daemon_helper(arg) bb_daemonize_or_rexec((arg) | DAEMON_ONLY_SANITIZE, NULL)
 /* Clear dangerous stuff, set PATH. Return 1 if was run by different user. */
 int sanitize_env_if_suid(void) FAST_FUNC;
 
 
+/* For top, ps. Some argv[i] are replaced by malloced "-opt" strings */
+void make_all_argv_opts(char **argv) FAST_FUNC;
 char* single_argv(char **argv) FAST_FUNC;
-extern const char *const bb_argv_dash[]; /* "-", NULL */
-extern const char *opt_complementary;
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
-#define No_argument "\0"
-#define Required_argument "\001"
-#define Optional_argument "\002"
-extern const char *applet_long_options;
-#endif
+extern const char *const bb_argv_dash[]; /* { "-", NULL } */
 extern uint32_t option_mask32;
-extern uint32_t getopt32(char **argv, const char *applet_opts, ...) FAST_FUNC;
+uint32_t getopt32(char **argv, const char *applet_opts, ...) FAST_FUNC;
+# define No_argument "\0"
+# define Required_argument "\001"
+# define Optional_argument "\002"
+#if ENABLE_LONG_OPTS
+uint32_t getopt32long(char **argv, const char *optstring, const char *longopts, ...) FAST_FUNC;
+#else
+#define getopt32long(argv,optstring,longopts,...) \
+        getopt32(argv,optstring,##__VA_ARGS__)
+#endif
 /* BSD-derived getopt() functions require that optind be set to 1 in
  * order to reset getopt() state.  This used to be generally accepted
  * way of resetting getopt().  However, glibc's getopt()
@@ -1429,6 +1442,11 @@ enum {
         // keep a copy of current line
         PARSE_KEEP_COPY = 0x00200000 * ENABLE_FEATURE_CROND_D,
         PARSE_EOL_COMMENTS = 0x00400000, // comments are recognized even if they aren't the first char
+        PARSE_ALT_COMMENTS = 0x00800000, // delim[0] and delim[1] are two different allowed comment chars
+        // (so far, delim[0] will only work as comment char for full-line comment)
+        // (IOW: it works as if PARSE_EOL_COMMENTS is not set. sysctl applet is okay with this)
+        PARSE_WS_COMMENTS  = 0x01000000, // comments are recognized even if there is whitespace before
+        // ("line start><space><tab><space>#comment" is also comment, not only "line start>#comment")
         // NORMAL is:
         // * remove leading and trailing delimiters and collapse
         //   multiple delimiters into one
@@ -1484,6 +1502,21 @@ extern void run_shell(const char *shell, int loginshell, const char **args) NORE
  */
 const char *get_shell_name(void) FAST_FUNC;
 
+unsigned cap_name_to_number(const char *cap) FAST_FUNC;
+void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC;
+void drop_capability(int cap_ordinal) FAST_FUNC;
+/* Structures inside "struct caps" are Linux-specific and libcap-specific: */
+#define DEFINE_STRUCT_CAPS \
+struct caps { \
+        struct __user_cap_header_struct header; \
+        unsigned u32s; \
+        struct __user_cap_data_struct data[2]; \
+}
+void getcaps(void *caps) FAST_FUNC;
+
+unsigned cap_name_to_number(const char *name) FAST_FUNC;
+void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC;
+
 #if ENABLE_SELINUX
 extern void renew_current_security_context(void) FAST_FUNC;
 extern void set_current_security_context(security_context_t sid) FAST_FUNC;
@@ -1668,9 +1701,9 @@ enum {
  * buffer[0] is used as a counter of buffered chars and must be 0
  * on first call.
  * timeout:
- * -2: do not poll for input;
- * -1: poll(-1) (i.e. block);
- * >=0: poll for TIMEOUT milliseconds, return -1/EAGAIN on timeout
+ * -2: do not poll(-1) for input - read() it, return on EAGAIN at once
+ * -1: poll(-1) (i.e. block even on NONBLOCKed fd)
+ * >=0: poll() for TIMEOUT milliseconds, return -1/EAGAIN on timeout
  */
 int64_t read_key(int fd, char *buffer, int timeout) FAST_FUNC;
 void read_key_ungets(char *buffer, const char *str, unsigned len) FAST_FUNC;
@@ -1686,6 +1719,7 @@ unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC;
 # endif
 typedef struct line_input_t {
         int flags;
+        int timeout;
         const char *path_lookup;
 # if MAX_HISTORY
         int cnt_history;
@@ -1721,7 +1755,7 @@ line_input_t *new_line_input_t(int flags) FAST_FUNC;
  * 0  on ctrl-C (the line entered is still returned in 'command'),
  * >0 length of input string, including terminating '\n'
  */
-int read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout) FAST_FUNC;
+int read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize) FAST_FUNC;
 void show_history(const line_input_t *st) FAST_FUNC;
 # if ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
 void save_history(line_input_t *st);
@@ -1729,7 +1763,7 @@ void save_history(line_input_t *st);
 #else
 #define MAX_HISTORY 0
 int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
-#define read_line_input(state, prompt, command, maxsize, timeout) \
+#define read_line_input(state, prompt, command, maxsize) \
         read_line_input(prompt, command, maxsize)
 #endif
 
diff --git a/include/platform.h b/include/platform.h
index 749169b0c..cc22f4fc9 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -277,6 +277,11 @@ typedef uint64_t bb__aliased_uint64_t FIX_ALIASING;
 #define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
 #define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
 
+/* unxz needs an aligned fixed-endian accessor.
+ * (however, the compiler does not realize it's aligned, the cast is still necessary)
+ */
+#define get_le32(u32p) ({ uint32_t v = *(bb__aliased_uint32_t*)(u32p); SWAP_LE32(v); })
+
 
 /* ---- Size-saving "small" ints (arch-dependent) ----------- */
 
diff --git a/klibc-utils/Config.src b/klibc-utils/Config.src
new file mode 100644
index 000000000..fe7cb1315
--- /dev/null
+++ b/klibc-utils/Config.src
@@ -0,0 +1,10 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "klibc-utils"
+
+INSERT
+
+endmenu
diff --git a/klibc-utils/Kbuild.src b/klibc-utils/Kbuild.src
new file mode 100644
index 000000000..6b4fb7470
--- /dev/null
+++ b/klibc-utils/Kbuild.src
@@ -0,0 +1,9 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
+#
+# Licensed under GPLv2, see file LICENSE in this source tree.
+
+lib-y:=
+
+INSERT
diff --git a/klibc-utils/minips.c b/klibc-utils/minips.c
new file mode 100644
index 000000000..6003bf57b
--- /dev/null
+++ b/klibc-utils/minips.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config MINIPS
+//config:       bool "minips (11 kb)"
+//config:       default n  # for god's sake, just use "ps" name in your scripts
+//config:       help
+//config:       Alias to "ps".
+
+/* applet and kbuild hooks are in ps.c */
diff --git a/klibc-utils/nuke.c b/klibc-utils/nuke.c
new file mode 100644
index 000000000..a5d2f8d70
--- /dev/null
+++ b/klibc-utils/nuke.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config NUKE
+//config:       bool "nuke"
+//config:       default y
+//config:       help
+//config:       Alias to "rm -rf".
+
+//applet:IF_NUKE(APPLET_NOEXEC(nuke, nuke, BB_DIR_BIN, BB_SUID_DROP, nuke))
+
+//kbuild:lib-$(CONFIG_NUKE) += nuke.o
+
+//usage:#define nuke_trivial_usage
+//usage:       "DIR..."
+//usage:#define nuke_full_usage "\n\n"
+//usage:       "Remove DIRs"
+
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
+int nuke_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nuke_main(int argc UNUSED_PARAM, char **argv)
+{
+// klibc-utils do not check opts, will try to delete "-dir" args
+        //opt = getopt32(argv, "");
+        //argv += optind;
+
+        while (*++argv) {
+#if 0
+// klibc-utils do not check this, will happily operate on ".."
+                const char *base = bb_get_last_path_component_strip(*argv);
+                if (DOT_OR_DOTDOT(base)) {
+                        bb_error_msg("can't remove '.' or '..'");
+                        continue;
+                }
+#endif
+                remove_file(*argv, FILEUTILS_FORCE | FILEUTILS_RECUR);
+        }
+
+// klibc-utils do not indicate errors
+        return EXIT_SUCCESS;
+}
diff --git a/klibc-utils/resume.c b/klibc-utils/resume.c
new file mode 100644
index 000000000..de142f350
--- /dev/null
+++ b/klibc-utils/resume.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config RESUME
+//config:       bool "resume"
+//config:       default y
+//config:       help
+//config:       Resume from saved "suspend-to-disk" image
+
+//applet:IF_RESUME(APPLET_NOEXEC(resume, resume, BB_DIR_BIN, BB_SUID_DROP, resume))
+
+//kbuild:lib-$(CONFIG_RESUME) += resume.o
+
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
+/* name_to_dev_t() in klibc-utils supports extended device name formats,
+ * apart from the usual case where /dev/NAME already exists.
+ *
+ * - device number in hexadecimal represents itself (in dev_t layout).
+ * - device number in major:minor decimal represents itself.
+ * - if block device (or partition) with this name is found in sysfs.
+ * - if /dev/ prefix is not given, it is assumed.
+ *
+ * klibc-utils also recognizes these, but they don't work
+ * for "resume" tool purposes (thus we don't support them (yet?)):
+ * - /dev/nfs
+ * - /dev/ram (alias to /dev/ram0)
+ * - /dev/mtd
+ */
+static dev_t name_to_dev_t(const char *devname)
+{
+        char devfile[sizeof(int)*3 * 2 + 4];
+        char *sysname;
+        unsigned major_num, minor_num;
+        struct stat st;
+        int r;
+
+        if (strncmp(devname, "/dev/", 5) != 0) {
+                char *cptr;
+
+                cptr = strchr(devname, ':');
+                if (cptr) {
+                        /* Colon-separated decimal device number? */
+                        *cptr = '\0';
+                        major_num = bb_strtou(devname, NULL, 10);
+                        if (!errno)
+                                minor_num = bb_strtou(cptr + 1, NULL, 10);
+                        *cptr = ':';
+                        if (!errno)
+                                return makedev(major_num, minor_num);
+                } else {
+                        /* Hexadecimal device number? */
+                        dev_t res = (dev_t) bb_strtoul(devname, NULL, 16);
+                        if (!errno)
+                                return res;
+                }
+
+                devname = xasprintf("/dev/%s", devname);
+        }
+        /* Now devname is always "/dev/FOO" */
+
+        if (stat(devname, &st) == 0 && S_ISBLK(st.st_mode))
+                return st.st_rdev;
+
+        /* Full blockdevs as well as partitions may be visible
+         * in /sys/class/block/ even if /dev is not populated.
+         */
+        sysname = xasprintf("/sys/class/block/%s/dev", devname + 5);
+        r = open_read_close(sysname, devfile, sizeof(devfile) - 1);
+        //free(sysname);
+        if (r > 0) {
+                devfile[r] = '\0';
+                if (sscanf(devfile, "%u:%u", &major_num, &minor_num) == 2) {
+                        return makedev(major_num, minor_num);
+                }
+        }
+
+        return (dev_t) 0;
+}
+
+//usage:#define resume_trivial_usage
+//usage:       "BLOCKDEV [OFFSET]"
+//usage:#define resume_full_usage "\n"
+//usage:   "\n""Restore system state from 'suspend-to-disk' data in BLOCKDEV"
+
+int resume_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int resume_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned long long ofs;
+        dev_t resume_device;
+        char *s;
+        int fd;
+
+        argv++;
+        if (!argv[0])
+                bb_show_usage();
+
+        resume_device = name_to_dev_t(argv[0]);
+        if (major(resume_device) == 0) {
+                bb_error_msg_and_die("invalid resume device: %s", argv[0]);
+        }
+        ofs = (argv[1] ? xstrtoull(argv[1], 0) : 0);
+
+        fd = xopen("/sys/power/resume", O_WRONLY);
+        s = xasprintf("%u:%u:%llu", major(resume_device), minor(resume_device), ofs);
+
+        xwrite_str(fd, s);
+        /* if write() returns, resume did not succeed */
+
+        return EXIT_FAILURE; /* klibc-utils exits -1 aka 255 */
+}
diff --git a/klibc-utils/run-init.c b/klibc-utils/run-init.c
new file mode 100644
index 000000000..a70d1bfbf
--- /dev/null
+++ b/klibc-utils/run-init.c
@@ -0,0 +1,27 @@
+/*
+ * run-init implementation for busybox
+ *
+ * Copyright (c) 2017 Denys Vlasenko <vda.linux@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config RUN_INIT
+//config:       bool "run-init"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       help
+//config:       The run-init utility is used from initramfs to select a new
+//config:       root device. Under initramfs, you have to use this instead of
+//config:       pivot_root.
+//config:
+//config:       Booting with initramfs extracts a gzipped cpio archive into rootfs
+//config:       (which is a variant of ramfs/tmpfs). Because rootfs can't be moved
+//config:       or unmounted, pivot_root will not work from initramfs. Instead,
+//config:       run-init deletes everything out of rootfs (including itself),
+//config:       does a mount --move that overmounts rootfs with the new root, and
+//config:       then execs the specified init program.
+//config:
+//config:       util-linux has a similar tool, switch-root.
+//config:       run-init differs by also having a "-d CAPS_TO_DROP" option.
+
+/* applet and kbuild hooks are in switch_root.c */
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 401475f18..6330b6f8b 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -34,14 +34,6 @@
 # include <malloc.h> /* for mallopt */
 #endif
 
-#include <sys/prctl.h>
-#ifndef PR_SET_NAME
-#define PR_SET_NAME 15
-#endif
-#ifndef PR_GET_NAME
-#define PR_GET_NAME 16
-#endif
-
 /* Declare <applet>_main() */
 #define PROTOTYPES
 #include "applets.h"
@@ -985,8 +977,6 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
 {
         int argc = string_array_len(argv);
 
-        /* Reinit some shared global data */
-        xfunc_error_retval = EXIT_FAILURE;
         /*
          * We do not use argv[0]: do not want to repeat massaging of
          * "-/sbin/halt" -> "halt", for example.
@@ -1163,15 +1153,14 @@ int main(int argc UNUSED_PARAM, char **argv)
         }
         applet_name = bb_basename(applet_name);
 
-# if defined(__linux__)
         /* If we are a result of execv("/proc/self/exe"), fix ugly comm of "exe" */
         if (ENABLE_FEATURE_SH_STANDALONE
          || ENABLE_FEATURE_PREFER_APPLETS
          || !BB_MMU
         ) {
-                prctl(PR_SET_NAME, (long)applet_name, 0, 0, 0);
+                if (NUM_APPLETS > 1)
+                        set_task_comm(applet_name);
         }
-# endif
 
         parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
         run_applet_and_exit(applet_name, argv);
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 4829b723a..dca0a150b 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -31,9 +31,9 @@ struct group* FAST_FUNC xgetgrnam(const char *name)
         return gr;
 }
 
-
 struct passwd* FAST_FUNC xgetpwuid(uid_t uid)
 {
+        /* Note: used in nofork applets (whoami), be careful not to leak anything */
         struct passwd *pw = getpwuid(uid);
         if (!pw)
                 bb_error_msg_and_die("unknown uid %u", (unsigned)uid);
@@ -50,6 +50,7 @@ struct group* FAST_FUNC xgetgrgid(gid_t gid)
 
 char* FAST_FUNC xuid2uname(uid_t uid)
 {
+        /* Note: used in nofork applets (whoami), be careful not to leak anything */
         struct passwd *pw = xgetpwuid(uid);
         return pw->pw_name;
 }
diff --git a/libbb/capability.c b/libbb/capability.c
new file mode 100644
index 000000000..f60062bfc
--- /dev/null
+++ b/libbb/capability.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2017 by  <assafgordon@gmail.com>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//kbuild:lib-$(CONFIG_PLATFORM_LINUX) += capability.o
+
+#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.
+#include "libbb.h"
+
+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",
+};
+
+unsigned FAST_FUNC cap_name_to_number(const char *cap)
+{
+        unsigned i, n;
+
+        if ((sscanf(cap, "cap_%u", &n)) == 1) {
+                i = n;
+                goto found;
+        }
+        for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
+                if (strcasecmp(capabilities[i], cap) != 0)
+                        goto found;
+        }
+        bb_error_msg_and_die("unknown capability '%s'", cap);
+
+ found:
+        if (!cap_valid(i))
+                bb_error_msg_and_die("unknown capability '%s'", cap);
+        return i;
+}
+
+void FAST_FUNC 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);
+}
+
+DEFINE_STRUCT_CAPS;
+
+void FAST_FUNC getcaps(void *arg)
+{
+        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;
+        struct caps *caps = arg;
+
+        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");
+        }
+
+        if (capget(&caps->header, caps->data) != 0)
+                bb_simple_perror_msg_and_die("capget");
+}
diff --git a/libbb/change_identity.c b/libbb/change_identity.c
index d48d86326..431f72c8c 100644
--- a/libbb/change_identity.c
+++ b/libbb/change_identity.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH 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 JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index cb6d12359..5372d8680 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -374,7 +374,10 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         int r = symlink(lpath, dest);
                         free(lpath);
                         if (r < 0) {
-                                bb_perror_msg("can't create symlink '%s'", dest);
+                                /* shared message */
+                                bb_perror_msg("can't create %slink '%s' to '%s'",
+                                        "sym", dest, lpath
+                                );
                                 return -1;
                         }
                         if (flags & FILEUTILS_PRESERVE_STATUS)
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index f4635a5bc..51928f68d 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH 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 JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/dump.c b/libbb/dump.c
index 211a1ed9e..e23b71294 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -828,7 +828,7 @@ void FAST_FUNC bb_dump_add(dumper_t* pub_dumper, const char *fmt)
  *    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/libbb/get_console.c b/libbb/get_console.c
index 9b6407bd0..96b339ca7 100644
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -64,7 +64,6 @@ int FAST_FUNC get_console_fd_or_die(void)
         }
 
         bb_error_msg_and_die("can't open console");
-        /*return fd; - total failure */
 }
 
 /* From <linux/vt.h> */
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 80f4cc060..f778c6e89 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -6,12 +6,13 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
 # include <getopt.h>
 #endif
 #include "libbb.h"
 
+//kbuild:lib-y += getopt32.o
+
 /*      Documentation
 
 uint32_t
@@ -95,20 +96,23 @@ getopt32(char **argv, const char *applet_opts, ...)
         env -i ls -d /
         Here we want env to process just the '-i', not the '-d'.
 
- "!"    Report bad option, missing required options,
+ "!"    Report bad options, missing required options,
         inconsistent options with all-ones return value (instead of abort).
 
-const char *applet_long_options
+ "^"    options string is "^optchars""\0""opt_complementary".
+
+uint32_t
+getopt32long(char **argv, const char *applet_opts, const char *logopts...)
 
-        This struct allows you to define long options:
+        This allows you to define long options:
 
         static const char applet_longopts[] ALIGN1 =
                 //"name\0"  has_arg     val
                 "verbose\0" No_argument "v"
                 ;
-        applet_long_options = applet_longopts;
+        opt = getopt32long(argv, applet_opts, applet_longopts, ...);
 
-        The last member of struct option (val) typically is set to
+        The last element (val) typically is set to
         matching short option from applet_opts. If there is no matching
         char in applet_opts, then:
         - return bit has next position after short options
@@ -119,7 +123,7 @@ const char *applet_long_options
         config process and not a required feature.  The current standard
         is to name the config option CONFIG_FEATURE_<applet>_LONG_OPTIONS.
 
-const char *opt_complementary
+opt_complementary - option modifiers.
 
  ":"    The colon (":") is used to separate groups of two or more chars
         and/or groups of chars and special characters (stating some
@@ -130,8 +134,7 @@ const char *opt_complementary
         Their flags will be turned on if the main option is found even
         if they are not specified on the command line.  For example:
 
-        opt_complementary = "abc";
-        flags = getopt32(argv, "abcd")
+        flags = getopt32(argv, "^abcd""\0""abc")
 
         If getopt() finds "-a" on the command line, then
         getopt32's return value will be as if "-a -b -c" were
@@ -144,8 +147,7 @@ const char *opt_complementary
         if w is given more than once, it is "unlimited"
 
         int w_counter = 0; // must be initialized!
-        opt_complementary = "ww";
-        getopt32(argv, "w", &w_counter);
+        getopt32(argv, "^w""\0""ww", &w_counter);
         if (w_counter)
                 width = (w_counter == 1) ? 132 : INT_MAX;
         else
@@ -160,8 +162,9 @@ const char *opt_complementary
 
         llist_t *my_b = NULL;
         int verbose_level = 0;
-        opt_complementary = "vv:b-c:c-b";
-        f = getopt32(argv, "vb:*c", &my_b, &verbose_level);
+        f = getopt32(argv, "^vb:*c"
+                        "\0""vv:b-c:c-b"
+                        , &my_b, &verbose_level);
         if (f & 2)       // -c after -b unsets -b flag
                 while (my_b) dosomething_with(llist_pop(&my_b));
         if (my_b)        // but llist is stored if -b is specified
@@ -170,31 +173,6 @@ const char *opt_complementary
 
 Special characters:
 
- "-"    A group consisting of just a dash forces all arguments
-        to be treated as options, even if they have no leading dashes.
-        Next char in this case can't be a digit (0-9), use ':' or end of line.
-        Example:
-
-        opt_complementary = "-:w-x:x-w"; // "-w-x:x-w" would also work,
-        getopt32(argv, "wx");            // but is less readable
-
-        This makes it possible to use options without a dash (./program w x)
-        as well as with a dash (./program -x).
-
-        NB: getopt32() will leak a small amount of memory if you use
-        this option! Do not use it if there is a possibility of recursive
-        getopt32() calls.
-
- "--"   A double dash at the beginning of opt_complementary means the
-        argv[1] string should always be treated as options, even if it isn't
-        prefixed with a "-".  This is useful for special syntax in applets
-        such as "ar" and "tar":
-        tar xvf foo.tar
-
-        NB: getopt32() will leak a small amount of memory if you use
-        this option! Do not use it if there is a possibility of recursive
-        getopt32() calls.
-
  "-N"   A dash as the first char in a opt_complementary group followed
         by a single digit (0-9) means that at least N non-option
         arguments must be present on the command line
@@ -222,7 +200,7 @@ Special characters:
         getopt32 finds -s, then -d is unset or if it finds -d
         then -s is unset.  (Note:  busybox implements the GNU
         "--max-depth" option as "-d".)  To obtain this behavior, you
-        set opt_complementary = "s-d:d-s".  Only one flag value is
+        set opt_complementary to "s-d:d-s".  Only one flag value is
         added to getopt32's return value depending on the
         position of the options on the command line.  If one of the
         two options requires an argument pointer (":" in applet_opts
@@ -230,8 +208,7 @@ Special characters:
 
         char *smax_print_depth;
 
-        opt_complementary = "s-d:d-s:x-x";
-        opt = getopt32(argv, "sd:x", &smax_print_depth);
+        opt = getopt32(argv, "^sd:x""\0""s-d:d-s:x-x", &smax_print_depth);
 
         if (opt & 2)
                 max_print_depth = atoi(smax_print_depth);
@@ -247,7 +224,7 @@ Special characters:
         The cut applet must have only one type of list specified, so
         -b, -c and -f are mutually exclusive and should raise an error
         if specified together.  In this case you must set
-        opt_complementary = "b--cf:c--bf:f--bc".  If two of the
+        opt_complementary to "b--cf:c--bf:f--bc".  If two of the
         mutually exclusive options are found, getopt32 will call
         bb_show_usage() and die.
 
@@ -259,8 +236,7 @@ Special characters:
         with xatoi_positive() - allowed range is 0..INT_MAX.
 
         int param;  // "unsigned param;" will also work
-        opt_complementary = "p+";
-        getopt32(argv, "p:", &param);
+        getopt32(argv, "^p:""\0""p+", &param);
 
  "o::"  A double colon after a char in opt_complementary means that the
         option can occur multiple times. Each occurrence will be saved as
@@ -275,8 +251,7 @@ Special characters:
         (this pointer must be initializated to NULL if the list is empty
         as required by llist_add_to_end(llist_t **old_head, char *new_item).)
 
-        opt_complementary = "e::";
-        getopt32(argv, "e:", &patterns);
+        getopt32(argv, "^e:""\0""e::", &patterns);
 
         $ grep -e user -e root /etc/passwd
         root:x:0:0:root:/root:/bin/bash
@@ -294,8 +269,7 @@ Special characters:
         For example from "id" applet:
 
         // Don't allow -n -r -rn -ug -rug -nug -rnug
-        opt_complementary = "r?ug:n?ug:u--g:g--u";
-        flags = getopt32(argv, "rnug");
+        flags = getopt32(argv, "^rnug""\0""r?ug:n?ug:u--g:g--u");
 
         This example allowed only:
         $ id; id -u; id -g; id -ru; id -nu; id -rg; id -ng; id -rnu; id -rng
@@ -306,8 +280,7 @@ Special characters:
         For example from "start-stop-daemon" applet:
 
         // Don't allow -KS -SK, but -S or -K is required
-        opt_complementary = "K:S:K--S:S--K";
-        flags = getopt32(argv, "KS...);
+        flags = getopt32(argv, "^KS...""\0""K:S:K--S:S--K");
 
 
         Don't forget to use ':'. For example, "?322-22-23X-x-a"
@@ -322,8 +295,6 @@ Special characters:
 
 const char *const bb_argv_dash[] = { "-", NULL };
 
-const char *opt_complementary;
-
 enum {
         PARAM_STRING,
         PARAM_LIST,
@@ -341,58 +312,63 @@ typedef struct {
         int *counter;
 } t_complementary;
 
-/* You can set applet_long_options for parse called long options */
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+uint32_t option_mask32;
+
+#if ENABLE_LONG_OPTS
 static const struct option bb_null_long_options[1] = {
         { 0, 0, 0, 0 }
 };
-const char *applet_long_options;
+#else
+#define vgetopt32(argv,applet_opts,applet_long_options,p) \
+        vgetopt32(argv,applet_opts,p)
 #endif
 
-uint32_t option_mask32;
+/* Please keep getopt32 free from xmalloc */
 
-uint32_t FAST_FUNC
-getopt32(char **argv, const char *applet_opts, ...)
+static uint32_t
+vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options, va_list p)
 {
         int argc;
         unsigned flags = 0;
         unsigned requires = 0;
+        unsigned len;
         t_complementary complementary[33]; /* last stays zero-filled */
-        char first_char;
+        char dont_die_flag;
         int c;
         const unsigned char *s;
+        const char *opt_complementary;
         t_complementary *on_off;
-        va_list p;
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
         const struct option *l_o;
         struct option *long_options = (struct option *) &bb_null_long_options;
 #endif
         unsigned trigger;
-        char **pargv;
         int min_arg = 0;
         int max_arg = -1;
-
-#define SHOW_USAGE_IF_ERROR     1
-#define ALL_ARGV_IS_OPTS        2
-#define FIRST_ARGV_IS_OPT       4
-
         int spec_flgs = 0;
 
-        /* skip 0: some applets cheat: they do not actually HAVE argv[0] */
-        argc = 1 + string_array_len(argv + 1);
-
-        va_start(p, applet_opts);
+#define SHOW_USAGE_IF_ERROR     1
 
         on_off = complementary;
         memset(on_off, 0, sizeof(complementary));
 
-        applet_opts = strcpy(alloca(strlen(applet_opts) + 1), applet_opts);
+        len = strlen(applet_opts);
 
         /* skip bbox extension */
-        first_char = applet_opts[0];
-        if (first_char == '!')
+        opt_complementary = NULL;
+        if (applet_opts[0] == '^') {
+                applet_opts++;
+                /* point it past terminating NUL */
+                opt_complementary = applet_opts + len;
+        }
+
+        /* skip another bbox extension */
+        dont_die_flag = applet_opts[0];
+        if (dont_die_flag == '!')
                 applet_opts++;
 
+        applet_opts = strcpy(alloca(len + 1), applet_opts);
+
         /* skip GNU extension */
         s = (const unsigned char *)applet_opts;
         if (*s == '+' || *s == '-')
@@ -419,7 +395,7 @@ getopt32(char **argv, const char *applet_opts, ...)
                 c++;
         }
 
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
         if (applet_long_options) {
                 const char *optstr;
                 unsigned i, count;
@@ -458,14 +434,11 @@ getopt32(char **argv, const char *applet_opts, ...)
                         c++;
  next_long: ;
                 }
-                /* Make it unnecessary to clear applet_long_options
-                 * by hand after each call to getopt32
-                 */
-                applet_long_options = NULL;
         }
-#endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */
+#endif /* ENABLE_LONG_OPTS */
 
-        for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
+        s = (const unsigned char *)opt_complementary;
+        if (s) for (; *s; s++) {
                 t_complementary *pair;
                 unsigned *pair_switch;
 
@@ -482,13 +455,7 @@ getopt32(char **argv, const char *applet_opts, ...)
                         continue;
                 }
                 if (*s == '-') {
-                        if (c < '0' || c > '9') {
-                                if (c == '-') {
-                                        spec_flgs |= FIRST_ARGV_IS_OPT;
-                                        s++;
-                                } else
-                                        spec_flgs |= ALL_ARGV_IS_OPTS;
-                        } else {
+                        if (c >= '0' && c <= '9') {
                                 min_arg = c - '0';
                                 s++;
                         }
@@ -548,26 +515,6 @@ getopt32(char **argv, const char *applet_opts, ...)
                 }
                 s--;
         }
-        opt_complementary = NULL;
-        va_end(p);
-
-        if (spec_flgs & (FIRST_ARGV_IS_OPT | ALL_ARGV_IS_OPTS)) {
-                pargv = argv + 1;
-                while (*pargv) {
-                        if (pargv[0][0] != '-' && pargv[0][0] != '\0') {
-                                /* Can't use alloca: opts with params will
-                                 * return pointers to stack!
-                                 * NB: we leak these allocations... */
-                                char *pp = xmalloc(strlen(*pargv) + 2);
-                                *pp = '-';
-                                strcpy(pp + 1, *pargv);
-                                *pargv = pp;
-                        }
-                        if (!(spec_flgs & ALL_ARGV_IS_OPTS))
-                                break;
-                        pargv++;
-                }
-        }
 
         /* In case getopt32 was already called:
          * reset the libc getopt() function, which keeps internal state.
@@ -576,11 +523,14 @@ getopt32(char **argv, const char *applet_opts, ...)
          */
         GETOPT_RESET();
 
+        /* skip 0: some applets cheat: they do not actually HAVE argv[0] */
+        argc = 1 + string_array_len(argv + 1);
+
         /* Note: just "getopt() <= 0" will not work well for
          * "fake" short options, like this one:
          * wget $'-\203' "Test: test" http://kernel.org/
          * (supposed to act as --header, but doesn't) */
-#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
         while ((c = getopt_long(argc, argv, applet_opts,
                         long_options, NULL)) != -1) {
 #else
@@ -637,7 +587,33 @@ getopt32(char **argv, const char *applet_opts, ...)
         return flags;
 
  error:
-        if (first_char != '!')
+        if (dont_die_flag != '!')
                 bb_show_usage();
         return (int32_t)-1;
 }
+
+uint32_t FAST_FUNC
+getopt32(char **argv, const char *applet_opts, ...)
+{
+        uint32_t opt;
+        va_list p;
+
+        va_start(p, applet_opts);
+        opt = vgetopt32(argv, applet_opts, NULL, p);
+        va_end(p);
+        return opt;
+}
+
+#if ENABLE_LONG_OPTS
+uint32_t FAST_FUNC
+getopt32long(char **argv, const char *applet_opts, const char *longopts, ...)
+{
+        uint32_t opt;
+        va_list p;
+
+        va_start(p, longopts);
+        opt = vgetopt32(argv, applet_opts, longopts, p);
+        va_end(p);
+        return opt;
+}
+#endif
diff --git a/libbb/getopt_allopts.c b/libbb/getopt_allopts.c
new file mode 100644
index 000000000..a67d2b70e
--- /dev/null
+++ b/libbb/getopt_allopts.c
@@ -0,0 +1,27 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2017 Denys Vlasenko
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+
+//kbuild:lib-y += getopt_allopts.o
+
+void FAST_FUNC make_all_argv_opts(char **argv)
+{
+        /* Note: we skip argv[0] */
+        while (*++argv) {
+                char *p;
+
+                if (argv[0][0] == '-')
+                        continue;
+                /* Neither top nor ps care if "" arg turns into "-" */
+                /*if (argv[0][0] == '\0')
+                        continue;*/
+                p = xmalloc(strlen(*argv) + 2);
+                *p = '-';
+                strcpy(p + 1, *argv);
+                *argv = p;
+        }
+}
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 051a39b2e..c2b0a3842 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1320,6 +1320,7 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 {
         line_input_t *n = xzalloc(sizeof(*n));
         n->flags = flags;
+        n->timeout = -1;
 #if MAX_HISTORY > 0
         n->max_history = MAX_HISTORY;
 #endif
@@ -2192,7 +2193,7 @@ enum {
  * Backspace deletes last matched char.
  * Control keys exit search and return to normal editing (at current history line).
  */
-static int32_t reverse_i_search(void)
+static int32_t reverse_i_search(int timeout)
 {
         char match_buf[128]; /* for user input */
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
@@ -2214,8 +2215,8 @@ static int32_t reverse_i_search(void)
                 int h;
                 unsigned match_buf_len = strlen(match_buf);
 
-//FIXME: correct timeout?
-                ic = lineedit_read_key(read_key_buffer, -1);
+//FIXME: correct timeout? (i.e. count it down?)
+                ic = lineedit_read_key(read_key_buffer, timeout);
 
                 switch (ic) {
                 case CTRL('R'): /* searching for the next match */
@@ -2318,9 +2319,10 @@ static int32_t reverse_i_search(void)
  * (in both cases the cursor remains on the input line, '\n' is not printed)
  * >0 length of input string, including terminating '\n'
  */
-int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout)
+int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize)
 {
         int len;
+        int timeout;
 #if ENABLE_FEATURE_TAB_COMPLETION
         smallint lastWasTab = 0;
 #endif
@@ -2366,8 +2368,15 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 maxsize = MAX_LINELEN;
         S.maxsize = maxsize;
 
-        /* With zero flags, no other fields are ever used */
-        state = st ? st : (line_input_t*) &const_int_0;
+        timeout = -1;
+        /* Make state->flags == 0 if st is NULL.
+         * With zeroed flags, no other fields are ever referenced.
+         */
+        state = (line_input_t*) &const_int_0;
+        if (st) {
+                state = st;
+                timeout = st->timeout;
+        }
 #if MAX_HISTORY > 0
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
         if (state->hist_file)
@@ -2584,7 +2593,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 }
 #if ENABLE_FEATURE_REVERSE_SEARCH
                 case CTRL('R'):
-                        ic = ic_raw = reverse_i_search();
+                        ic = ic_raw = reverse_i_search(timeout);
                         goto again;
 #endif
 
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 307ae2cd2..8701b010c 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -42,8 +42,9 @@ int parse_main(int argc UNUSED_PARAM, char **argv)
         int mintokens = 0, ntokens = 128;
         unsigned noout;
 
-        opt_complementary = "-1";
-        noout = 1 & getopt32(argv, "xn:+m:+d:f:+", &ntokens, &mintokens, &delims, &flags);
+        noout = 1 & getopt32(argv, "^" "xn:+m:+d:f:+" "\0" "-1",
+                                &ntokens, &mintokens, &delims, &flags
+        );
         //argc -= optind;
         argv += optind;
 
@@ -161,13 +162,18 @@ mintokens > 0 make config_read() print error message if less than mintokens
 #undef config_read
 int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const char *delims)
 {
-        char *line;
+        char *line, *p;
         int ntokens, mintokens;
         int t;
+        char alt_comment_ch;
 
         if (!parser)
                 return 0;
 
+        alt_comment_ch = '\0';
+        if (flags & PARSE_ALT_COMMENTS)
+                alt_comment_ch = *delims++;
+
         ntokens = (uint8_t)flags;
         mintokens = (uint8_t)(flags >> 8);
 
@@ -184,7 +190,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
         if (flags & PARSE_TRIM)
                 line += strspn(line, delims + 1);
 
-        if (line[0] == '\0' || line[0] == delims[0])
+        p = line;
+        if (flags & PARSE_WS_COMMENTS)
+                p = skip_whitespace(p);
+        if (p[0] == '\0' || p[0] == delims[0] || p[0] == alt_comment_ch)
                 goto again;
 
         if (flags & PARSE_KEEP_COPY) {
@@ -201,10 +210,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
                 /* Combine remaining arguments? */
                 if ((t != (ntokens-1)) || !(flags & PARSE_GREEDY)) {
                         /* Vanilla token, find next delimiter */
-                        line += strcspn(line, delims[0] ? delims : delims + 1);
+                        line += strcspn(line, (delims[0] && (flags & PARSE_EOL_COMMENTS)) ? delims : delims + 1);
                 } else {
                         /* Combining, find comment char if any */
-                        line = strchrnul(line, PARSE_EOL_COMMENTS ? delims[0] : '\0');
+                        line = strchrnul(line, (flags & PARSE_EOL_COMMENTS) ? delims[0] : '\0');
 
                         /* Trim any extra delimiters from the end */
                         if (flags & PARSE_TRIM) {
@@ -214,10 +223,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
                 }
 
                 /* Token not terminated? */
-                if (*line == delims[0])
-                        *line = '\0';
+                if ((flags & PARSE_EOL_COMMENTS) && *line == delims[0])
+                        *line = '\0'; /* ends with comment char: this line is done */
                 else if (*line != '\0')
-                        *line++ = '\0';
+                        *line++ = '\0'; /* token is done, continue parsing line */
 
 #if 0 /* unused so far */
                 if (flags & PARSE_ESCAPE) {
diff --git a/libbb/progress.c b/libbb/progress.c
index 3c2f01667..64e6529ac 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -25,7 +25,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/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c
index c8e02ddff..19a9ab15b 100644
--- a/libbb/pw_encrypt_des.c
+++ b/libbb/pw_encrypt_des.c
@@ -24,7 +24,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index b6b9360e8..3bb58bb6f 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH 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 JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 944ac5538..7ac22cd92 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -15,7 +15,7 @@
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH 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 JULIE HAUGH OR CONTRIBUTORS BE LIABLE
diff --git a/libbb/trim.c b/libbb/trim.c
index 16cb4fbb0..e47fec74e 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -10,9 +10,10 @@
 
 #include "libbb.h"
 
-void FAST_FUNC trim(char *s)
+char* FAST_FUNC trim(char *s)
 {
         size_t len = strlen(s);
+        size_t old = len;
 
         /* trim trailing whitespace */
         while (len && isspace(s[len-1]))
@@ -26,5 +27,12 @@ void FAST_FUNC trim(char *s)
                         memmove(s, nws, len);
                 }
         }
-        s[len] = '\0';
+
+        s += len;
+        /* If it was a "const char*" which does not need trimming,
+         * avoid superfluous store */
+        if (old != len)
+                *s = '\0';
+
+        return s;
 }
diff --git a/libbb/ubi.c b/libbb/ubi.c
index 34595d797..a90016acf 100644
--- a/libbb/ubi.c
+++ b/libbb/ubi.c
@@ -35,6 +35,7 @@ int FAST_FUNC ubi_get_volid_by_name(unsigned ubi_devnum, const char *vol_name)
                 if (open_read_close(fname, buf, sizeof(buf)) <= 0)
                         continue;
 
+                buf[UBI_MAX_VOLUME_NAME] = '\0';
                 strchrnul(buf, '\n')[0] = '\0';
                 if (strcmp(vol_name, buf) == 0)
                         return i;
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 4b3ed5a3b..eca2fabf5 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -14,78 +14,46 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#include <sys/prctl.h>
+#ifndef PR_SET_NAME
+#define PR_SET_NAME 15
+#endif
+#ifndef PR_GET_NAME
+#define PR_GET_NAME 16
+#endif
 
 #include "busybox.h" /* uses applet tables */
 #include "NUM_APPLETS.h"
 
-#if !ENABLE_PLATFORM_MINGW32
-/* This does a fork/exec in one call, using vfork().  Returns PID of new child,
- * -1 for failure.  Runs argv[0], searching path if that has no / in it. */
-pid_t FAST_FUNC spawn(char **argv)
-{
-        /* Compiler should not optimize stores here */
-        volatile int failed;
-        pid_t pid;
-
-        fflush_all();
-
-        /* Be nice to nommu machines. */
-        failed = 0;
-        pid = vfork();
-        if (pid < 0) /* error */
-                return pid;
-        if (!pid) { /* child */
-                /* This macro is ok - it doesn't do NOEXEC/NOFORK tricks */
-                BB_EXECVP(argv[0], argv);
-
-                /* We are (maybe) sharing a stack with blocked parent,
-                 * let parent know we failed and then exit to unblock parent
-                 * (but don't run atexit() stuff, which would screw up parent.)
-                 */
-                failed = errno;
-                /* mount, for example, does not want the message */
-                /*bb_perror_msg("can't execute '%s'", argv[0]);*/
-                _exit(111);
-        }
-        /* parent */
-        /* Unfortunately, this is not reliable: according to standards
-         * vfork() can be equivalent to fork() and we won't see value
-         * of 'failed'.
-         * Interested party can wait on pid and learn exit code.
-         * If 111 - then it (most probably) failed to exec */
-        if (failed) {
-                safe_waitpid(pid, NULL, 0); /* prevent zombie */
-                errno = failed;
-                return -1;
-        }
-        return pid;
-}
-#endif
+#define NOFORK_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_NOFORK))
+#define NOEXEC_SUPPORT ((NUM_APPLETS > 1) && (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE))
 
-/* Die with an error message if we can't spawn a child process. */
-pid_t FAST_FUNC xspawn(char **argv)
+#if defined(__linux__) && (NUM_APPLETS > 1)
+void FAST_FUNC set_task_comm(const char *comm)
 {
-        pid_t pid = spawn(argv);
-        if (pid < 0)
-                bb_simple_perror_msg_and_die(*argv);
-        return pid;
+        /* okay if too long (truncates) */
+        prctl(PR_SET_NAME, (long)comm, 0, 0, 0);
 }
+#endif
 
-#if ENABLE_FEATURE_PREFER_APPLETS \
- || ENABLE_FEATURE_SH_NOFORK
+/*
+ * NOFORK/NOEXEC support
+ */
+#if NOFORK_SUPPORT
 static jmp_buf die_jmp;
 static void jump(void)
 {
         /* Special case. We arrive here if NOFORK applet
          * calls xfunc, which then decides to die.
-         * We don't die, but jump instead back to caller.
+         * We don't die, but instead jump back to caller.
          * NOFORK applets still cannot carelessly call xfuncs:
          * p = xmalloc(10);
          * q = xmalloc(10); // BUG! if this dies, we leak p!
          */
         /* | 0x100 allows to pass zero exitcode (longjmp can't pass 0).
          * This works because exitcodes are bytes,
-         * run_nofork_applet() ensures that by "& 0xff" */
+         * run_nofork_applet() ensures that by "& 0xff"
+         */
         longjmp(die_jmp, xfunc_error_retval | 0x100);
 }
 
@@ -94,6 +62,7 @@ struct nofork_save_area {
         void (*die_func)(void);
         const char *applet_name;
         uint32_t option_mask32;
+        smallint logmode;
         uint8_t xfunc_error_retval;
 };
 static void save_nofork_data(struct nofork_save_area *save)
@@ -102,6 +71,7 @@ static void save_nofork_data(struct nofork_save_area *save)
         save->die_func = die_func;
         save->applet_name = applet_name;
         save->option_mask32 = option_mask32;
+        save->logmode = logmode;
         save->xfunc_error_retval = xfunc_error_retval;
 }
 static void restore_nofork_data(struct nofork_save_area *save)
@@ -110,6 +80,7 @@ static void restore_nofork_data(struct nofork_save_area *save)
         die_func = save->die_func;
         applet_name = save->applet_name;
         option_mask32 = save->option_mask32;
+        logmode = save->logmode;
         xfunc_error_retval = save->xfunc_error_retval;
 }
 
@@ -120,16 +91,15 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 
         save_nofork_data(&old);
 
+        logmode = LOGMODE_STDIO;
         xfunc_error_retval = EXIT_FAILURE;
-
-        /* In case getopt() or getopt32() was already called:
+        /* In case getopt() was already called:
          * reset the libc getopt() function, which keeps internal state.
+         * (getopt32() does it itself, but getopt() doesn't (and can't))
          */
         GETOPT_RESET();
 
-        argc = 1;
-        while (argv[argc])
-                argc++;
+        argc = string_array_len(argv);
 
         /* If xfunc "dies" in NOFORK applet, die_func longjmp's here instead */
         die_func = jump;
@@ -142,19 +112,97 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
                 applet_name = tmp_argv[0];
                 /* Finally we can call NOFORK applet's main() */
                 rc = applet_main[applet_no](argc, tmp_argv);
+                /* Important for shells: `which CMD` was failing */
+                fflush_all();
         } else {
                 /* xfunc died in NOFORK applet */
         }
 
         /* Restoring some globals */
         restore_nofork_data(&old);
-
         /* Other globals can be simply reset to defaults */
         GETOPT_RESET();
 
         return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
 }
-#endif /* FEATURE_PREFER_APPLETS || FEATURE_SH_NOFORK */
+#endif
+
+#if NOEXEC_SUPPORT
+void FAST_FUNC run_noexec_applet_and_exit(int a, const char *name, char **argv)
+{
+        /* reset some state and run without execing */
+        /* msg_eol = "\n"; - no caller needs this reinited yet */
+        logmode = LOGMODE_STDIO;
+        xfunc_error_retval = EXIT_FAILURE;
+        die_func = NULL;
+        GETOPT_RESET();
+
+//TODO: think pidof, pgrep, pkill!
+//set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
+//but one from procps-ng-3.3.10 needs more!
+//Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!)
+        set_task_comm(name);
+        /* applet_name is set by this function: */
+        run_applet_no_and_exit(a, name, argv);
+}
+#endif
+
+/*
+ * Higher-level code, hiding optional NOFORK/NOEXEC trickery.
+ */
+
+#if !ENABLE_PLATFORM_MINGW32
+/* This does a fork/exec in one call, using vfork().  Returns PID of new child,
+ * -1 for failure.  Runs argv[0], searching path if that has no / in it. */
+pid_t FAST_FUNC spawn(char **argv)
+{
+        /* Compiler should not optimize stores here */
+        volatile int failed;
+        pid_t pid;
+
+        fflush_all();
+
+        /* Be nice to nommu machines. */
+        failed = 0;
+        pid = vfork();
+        if (pid < 0) /* error */
+                return pid;
+        if (!pid) { /* child */
+                /* This macro is ok - it doesn't do NOEXEC/NOFORK tricks */
+                BB_EXECVP(argv[0], argv);
+
+                /* We are (maybe) sharing a stack with blocked parent,
+                 * let parent know we failed and then exit to unblock parent
+                 * (but don't run atexit() stuff, which would screw up parent.)
+                 */
+                failed = errno;
+                /* mount, for example, does not want the message */
+                /*bb_perror_msg("can't execute '%s'", argv[0]);*/
+                _exit(111);
+        }
+        /* parent */
+        /* Unfortunately, this is not reliable: according to standards
+         * vfork() can be equivalent to fork() and we won't see value
+         * of 'failed'.
+         * Interested party can wait on pid and learn exit code.
+         * If 111 - then it (most probably) failed to exec */
+        if (failed) {
+                safe_waitpid(pid, NULL, 0); /* prevent zombie */
+                errno = failed;
+                return -1;
+        }
+        return pid;
+}
+#endif
+
+/* Die with an error message if we can't spawn a child process. */
+pid_t FAST_FUNC xspawn(char **argv)
+{
+        pid_t pid = spawn(argv);
+        if (pid < 0)
+                bb_simple_perror_msg_and_die(*argv);
+        return pid;
+}
 
 int FAST_FUNC spawn_and_wait(char **argv)
 {
@@ -174,21 +222,12 @@ int FAST_FUNC spawn_and_wait(char **argv)
                                 return wait4pid(rc);
 
                         /* child */
-                        /* reset some state and run without execing */
-
-                        /* msg_eol = "\n"; - no caller needs this reinited yet */
-                        logmode = LOGMODE_STDIO;
-                        /* die_func = NULL; - needed if the caller is a shell,
-                         * init, or a NOFORK applet. But none of those call us
-                         * as of yet (and that should probably always stay true).
-                         */
-                        /* xfunc_error_retval and applet_name are init by: */
-                        run_applet_no_and_exit(a, argv[0], argv);
+                        run_noexec_applet_and_exit(a, argv[0], argv);
                 }
 #  endif
 # endif
         }
-#endif /* FEATURE_PREFER_APPLETS */
+#endif
         rc = spawn(argv);
         return wait4pid(rc);
 }
@@ -209,6 +248,9 @@ pid_t FAST_FUNC fork_or_rexec(char **argv)
         /* Maybe we are already re-execed and come here again? */
         if (re_execed)
                 return 0;
+
+        /* fflush_all(); ? - so far all callers had no buffered output to flush */
+
         pid = xvfork();
         if (pid) /* parent */
                 return pid;
@@ -245,8 +287,11 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                 fd = dup(fd); /* have 0,1,2 open at least to /dev/null */
 
         if (!(flags & DAEMON_ONLY_SANITIZE)) {
+
+                /* fflush_all(); - add it in fork_or_rexec() if necessary */
+
                 if (fork_or_rexec(argv))
-                        exit(EXIT_SUCCESS); /* parent */
+                        _exit(EXIT_SUCCESS); /* parent */
                 /* if daemonizing, detach from stdio & ctty */
                 setsid();
                 dup2(fd, 0);
@@ -258,7 +303,7 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                          * Prevent this: stop being a session leader.
                          */
                         if (fork_or_rexec(argv))
-                                exit(EXIT_SUCCESS); /* parent */
+                                _exit(EXIT_SUCCESS); /* parent */
                 }
         }
         while (fd > 2) {
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 98d3531d6..1b3a1667b 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -313,7 +313,7 @@ int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 
 int FAST_FUNC set_termios_to_raw(int fd, struct termios *oldterm, int flags)
 {
-//TODO: lineedit, microcom and less might be adapted to use this too:
+//TODO: lineedit, microcom, slattach, less might be adapted to use this too:
 // grep for "tcsetattr"
 
         struct termios newterm;
diff --git a/libpwdgrp/uidgid_get.c b/libpwdgrp/uidgid_get.c
index 1199f23f9..283ac78fc 100644
--- a/libpwdgrp/uidgid_get.c
+++ b/libpwdgrp/uidgid_get.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c
index 750b44bd6..6d03de254 100644
--- a/loginutils/add-remove-shell.c
+++ b/loginutils/add-remove-shell.c
@@ -19,9 +19,9 @@
 //config:       help
 //config:       Remove shells from /etc/shells.
 
-//                       APPLET_ODDNAME:name          main              location         suid_type     help
-//applet:IF_ADD_SHELL(   APPLET_ODDNAME(add-shell   , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell   ))
-//applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell))
+//                       APPLET_NOEXEC:name          main              location         suid_type     help
+//applet:IF_ADD_SHELL(   APPLET_NOEXEC(add-shell   , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell   ))
+//applet:IF_REMOVE_SHELL(APPLET_NOEXEC(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell))
 
 //kbuild:lib-$(CONFIG_ADD_SHELL)    += add-remove-shell.o
 //kbuild:lib-$(CONFIG_REMOVE_SHELL) += add-remove-shell.o
@@ -64,6 +64,7 @@ int add_remove_shell_main(int argc UNUSED_PARAM, char **argv)
         if (orig_fp)
                 xfstat(fileno(orig_fp), &sb, orig_fn);
 
+
         new_fn = xasprintf("%s.tmp", orig_fn);
         /*
          * O_TRUNC or O_EXCL? At the first glance, O_EXCL looks better,
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index b197fc149..adef2328d 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -12,14 +12,10 @@
 //config:config ADDGROUP
 //config:       bool "addgroup (8.2 kb)"
 //config:       default y
+//config:       select LONG_OPTS
 //config:       help
 //config:       Utility for creating a new group account.
 //config:
-//config:config FEATURE_ADDGROUP_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on ADDGROUP && LONG_OPTS
-//config:
 //config:config FEATURE_ADDUSER_TO_GROUP
 //config:       bool "Support adding users to groups"
 //config:       default y
@@ -29,7 +25,7 @@
 //config:       addgroup will add an existing user to an
 //config:       existing group.
 
-//applet:IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_ADDGROUP(APPLET_NOEXEC(addgroup, addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP, addgroup))
 
 //kbuild:lib-$(CONFIG_ADDGROUP) += addgroup.o
 
@@ -131,12 +127,11 @@ static void new_group(char *group, gid_t gid)
 #endif
 }
 
-#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS
+//FIXME: upstream addgroup has no short options! NOT COMPATIBLE!
 static const char addgroup_longopts[] ALIGN1 =
                 "gid\0"                 Required_argument "g"
                 "system\0"              No_argument       "S"
                 ;
-#endif
 
 /*
  * addgroup will take a login_name as its first parameter.
@@ -155,16 +150,14 @@ int addgroup_main(int argc UNUSED_PARAM, char **argv)
         if (geteuid()) {
                 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
         }
-#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS
-        applet_long_options = addgroup_longopts;
-#endif
         /* Syntax:
          *  addgroup group
-         *  addgroup -g num group
+         *  addgroup --gid num group
          *  addgroup user group
          * Check for min, max and missing args */
-        opt_complementary = "-1:?2";
-        opts = getopt32(argv, "g:S", &gid);
+        opts = getopt32long(argv, "^" "g:S" "\0" "-1:?2", addgroup_longopts,
+                                &gid
+        );
         /* move past the commandline options */
         argv += optind;
         //argc -= optind;
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index ef18278ac..b2b5be5b3 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -10,14 +10,10 @@
 //config:config ADDUSER
 //config:       bool "adduser (15 kb)"
 //config:       default y
+//config:       select LONG_OPTS
 //config:       help
 //config:       Utility for creating a new user account.
 //config:
-//config:config FEATURE_ADDUSER_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on ADDUSER && LONG_OPTS
-//config:
 //config:config FEATURE_CHECK_NAMES
 //config:       bool "Enable sanity check on user/group names in adduser and addgroup"
 //config:       default n
@@ -53,7 +49,7 @@
 //config:       help
 //config:       Last valid system uid or gid for adduser and addgroup
 
-//applet:IF_ADDUSER(APPLET(adduser, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_ADDUSER(APPLET_NOEXEC(adduser, adduser, BB_DIR_USR_SBIN, BB_SUID_DROP, adduser))
 
 //kbuild:lib-$(CONFIG_ADDUSER) += adduser.o
 
@@ -148,15 +144,7 @@ static int addgroup_wrapper(struct passwd *p, const char *group_name)
                 /* Add user to his own group with the first free gid
                  * found in passwd_study.
                  */
-#if ENABLE_FEATURE_ADDGROUP_LONG_OPTIONS || !ENABLE_ADDGROUP
-                /* We try to use --gid, not -g, because "standard" addgroup
-                 * has no short option -g, it has only long --gid.
-                 */
                 argv[1] = (char*)"--gid";
-#else
-                /* Breaks if system in fact does NOT use busybox addgroup */
-                argv[1] = (char*)"-g";
-#endif
                 argv[2] = utoa(p->pw_gid);
                 argv[3] = (char*)"--";
                 argv[4] = p->pw_name;
@@ -174,7 +162,7 @@ static void passwd_wrapper(const char *login_name)
         bb_error_msg_and_die("can't execute passwd, you must set password manually");
 }
 
-#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
+//FIXME: upstream adduser has no short options! NOT COMPATIBLE!
 static const char adduser_longopts[] ALIGN1 =
                 "home\0"                Required_argument "h"
                 "gecos\0"               Required_argument "g"
@@ -187,7 +175,6 @@ static const char adduser_longopts[] ALIGN1 =
                 "uid\0"                 Required_argument "u"
                 "skel\0"                Required_argument "k"
                 ;
-#endif
 
 /*
  * adduser will take a login_name as its first parameter.
@@ -204,10 +191,6 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
         char *uid;
         const char *skel = "/etc/skel";
 
-#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
-        applet_long_options = adduser_longopts;
-#endif
-
         /* got root? */
         if (geteuid()) {
                 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
@@ -218,10 +201,15 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
         pw.pw_shell = (char *)get_shell_name();
         pw.pw_dir = NULL;
 
-        /* at least one and at most two non-option args */
-        /* disable interactive passwd for system accounts */
-        opt_complementary = "-1:?2:SD";
-        opts = getopt32(argv, "h:g:s:G:DSHu:k:", &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell, &usegroup, &uid, &skel);
+        opts = getopt32long(argv, "^"
+                        "h:g:s:G:DSHu:k:"
+                        /* at least one and at most two non-option args */
+                        /* disable interactive passwd for system accounts */
+                        "\0" "-1:?2:SD",
+                        adduser_longopts,
+                        &pw.pw_dir, &pw.pw_gecos, &pw.pw_shell,
+                        &usegroup, &uid, &skel
+        );
         if (opts & OPT_UID)
                 pw.pw_uid = xatou_range(uid, 0, CONFIG_LAST_ID);
 
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index e390da647..652e4f127 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -61,9 +61,10 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
         if (getuid() != 0)
                 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-        opt_complementary = "m--ec:e--mc:c--em";
-        IF_LONG_OPTS(applet_long_options = chpasswd_longopts;)
-        opt = getopt32(argv, "emc:", &algo);
+        opt = getopt32long(argv, "^" "emc:" "\0" "m--ec:e--mc:c--em",
+                        chpasswd_longopts,
+                        &algo
+        );
 
         while ((name = xmalloc_fgetline(stdin)) != NULL) {
                 char *free_me;
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index f8906c59a..76138a61f 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -24,9 +24,9 @@
 //config:       using the given salt. Debian has this utility under mkpasswd
 //config:       name. Busybox provides mkpasswd as an alias for cryptpw.
 
-//applet:IF_CRYPTPW(APPLET(cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP))
-//                   APPLET_ODDNAME:name      main     location        suid_type     help
-//applet:IF_MKPASSWD(APPLET_ODDNAME(mkpasswd, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw))
+//applet:IF_CRYPTPW( APPLET_NOEXEC(cryptpw,  cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw))
+//                   APPLET_NOEXEC:name      main     location        suid_type     help
+//applet:IF_MKPASSWD(APPLET_NOEXEC(mkpasswd, cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP, cryptpw))
 
 //kbuild:lib-$(CONFIG_CRYPTPW) += cryptpw.o
 //kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o
@@ -106,14 +106,15 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
                 "salt\0"        Required_argument "S"
                 "method\0"      Required_argument "m"
         ;
-        applet_long_options = mkpasswd_longopts;
 #endif
         fd = STDIN_FILENO;
         opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
         opt_S = NULL;
         /* at most two non-option arguments; -P NUM */
-        opt_complementary = "?2";
-        getopt32(argv, "sP:+S:m:a:", &fd, &opt_S, &opt_m, &opt_m);
+        getopt32long(argv, "^" "sP:+S:m:a:" "\0" "?2",
+                        mkpasswd_longopts,
+                        &fd, &opt_S, &opt_m, &opt_m
+        );
         argv += optind;
 
         /* have no idea how to handle -s... */
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 3b6bd952d..5ee22d4f1 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -28,8 +28,9 @@
 //config:       If called with two non-option arguments, deluser
 //config:       or delgroup will remove an user from a specified group.
 
-//applet:IF_DELUSER(APPLET(deluser, BB_DIR_USR_SBIN, BB_SUID_DROP))
-//applet:IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup))
+//                   APPLET_NOEXEC:name      main     location         suid_type     help
+//applet:IF_DELUSER( APPLET_NOEXEC(deluser,  deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, deluser))
+//applet:IF_DELGROUP(APPLET_NOEXEC(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup))
 
 //kbuild:lib-$(CONFIG_DELUSER) += deluser.o
 //kbuild:lib-$(CONFIG_DELGROUP) += deluser.o
@@ -67,9 +68,8 @@ int deluser_main(int argc, char **argv)
 #else
         int opt_delhome = 0;
         if (do_deluser) {
-                applet_long_options =
-                        "remove-home\0" No_argument "\xff";
-                opt_delhome = getopt32(argv, "");
+                opt_delhome = getopt32long(argv, "",
+                                "remove-home\0" No_argument "\xff");
                 argv += opt_delhome;
                 argc -= opt_delhome;
         }
diff --git a/loginutils/getty.c b/loginutils/getty.c
index fd5116d08..23e92bc77 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -131,7 +131,7 @@ struct globals {
 //usage:     "\n"
 //usage:     "\nBAUD_RATE of 0 leaves it unchanged"
 
-static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:+wn";
+#define OPT_STR "I:LH:f:hil:mt:+wn"
 #define F_INITSTRING    (1 << 0)   /* -I */
 #define F_LOCAL         (1 << 1)   /* -L */
 #define F_FAKEHOST      (1 << 2)   /* -H */
@@ -179,8 +179,7 @@ static void parse_args(char **argv)
         char *ts;
         int flags;
 
-        opt_complementary = "-2"; /* at least 2 args; -t N */
-        flags = getopt32(argv, opt_string,
+        flags = getopt32(argv, "^" OPT_STR "\0" "-2"/* at least 2 args*/,
                 &G.initstring, &G.fakehost, &G.issue,
                 &G.login, &G.timeout
         );
diff --git a/loginutils/login.c b/loginutils/login.c
index 381468d81..fcdb9592c 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -350,8 +350,8 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         /* Mandatory paranoia for suid applet:
          * ensure that fd# 0,1,2 are opened (at least to /dev/null)
          * and any extra open fd's are closed.
-         * (The name of the function is misleading. Not daemonizing here.) */
-        bb_daemonize_or_rexec(DAEMON_ONLY_SANITIZE | DAEMON_CLOSE_EXTRA_FDS, NULL);
+         */
+        bb_daemon_helper(DAEMON_CLOSE_EXTRA_FDS);
 
         username[0] = '\0';
         opt = getopt32(argv, "f:h:p", &opt_user, &opt_host);
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index d5a463cac..27ea5dff0 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -12,7 +12,7 @@
 //config:       sulogin is invoked when the system goes into single user
 //config:       mode (this is done through an entry in inittab).
 
-//applet:IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_SULOGIN(APPLET_NOEXEC(sulogin, sulogin, BB_DIR_SBIN, BB_SUID_DROP, sulogin))
 
 //kbuild:lib-$(CONFIG_SULOGIN) += sulogin.o
 
@@ -34,7 +34,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
 
         /* Note: sulogin is not a suid app. It is meant to be run by init
          * for single user / emergency mode. init starts it as root.
-         * Normal users (potentially malisious ones) can only run it under
+         * Normal users (potentially malicious ones) can only run it under
          * their UID, therefore no paranoia here is warranted:
          * $LD_LIBRARY_PATH in env, TTY = /dev/sda
          * are no more dangerous here than in e.g. cp applet.
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index bf46d085c..9e319fe61 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -66,8 +66,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
         struct passwd *pw;
 
         pw = xgetpwuid(getuid());
-        opt_complementary = "=0"; /* no params! */
-        getopt32(argv, "a");
+        getopt32(argv, "^" "a" "\0" "=0"/* no args!*/);
 
         /* Ignore some signals so that we don't get killed by them */
         bb_signals(0
diff --git a/mailutils/mail.c b/mailutils/mail.c
index a7e43c0d1..eceb89071 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -6,23 +6,15 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+#include <sys/prctl.h>
 #include "libbb.h"
 #include "mail.h"
 
-static void kill_helper(void)
-{
-        if (G.helper_pid > 0) {
-                kill(G.helper_pid, SIGTERM);
-                G.helper_pid = 0;
-        }
-}
-
 // generic signal handler
 static void signal_handler(int signo)
 {
 #define err signo
         if (SIGALRM == signo) {
-                kill_helper();
                 bb_error_msg_and_die("timed out");
         }
 
@@ -66,16 +58,15 @@ void FAST_FUNC launch_helper(const char **argv)
         // child stdout [1] -> parent stdin [0]
 
         if (!G.helper_pid) {
-                // child: try to execute connection helper
+                // child
+                // if parent dies, get SIGTERM
+                prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
+                // try to execute connection helper
                 // NB: SIGCHLD & SIGALRM revert to SIG_DFL on exec
                 BB_EXECVP_or_die((char**)argv);
         }
 
-        // parent
-        // check whether child is alive
-        //redundant:signal_handler(SIGCHLD);
-        // child seems OK -> parent goes on
-        atexit(kill_helper);
+        // parent goes on
 }
 
 char* FAST_FUNC send_mail_command(const char *fmt, const char *param)
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index 1695a9bb8..5756eaa76 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -125,9 +125,9 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         // parse options
-        opt_complementary = "-1:dd";
-        opts = getopt32(argv,
-                "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:"),
+        opts = getopt32(argv, "^"
+                "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:")
+                "\0" "-1:dd",
                 &timeout, NULL, NULL, NULL, &opt_nlines
                 IF_FEATURE_POPMAILDIR_DELIVERY(, &delivery, &delivery) // we treat -M and -F the same
         );
diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index 6a0254803..321729e0a 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -280,9 +280,9 @@ int reformime_main(int argc UNUSED_PARAM, char **argv)
 
         // parse options
         // N.B. only -x and -X are supported so far
-        opt_complementary = "x--X:X--x";
-        opts = getopt32(argv,
-                "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:"),
+        opts = getopt32(argv, "^"
+                "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:")
+                "\0" "x--X:X--x",
                 &opt_prefix
                 IF_FEATURE_REFORMIME_COMPAT(, NULL, NULL, &G.opt_charset, NULL, NULL, NULL, NULL)
         );
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 346de2712..f440e6319 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -166,9 +166,8 @@ static char *angle_address(char *str)
 {
         char *s, *e;
 
-        trim(str);
-        e = last_char_is(str, '>');
-        if (e) {
+        e = trim(str);
+        if (e != str && e[-1] == '>') {
                 s = strrchr(str, '<');
                 if (s) {
                         *e = '\0';
@@ -257,13 +256,17 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
         G.fp0 = xfdopen_for_read(3);
 
         // parse options
-        // -v is a counter, -H and -S are mutually exclusive, -a is a list
-        opt_complementary = "vv:H--S:S--H";
         // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect
         // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility,
         // it is still under development.
-        opts = getopt32(argv, "tf:o:iw:+H:S:a:*:v", &opt_from, NULL,
-                        &timeout, &opt_connect, &opt_connect, &list, &verbose);
+        opts = getopt32(argv, "^"
+                        "tf:o:iw:+H:S:a:*:v"
+                        "\0"
+                        // -v is a counter, -H and -S are mutually exclusive, -a is a list
+                        "vv:H--S:S--H",
+                        &opt_from, NULL,
+                        &timeout, &opt_connect, &opt_connect, &list, &verbose
+        );
         //argc -= optind;
         argv += optind;
 
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 04ba5636f..c1718e909 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * adjtimex.c - read, and possibly modify, the Linux kernel `timex' variables.
+ * adjtimex.c - read, and possibly modify, the Linux kernel 'timex' variables.
  *
  * Originally written: October 1997
  * Last hack: March 2001
@@ -18,7 +18,7 @@
 //config:       Adjtimex reads and optionally sets adjustment parameters for
 //config:       the Linux clock adjustment algorithm.
 
-//applet:IF_ADJTIMEX(APPLET(adjtimex, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_ADJTIMEX(APPLET_NOFORK(adjtimex, adjtimex, BB_DIR_SBIN, BB_SUID_DROP, adjtimex))
 
 //kbuild:lib-$(CONFIG_ADJTIMEX) += adjtimex.o
 
@@ -90,13 +90,15 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         char *opt_o, *opt_f, *opt_p, *opt_t;
         struct timex txc;
-        int i, ret;
+        int ret;
         const char *descript;
 
-        opt_complementary = "=0"; /* no valid non-option parameters */
-        opt = getopt32(argv, "qo:f:p:t:",
-                        &opt_o, &opt_f, &opt_p, &opt_t);
-        txc.modes = 0;
+        memset(&txc, 0, sizeof(txc));
+
+        opt = getopt32(argv, "^" "qo:f:p:t:"
+                        "\0" "=0"/*no valid non-option args*/,
+                        &opt_o, &opt_f, &opt_p, &opt_t
+        );
         //if (opt & 0x1) // -q
         if (opt & 0x2) { // -o
                 txc.offset = xatol(opt_o);
@@ -115,15 +117,19 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
                 txc.modes |= ADJ_TICK;
         }
 
-        ret = adjtimex(&txc);
+        /* It's NOFORK applet because the code is very simple:
+         * just some printf. No opens, no allocs.
+         * If you need to make it more complex, feel free to downgrade to NOEXEC
+         */
 
-        if (ret < 0) {
+        ret = adjtimex(&txc);
+        if (ret < 0)
                 bb_perror_nomsg_and_die();
-        }
 
         if (!(opt & OPT_quiet)) {
                 const char *sep;
                 const char *name;
+                int i;
 
                 printf(
                         "    mode:         %d\n"
@@ -132,8 +138,9 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
                         "    maxerror:     %ld\n"
                         "    esterror:     %ld\n"
                         "    status:       %d (",
-                txc.modes, txc.offset, txc.freq, txc.maxerror,
-                txc.esterror, txc.status);
+                        txc.modes, txc.offset, txc.freq, txc.maxerror,
+                        txc.esterror, txc.status
+                );
 
                 /* representative output of next code fragment:
                  * "PLL | PPSTIME"
@@ -159,9 +166,11 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
                         "    time.tv_sec:  %ld\n"
                         "    time.tv_usec: %ld\n"
                         "    return value: %d (%s)\n",
-                txc.constant,
-                txc.precision, txc.tolerance, txc.tick,
-                (long)txc.time.tv_sec, (long)txc.time.tv_usec, ret, descript);
+                        txc.constant,
+                        txc.precision, txc.tolerance, txc.tick,
+                        (long)txc.time.tv_sec, (long)txc.time.tv_usec,
+                        ret, descript
+                );
         }
 
         return 0;
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 216a899a0..1446a040c 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -82,8 +82,8 @@
 //usage:       "EXPECT [SEND [EXPECT [SEND...]]]"
 //usage:#define chat_full_usage "\n\n"
 //usage:       "Useful for interacting with a modem connected to stdin/stdout.\n"
-//usage:       "A script consists of one or more \"expect-send\" pairs of strings,\n"
-//usage:       "each pair is a pair of arguments. Example:\n"
+//usage:       "A script consists of \"expect-send\" argument pairs.\n"
+//usage:       "Example:\n"
 //usage:       "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'"
 
 #include "libbb.h"
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 47b9e7207..a0e0d4e4b 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -367,7 +367,7 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
         unsigned ttynum;
         int poll_timeout_ms;
 #if ENABLE_LONG_OPTS
-        static const char getopt_longopts[] ALIGN1 =
+        static const char conspy_longopts[] ALIGN1 =
                 "viewonly\0"     No_argument "v"
                 "createdevice\0" No_argument "c"
                 "neverquit\0"    No_argument "Q"
@@ -377,8 +377,6 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
                 "follow\0"       No_argument "f"
                 "framebuffer\0"  No_argument "F"
                 ;
-
-        applet_long_options = getopt_longopts;
 #endif
 #define keybuf bb_common_bufsiz1
         setup_common_bufsiz();
@@ -387,7 +385,7 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
         strcpy(G.vcsa_name, DEV_VCSA);
 
         // numeric params
-        opts = getopt32(argv, "vcQsndfFx:+y:+", &G.x, &G.y);
+        opts = getopt32long(argv, "vcQsndfFx:+y:+", conspy_longopts, &G.x, &G.y);
         argv += optind;
         ttynum = 0;
         if (argv[0]) {
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 48e429976..f6580a9d4 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -1021,13 +1021,17 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        /* "-b after -f is ignored", and so on for every pair a-b */
-        opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
+        opts = getopt32(argv, "^"
+                        "l:L:fbSc:" IF_FEATURE_CROND_D("d:")
+                        "\0"
+                        /* "-b after -f is ignored", and so on for every pair a-b */
+                        "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
                         /* -l and -d have numeric param */
-                        ":l+" IF_FEATURE_CROND_D(":d+");
-        opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
+                        ":l+" IF_FEATURE_CROND_D(":d+")
+                        ,
                         &G.log_level, &G.log_filename, &G.crontab_dir_name
-                        IF_FEATURE_CROND_D(,&G.log_level));
+                        IF_FEATURE_CROND_D(,&G.log_level)
+        );
         /* both -d N and -l N set the same variable: G.log_level */
 
         if (!(opts & OPT_f)) {
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index 804cb57f2..4787fa08f 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -99,8 +99,9 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
                 OPT_ler = OPT_l + OPT_e + OPT_r,
         };
 
-        opt_complementary = "?1:dr"; /* max one argument; -d implies -r */
-        opt_ler = getopt32(argv, "u:c:lerd", &user_name, &crontab_dir);
+        opt_ler = getopt32(argv, "^" "u:c:lerd" "\0" "?1:dr"/*max one arg; -d implies -r*/,
+                                &user_name, &crontab_dir
+        );
         argv += optind;
 
         if (sanitize_env_if_suid()) { /* Clears dangerous stuff, sets PATH */
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index af9ebea24..a6ce41f27 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -17,6 +17,7 @@
 //config:       This utility is used to erase the whole MTD device.
 
 //applet:IF_FLASH_ERASEALL(APPLET(flash_eraseall, BB_DIR_USR_SBIN, BB_SUID_DROP))
+/* not NOEXEC: if flash operation stalls, use less memory in "hung" process */
 
 //kbuild:lib-$(CONFIG_FLASH_ERASEALL) += flash_eraseall.o
 
@@ -81,8 +82,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
         unsigned int flags;
         char *mtd_name;
 
-        opt_complementary = "=1";
-        flags = getopt32(argv, "jNq");
+        flags = getopt32(argv, "^" "jNq" "\0" "=1");
 
         mtd_name = argv[optind];
         fd = xopen(mtd_name, O_RDWR);
diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c
index 374eed5f6..6f2c049f4 100644
--- a/miscutils/flash_lock_unlock.c
+++ b/miscutils/flash_lock_unlock.c
@@ -20,6 +20,7 @@
 //                       APPLET_ODDNAME:name          main               location         suid_type     help
 //applet:IF_FLASH_LOCK(  APPLET_ODDNAME(flash_lock,   flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock))
 //applet:IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock))
+/* not NOEXEC: if flash operation stalls, use less memory in "hung" process */
 
 //kbuild:lib-$(CONFIG_FLASH_LOCK) += flash_lock_unlock.o
 //kbuild:lib-$(CONFIG_FLASH_UNLOCK) += flash_lock_unlock.o
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index d4ac62df4..858cee194 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -14,6 +14,7 @@
 //config:       This utility is used to copy images into a MTD device.
 
 //applet:IF_FLASHCP(APPLET(flashcp, BB_DIR_USR_SBIN, BB_SUID_DROP))
+/* not NOEXEC: if flash operation stalls, use less memory in "hung" process */
 
 //kbuild:lib-$(CONFIG_FLASHCP) += flashcp.o
 
@@ -68,8 +69,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
         RESERVE_CONFIG_UBUFFER(buf, BUFSIZE);
         RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE);
 
-        opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */
-        /*opts =*/ getopt32(argv, "v");
+        /*opts =*/ getopt32(argv, "^" "v" "\0" "=2"/*exactly 2 non-option args: file,dev*/);
         argv += optind;
 //      filename = *argv++;
 //      devicename = *argv;
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index ca2580e92..30f606e8e 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -42,6 +42,7 @@
 //applet:IF_I2CSET(APPLET(i2cset, BB_DIR_USR_SBIN, BB_SUID_DROP))
 //applet:IF_I2CDUMP(APPLET(i2cdump, BB_DIR_USR_SBIN, BB_SUID_DROP))
 //applet:IF_I2CDETECT(APPLET(i2cdetect, BB_DIR_USR_SBIN, BB_SUID_DROP))
+/* not NOEXEC: if hw operation stalls, use less memory in "hung" process */
 
 //kbuild:lib-$(CONFIG_I2CGET) += i2c_tools.o
 //kbuild:lib-$(CONFIG_I2CSET) += i2c_tools.o
@@ -454,14 +455,12 @@ int i2cget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int i2cget_main(int argc UNUSED_PARAM, char **argv)
 {
         const unsigned opt_f = (1 << 0), opt_y = (1 << 1);
-        const char *const optstr = "fy";
 
         int bus_num, bus_addr, data_addr = -1, status;
         int mode = I2C_SMBUS_BYTE, pec = 0, fd;
         unsigned opts;
 
-        opt_complementary = "-2:?4"; /* from 2 to 4 args */
-        opts = getopt32(argv, optstr);
+        opts = getopt32(argv, "^" "fy" "\0" "-2:?4"/*from 2 to 4 args*/);
         argv += optind;
 
         bus_num = i2c_bus_lookup(argv[0]);
@@ -543,7 +542,6 @@ int i2cset_main(int argc, char **argv)
 {
         const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
                               opt_m = (1 << 2), opt_r = (1 << 3);
-        const char *const optstr = "fym:r";
 
         int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0;
         int val, blen = 0, mask = 0, fd, status;
@@ -551,8 +549,7 @@ int i2cset_main(int argc, char **argv)
         char *opt_m_arg = NULL;
         unsigned opts;
 
-        opt_complementary = "-3"; /* from 3 to ? args */
-        opts = getopt32(argv, optstr, &opt_m_arg);
+        opts = getopt32(argv, "^" "fym:r" "\0" "-3"/*from 3 to ? args*/, &opt_m_arg);
         argv += optind;
         argc -= optind;
 
@@ -904,7 +901,6 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
 {
         const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
                               opt_r = (1 << 2);
-        const char *const optstr = "fyr:";
 
         int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0;
         unsigned first = 0x00, last = 0xff, opts;
@@ -912,8 +908,11 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
         char *opt_r_str, *dash;
         int fd, res;
 
-        opt_complementary = "-2:?3"; /* from 2 to 3 args */
-        opts = getopt32(argv, optstr, &opt_r_str);
+        opts = getopt32(argv, "^"
+                "fyr:"
+                "\0" "-2:?3" /* from 2 to 3 args */,
+                &opt_r_str
+        );
         argv += optind;
 
         bus_num = i2c_bus_lookup(argv[0]);
@@ -1207,15 +1206,16 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
         const unsigned opt_y = (1 << 0), opt_a = (1 << 1),
                               opt_q = (1 << 2), opt_r = (1 << 3),
                               opt_F = (1 << 4), opt_l = (1 << 5);
-        const char *const optstr = "yaqrFl";
 
         int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd;
         unsigned first = 0x03, last = 0x77, opts;
         unsigned long funcs;
 
-        opt_complementary = "q--r:r--q:" /* mutually exclusive */
-                        "?3"; /* up to 3 args */
-        opts = getopt32(argv, optstr);
+        opts = getopt32(argv, "^"
+                        "yaqrFl"
+                        "\0"
+                        "q--r:r--q:"/*mutually exclusive*/ "?3"/*up to 3 args*/
+        );
         argv += optind;
 
         if (opts & opt_l)
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
index b69ff1eef..d7cd51056 100644
--- a/miscutils/lsscsi.c
+++ b/miscutils/lsscsi.c
@@ -16,7 +16,7 @@
 //config:
 //config:       This version uses sysfs (/sys/bus/scsi/devices) only.
 
-//applet:IF_LSSCSI(APPLET(lsscsi, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_LSSCSI(APPLET_NOEXEC(lsscsi, lsscsi, BB_DIR_USR_BIN, BB_SUID_DROP, lsscsi))
 
 //kbuild:lib-$(CONFIG_LSSCSI) += lsscsi.o
 
@@ -37,9 +37,8 @@ static char *get_line(const char *filename, char *buf, unsigned *bufsize_p)
         if (sz < 0)
                 sz = 0;
         buf[sz] = '\0';
-        trim(buf);
 
-        sz = strlen(buf) + 1;
+        sz = (trim(buf) - buf) + 1;
         bufsize -= sz;
         buf += sz;
         buf[0] = '\0';
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index c2f86df01..80975c652 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -38,7 +38,7 @@
 //config:
 //config:endchoice
 
-//applet:IF_MAKEDEVS(APPLET(makedevs, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_MAKEDEVS(APPLET_NOEXEC(makedevs, makedevs, BB_DIR_SBIN, BB_SUID_DROP, makedevs))
 
 //kbuild:lib-$(CONFIG_MAKEDEVS) += makedevs.o
 
@@ -183,8 +183,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv)
         char *line = (char *)"-";
         int ret = EXIT_SUCCESS;
 
-        opt_complementary = "=1"; /* exactly one param */
-        getopt32(argv, "d:", &line);
+        getopt32(argv, "^" "d:" "\0" "=1", &line);
         argv += optind;
 
         xchdir(*argv); /* ensure root dir exists */
diff --git a/miscutils/man.c b/miscutils/man.c
index f68784767..68a75c6d7 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -257,8 +257,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "-1"; /* at least one argument */
-        opt = getopt32(argv, "+aw");
+        opt = getopt32(argv, "^+" "aw" "\0" "-1"/*at least one arg*/);
         argv += optind;
 
         sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 14b9f3baf..b87f3273f 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -74,7 +74,9 @@ int microcom_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
 
         // fetch options
-        opts = getopt32(argv, "Xs:+d:+t:+", &speed, &delay, &timeout);
+        opts = getopt32(argv, "^" "Xs:+d:+t:+" "\0" "=1",
+                                &speed, &delay, &timeout
+        );
 //      argc -= optind;
         argv += optind;
 
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 14b1ed056..80a005821 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -123,15 +123,12 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
         const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
 
         if (IS_NANDDUMP) {
-                opt_complementary = "=1";
-#if ENABLE_LONG_OPTS
-                applet_long_options =
-                        "bb\0" Required_argument "\xff"; /* no short equivalent */
-#endif
-                opts = getopt32(argv, "ons:f:l:", &opt_s, &opt_f, &opt_l, &opt_bb);
+                opts = getopt32long(argv, "^" "ons:f:l:" "\0" "=1",
+                                "bb\0" Required_argument "\xff", /* no short equivalent */
+                                &opt_s, &opt_f, &opt_l, &opt_bb
+                );
         } else { /* nandwrite */
-                opt_complementary = "-1:?2";
-                opts = getopt32(argv, "pns:", &opt_s);
+                opts = getopt32(argv, "^" "pns:" "\0" "-1:?2", &opt_s);
         }
         argv += optind;
 
diff --git a/miscutils/partprobe.c b/miscutils/partprobe.c
index 2c12a7d20..d1ae27348 100644
--- a/miscutils/partprobe.c
+++ b/miscutils/partprobe.c
@@ -11,7 +11,7 @@
 //config:       help
 //config:       Ask kernel to rescan partition table.
 
-//applet:IF_PARTPROBE(APPLET(partprobe, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_PARTPROBE(APPLET_NOEXEC(partprobe, partprobe, BB_DIR_USR_SBIN, BB_SUID_DROP, partprobe))
 
 //kbuild:lib-$(CONFIG_PARTPROBE) += partprobe.o
 
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index ecedf9ce2..caf6e0821 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -15,7 +15,7 @@
 //config:       raidautorun tells the kernel md driver to
 //config:       search and start RAID arrays.
 
-//applet:IF_RAIDAUTORUN(APPLET(raidautorun, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_RAIDAUTORUN(APPLET_NOEXEC(raidautorun, raidautorun, BB_DIR_SBIN, BB_SUID_DROP, raidautorun))
 
 //kbuild:lib-$(CONFIG_RAIDAUTORUN) += raidautorun.o
 
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c
index 6b4742255..0b2098564 100644
--- a/miscutils/runlevel.c
+++ b/miscutils/runlevel.c
@@ -21,7 +21,7 @@
 //config:       This applet uses utmp but does not rely on busybox supporing
 //config:       utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
 
-//applet:IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_RUNLEVEL(APPLET_NOEXEC(runlevel, runlevel, BB_DIR_SBIN, BB_SUID_DROP, runlevel))
 
 //kbuild:lib-$(CONFIG_RUNLEVEL) += runlevel.o
 
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 28a1bef18..f217c3beb 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -15,7 +15,7 @@
 //config:       help
 //config:       Retrieve or set Linux serial port.
 
-//applet:IF_SETSERIAL(APPLET(setserial, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_SETSERIAL(APPLET_NOEXEC(setserial, setserial, BB_DIR_BIN, BB_SUID_DROP, setserial))
 
 //kbuild:lib-$(CONFIG_SETSERIAL) += setserial.o
 
@@ -210,35 +210,35 @@ struct serial_struct {
 #endif
 
 //usage:#define setserial_trivial_usage
-//usage:        "[-gabGvzV] DEVICE [PARAMETER [ARG]]..."
+//usage:        "[-abGvz] { DEVICE [PARAMETER [ARG]]... | -g DEVICE... }"
 //usage:#define setserial_full_usage "\n\n"
-//usage:        "Request or set Linux serial port information\n"
-//usage:        "\n"
-//usage:        "       -g      Interpret parameters as list of devices for reporting\n"
-//usage:        "       -a      Print all available information\n"
-//usage:        "       -b      Print summary information\n"
-//usage:        "       -G      Print in form which can be fed back\n"
-//usage:        "               to setserial as command line parameters\n"
-//usage:        "       -z      Zero out serial flags before setting\n"
-//usage:        "       -v      Verbose\n"
-//usage:        "\n"
-//usage:        "Parameters: (* = takes an argument, ^ = can be turned off by preceding ^)\n"
-//usage:        "       *port, *irq, *divisor, *uart, *baud_base, *close_delay, *closing_wait,\n"
-//usage:        "       ^fourport, ^auto_irq, ^skip_test, ^sak, ^session_lockout, ^pgrp_lockout,\n"
-//usage:        "       ^callout_nohup, ^split_termios, ^hup_notify, ^low_latency, autoconfig,\n"
-//usage:        "       spd_normal, spd_hi, spd_vhi, spd_shi, spd_warp, spd_cust\n"
-//usage:        "\n"
-//usage:        "UART types:\n"
-//usage:        "       unknown, 8250, 16450, 16550, 16550A, Cirrus, 16650, 16650V2, 16750,\n"
-//usage:        "       16950, 16954, 16654, 16850, RSA, NS16550A, XSCALE, RM9000, OCTEON, AR7,\n"
-//usage:        "       U6_16550A"
-
+//usage:        "Print or set serial port parameters"
+//usage:   "\n"
+//usage:   "\n""        -a      Print all"
+//usage:   "\n""        -b      Print summary"
+//usage:   "\n""        -G      Print as setserial PARAMETERs"
+//usage:   "\n""        -v      Verbose"
+//usage:   "\n""        -z      Zero out serial flags before setting"
+//usage:   "\n""        -g      All args are device names"
+//usage:   "\n"
+//usage:   "\n""PARAMETERs: (* = takes ARG, ^ = can be turned off by preceding ^)"
+//usage:   "\n""        *port, *irq, *divisor, *uart, *baud_base, *close_delay, *closing_wait,"
+//usage:   "\n""        ^fourport, ^auto_irq, ^skip_test, ^sak, ^session_lockout, ^pgrp_lockout,"
+//usage:   "\n""        ^callout_nohup, ^split_termios, ^hup_notify, ^low_latency, autoconfig,"
+//usage:   "\n""        spd_normal, spd_hi, spd_vhi, spd_shi, spd_warp, spd_cust"
+//usage:   "\n""ARG for uart:"
+//usage:   "\n""        unknown, 8250, 16450, 16550, 16550A, Cirrus, 16650, 16650V2, 16750,"
+//usage:   "\n""        16950, 16954, 16654, 16850, RSA, NS16550A, XSCALE, RM9000, OCTEON, AR7,"
+//usage:   "\n""        U6_16550A"
+
+// option string is "bGavzgq". "q" is accepted but ignored.
 #define OPT_PRINT_SUMMARY       (1 << 0)
 #define OPT_PRINT_FEDBACK       (1 << 1)
 #define OPT_PRINT_ALL           (1 << 2)
 #define OPT_VERBOSE             (1 << 3)
 #define OPT_ZERO                (1 << 4)
-#define OPT_GET                 (1 << 5)
+#define OPT_LIST_OF_DEVS        (1 << 5)
+/*#define OPT_QUIET             (1 << 6)*/
 
 #define OPT_MODE_MASK \
         (OPT_PRINT_ALL | OPT_PRINT_SUMMARY | OPT_PRINT_FEDBACK)
@@ -362,7 +362,7 @@ static bool cmd_is_flag(int cmd)
         return (cmd >= CMD_FLAG_FIRST && cmd <= CMD_FLAG_LAST);
 }
 
-static bool cmd_need_arg(int cmd)
+static bool cmd_needs_arg(int cmd)
 {
         return (cmd >= CMD_PORT && cmd <= CMD_WAIT);
 }
@@ -652,11 +652,9 @@ static int find_cmd(const char *cmd)
 static void serial_set(char **arg, int opts)
 {
         struct serial_struct serinfo;
-        int cmd;
-        const char *word;
         int fd;
 
-        fd = serial_open(*arg++, /*quiet:*/ false);
+        fd = serial_open(*arg, /*quiet:*/ false);
         if (fd < 0)
                 exit(201);
 
@@ -665,17 +663,20 @@ static void serial_set(char **arg, int opts)
         if (opts & OPT_ZERO)
                 serinfo.flags = 0;
 
-        while (*arg) {
+        while (*++arg) {
+                const char *word;
                 int invert;
+                int cmd;
 
-                word = *arg++;
-                invert = (*word == '^');
+                word = *arg;
+                invert = (word[0] == '^');
                 word += invert;
 
                 cmd = find_cmd(word);
 
-                if (*arg == NULL && cmd_need_arg(cmd))
-                        bb_error_msg_and_die(bb_msg_requires_arg, word);
+                if (cmd_needs_arg(cmd))
+                        if (*++arg == NULL)
+                                bb_error_msg_and_die(bb_msg_requires_arg, word);
 
                 if (invert && !cmd_is_flag(cmd))
                         bb_error_msg_and_die("can't invert %s", word);
@@ -705,25 +706,25 @@ static void serial_set(char **arg, int opts)
                                 serinfo.flags |= setbits[cmd];
                         break;
                 case CMD_PORT:
-                        serinfo.port = get_numeric(*arg++);
+                        serinfo.port = get_numeric(*arg);
                         break;
                 case CMD_IRQ:
-                        serinfo.irq = get_numeric(*arg++);
+                        serinfo.irq = get_numeric(*arg);
                         break;
                 case CMD_DIVISOR:
-                        serinfo.custom_divisor = get_numeric(*arg++);
+                        serinfo.custom_divisor = get_numeric(*arg);
                         break;
                 case CMD_UART:
-                        serinfo.type = get_uart(*arg++);
+                        serinfo.type = get_uart(*arg);
                         break;
                 case CMD_BASE:
-                        serinfo.baud_base = get_numeric(*arg++);
+                        serinfo.baud_base = get_numeric(*arg);
                         break;
                 case CMD_DELAY:
-                        serinfo.close_delay = get_numeric(*arg++);
+                        serinfo.close_delay = get_numeric(*arg);
                         break;
                 case CMD_WAIT:
-                        serinfo.closing_wait = get_wait(*arg++);
+                        serinfo.closing_wait = get_wait(*arg);
                         break;
                 case CMD_AUTOCONFIG:
                         serial_ctl(fd, CTL_SET | CTL_CONFIG | CTL_GET, &serinfo);
@@ -741,22 +742,22 @@ int setserial_main(int argc UNUSED_PARAM, char **argv)
 {
         int opts;
 
-        opt_complementary = "-1:b-aG:G-ab:a-bG";
-        opts = getopt32(argv, "bGavzg");
+        opts = getopt32(argv, "^" "bGavzgq" "\0" "-1:b-aG:G-ab:a-bG");
         argv += optind;
 
-        if (!argv[1]) /* one arg only? */
-                opts |= OPT_GET;
+        if (!argv[1]) /* one arg only? (nothing to change?) */
+                opts |= OPT_LIST_OF_DEVS; /* force display */
 
-        if (!(opts & OPT_GET)) {
+        if (!(opts & OPT_LIST_OF_DEVS)) {
                 serial_set(argv, opts);
                 argv[1] = NULL;
         }
 
-        if (opts & (OPT_VERBOSE | OPT_GET)) {
+        /* -v effect: "after setting params, do not be silent, show them" */
+        if (opts & (OPT_VERBOSE | OPT_LIST_OF_DEVS)) {
                 do {
-                        serial_get(*argv++, opts & OPT_MODE_MASK);
-                } while (*argv);
+                        serial_get(*argv, opts & OPT_MODE_MASK);
+                } while (*++argv);
         }
 
         return EXIT_SUCCESS;
diff --git a/miscutils/time.c b/miscutils/time.c
index 60fc11f6e..65dbcdcf3 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -127,13 +127,13 @@ static unsigned long ptok(const unsigned pagesize, const unsigned long pages)
 
 /* summarize: Report on the system use of a command.
 
-   Print the FMT argument except that `%' sequences
-   have special meaning, and `\n' and `\t' are translated into
-   newline and tab, respectively, and `\\' is translated into `\'.
+   Print the FMT argument except that '%' sequences
+   have special meaning, and '\n' and '\t' are translated into
+   newline and tab, respectively, and '\\' is translated into '\'.
 
-   The character following a `%' can be:
+   The character following a '%' can be:
    (* means the tcsh time builtin also recognizes it)
-   % == a literal `%'
+   % == a literal '%'
    C == command name and arguments
 *  D == average unshared data size in K (ru_idrss+ru_isrss)
 *  E == elapsed real (wall clock) time in [hour:]min:sec
@@ -430,9 +430,10 @@ int time_main(int argc UNUSED_PARAM, char **argv)
                 OPT_f = (1 << 4),
         };
 
-        opt_complementary = "-1"; /* at least one arg */
         /* "+": stop on first non-option */
-        opt = getopt32(argv, "+vpao:f:", &output_filename, &output_format);
+        opt = getopt32(argv, "^+" "vpao:f:" "\0" "-1"/*at least one arg*/,
+                                &output_filename, &output_format
+        );
         argv += optind;
         if (opt & OPT_v)
                 output_format = long_format;
diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index 7f6a84308..2c2d4ec33 100644
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -18,7 +18,7 @@
 //config:       error, but returns default 80x24.
 //config:       Usage in shell scripts: width=`ttysize w`.
 
-//applet:IF_TTYSIZE(APPLET(ttysize, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_TTYSIZE(APPLET_NOFORK(ttysize, ttysize, BB_DIR_USR_BIN, BB_SUID_DROP, ttysize))
 
 //kbuild:lib-$(CONFIG_TTYSIZE) += ttysize.o
 
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index c6ba22adf..d142d1144 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -52,6 +52,7 @@
 //applet:IF_UBIRMVOL(    APPLET_ODDNAME(ubirmvol,  ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirmvol))
 //applet:IF_UBIRSVOL(    APPLET_ODDNAME(ubirsvol,  ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirsvol))
 //applet:IF_UBIUPDATEVOL(APPLET_ODDNAME(ubiupdatevol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiupdatevol))
+/* not NOEXEC: if flash operation stalls, use less memory in "hung" process */
 
 //kbuild:lib-$(CONFIG_UBIATTACH) += ubi_tools.o
 //kbuild:lib-$(CONFIG_UBIDETACH) += ubi_tools.o
@@ -67,23 +68,32 @@
 #endif
 #include <mtd/ubi-user.h>
 
-#define do_attach (ENABLE_UBIATTACH && applet_name[3] == 'a')
-#define do_detach (ENABLE_UBIDETACH && applet_name[3] == 'd')
-#define do_mkvol  (ENABLE_UBIMKVOL  && applet_name[3] == 'm')
-#define do_rmvol  (ENABLE_UBIRMVOL  && applet_name[4] == 'm')
-#define do_rsvol  (ENABLE_UBIRSVOL  && applet_name[4] == 's')
-#define do_update (ENABLE_UBIUPDATEVOL && applet_name[3] == 'u')
-
-static unsigned get_num_from_file(const char *path, unsigned max, const char *errmsg)
+#define UBI_APPLET_CNT (0 \
+        + ENABLE_UBIATTACH \
+        + ENABLE_UBIDETACH \
+        + ENABLE_UBIMKVOL \
+        + ENABLE_UBIRMVOL \
+        + ENABLE_UBIRSVOL \
+        + ENABLE_UBIUPDATEVOL \
+        )
+
+#define do_attach (ENABLE_UBIATTACH    && (UBI_APPLET_CNT == 1 || applet_name[4] == 't'))
+#define do_detach (ENABLE_UBIDETACH    && (UBI_APPLET_CNT == 1 || applet_name[4] == 'e'))
+#define do_mkvol  (ENABLE_UBIMKVOL     && (UBI_APPLET_CNT == 1 || applet_name[4] == 'k'))
+#define do_rmvol  (ENABLE_UBIRMVOL     && (UBI_APPLET_CNT == 1 || applet_name[4] == 'm'))
+#define do_rsvol  (ENABLE_UBIRSVOL     && (UBI_APPLET_CNT == 1 || applet_name[4] == 's'))
+#define do_update (ENABLE_UBIUPDATEVOL && (UBI_APPLET_CNT == 1 || applet_name[4] == 'p'))
+
+static unsigned get_num_from_file(const char *path, unsigned max)
 {
         char buf[sizeof(long long)*3];
         unsigned long long num;
 
         if (open_read_close(path, buf, sizeof(buf)) < 0)
-                bb_perror_msg_and_die(errmsg, path);
+                bb_perror_msg_and_die("can't open '%s'", path);
         /* It can be \n terminated, xatoull won't work well */
         if (sscanf(buf, "%llu", &num) != 1 || num > max)
-                bb_error_msg_and_die(errmsg, path);
+                bb_error_msg_and_die("number in '%s' is malformed or too large", path);
         return num;
 }
 
@@ -135,20 +145,17 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
 #define OPTION_a  (1 << 5)
 #define OPTION_t  (1 << 6)
         if (do_mkvol) {
-                opt_complementary = "-1";
-                opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+",
+                opts = getopt32(argv, "^" "md:+n:+N:s:a:+t:O:+" "\0" "-1",
                                 &dev_num, &vol_id,
                                 &vol_name, &size_bytes_str, &alignment, &type,
                                 &vid_hdr_offset
                         );
         } else
         if (do_update) {
-                opt_complementary = "-1";
-                opts = getopt32(argv, "s:at", &size_bytes_str);
+                opts = getopt32(argv, "^" "s:at" "\0" "-1", &size_bytes_str);
                 opts *= OPTION_s;
         } else {
-                opt_complementary = "-1";
-                opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:",
+                opts = getopt32(argv, "^" "m:+d:+n:+N:s:a:+t:" "\0" "-1",
                                 &mtd_num, &dev_num, &vol_id,
                                 &vol_name, &size_bytes_str, &alignment, &type
                 );
@@ -217,10 +224,10 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
                         p = path_sys_class_ubi_ubi + sprintf(path_sys_class_ubi_ubi, "%u/", num);
 
                         strcpy(p, "avail_eraseblocks");
-                        leb_avail = get_num_from_file(path, UINT_MAX, "Can't get available eraseblocks from '%s'");
+                        leb_avail = get_num_from_file(path, UINT_MAX);
 
                         strcpy(p, "eraseblock_size");
-                        leb_size = get_num_from_file(path, MAX_SANE_ERASEBLOCK, "Can't get eraseblock size from '%s'");
+                        leb_size = get_num_from_file(path, MAX_SANE_ERASEBLOCK);
 
                         size_bytes = leb_avail * (unsigned long long)leb_size;
                         //if (size_bytes <= 0)
@@ -232,16 +239,19 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
                 if (!(opts & OPTION_N))
                         bb_error_msg_and_die("name not specified");
 
+                /* the structure is memset(0) above */
                 mkvol_req.vol_id = vol_id;
                 mkvol_req.vol_type = UBI_DYNAMIC_VOLUME;
                 if ((opts & OPTION_t) && type[0] == 's')
                         mkvol_req.vol_type = UBI_STATIC_VOLUME;
                 mkvol_req.alignment = alignment;
                 mkvol_req.bytes = size_bytes; /* signed int64_t */
-                strncpy(mkvol_req.name, vol_name, UBI_MAX_VOLUME_NAME);
-                mkvol_req.name_len = strlen(vol_name);
+                /* strnlen avoids overflow of 16-bit field (paranoia) */
+                mkvol_req.name_len = strnlen(vol_name, UBI_MAX_VOLUME_NAME+1);
                 if (mkvol_req.name_len > UBI_MAX_VOLUME_NAME)
                         bb_error_msg_and_die("volume name too long: '%s'", vol_name);
+                /* this is safe: .name[] is UBI_MAX_VOLUME_NAME+1 bytes */
+                strcpy(mkvol_req.name, vol_name);
 
                 xioctl(fd, UBI_IOCMKVOL, &mkvol_req);
         } else
@@ -289,7 +299,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
         } else
 
 //usage:#define ubiupdatevol_trivial_usage
-//usage:       "[-t | [-s SIZE] IMG_FILE] UBI_DEVICE"
+//usage:       "-t UBI_DEVICE | [-s SIZE] UBI_DEVICE IMG_FILE"
 //usage:#define ubiupdatevol_full_usage "\n\n"
 //usage:       "Update UBI volume\n"
 //usage:     "\n        -t      Truncate to zero size"
@@ -304,24 +314,25 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
                         xioctl(fd, UBI_IOCVOLUP, &bytes64);
                 }
                 else {
-                        struct stat st;
                         unsigned ubinum, volnum;
                         unsigned leb_size;
-                        ssize_t len;
-                        char *input_data;
+                        char *buf;
 
                         /* Assume that device is in normal format. */
                         /* Removes need for scanning sysfs tree as full libubi does. */
                         if (sscanf(ubi_ctrl, "/dev/ubi%u_%u", &ubinum, &volnum) != 2)
-                                bb_error_msg_and_die("wrong format of UBI device name");
+                                bb_error_msg_and_die("UBI device name '%s' is not /dev/ubiN_M", ubi_ctrl);
 
                         sprintf(path_sys_class_ubi_ubi, "%u_%u/usable_eb_size", ubinum, volnum);
-                        leb_size = get_num_from_file(path, MAX_SANE_ERASEBLOCK, "Can't get usable eraseblock size from '%s'");
+                        leb_size = get_num_from_file(path, MAX_SANE_ERASEBLOCK);
 
-                        if (!(opts & OPTION_s)) {
-                                if (!*argv)
-                                        bb_show_usage();
+                        if (!*argv)
+                                bb_show_usage();
+                        if (NOT_LONE_DASH(*argv)) /* mtd-utils supports "-" as stdin */
                                 xmove_fd(xopen(*argv, O_RDONLY), STDIN_FILENO);
+
+                        if (!(opts & OPTION_s)) {
+                                struct stat st;
                                 xfstat(STDIN_FILENO, &st, *argv);
                                 size_bytes = st.st_size;
                         }
@@ -330,12 +341,24 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
                         /* this ioctl expects signed int64_t* parameter */
                         xioctl(fd, UBI_IOCVOLUP, &bytes64);
 
-                        input_data = xmalloc(leb_size);
-                        while ((len = full_read(STDIN_FILENO, input_data, leb_size)) > 0) {
-                                xwrite(fd, input_data, len);
+                        /* can't use bb_copyfd_exact_size(): copy in blocks of exactly leb_size */
+                        buf = xmalloc(leb_size);
+                        while (size_bytes != 0) {
+                                int len = full_read(STDIN_FILENO, buf, leb_size);
+                                if (len <= 0) {
+                                        if (len < 0)
+                                                bb_perror_msg_and_die("read error from '%s'", *argv);
+                                        break;
+                                }
+                                if ((unsigned)len > size_bytes) {
+                                        /* for this case: "ubiupdatevol -s 1024000 $UBIDEV /dev/urandom" */
+                                        len = size_bytes;
+                                }
+                                xwrite(fd, buf, len);
+                                size_bytes -= len;
                         }
-                        if (len < 0)
-                                bb_perror_msg_and_die("UBI volume update failed");
+                        if (ENABLE_FEATURE_CLEAN_UP)
+                                free(buf);
                 }
         }
 
diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c
index 786c4b9fa..ecc8fe137 100644
--- a/miscutils/ubirename.c
+++ b/miscutils/ubirename.c
@@ -14,6 +14,7 @@
 //config:       Utility to rename UBI volumes
 
 //applet:IF_UBIRENAME(APPLET(ubirename, BB_DIR_USR_SBIN, BB_SUID_DROP))
+/* not NOEXEC: if flash operation stalls, use less memory in "hung" process */
 
 //kbuild:lib-$(CONFIG_UBIRENAME) += ubirename.o
 
@@ -80,9 +81,12 @@ int ubirename_main(int argc, char **argv)
         argv += 2;
         while (argv[0]) {
                 rnvol->ents[n].vol_id = ubi_get_volid_by_name(ubi_devnum, argv[0]);
-                rnvol->ents[n].name_len = strlen(argv[1]);
+
+                /* strnlen avoids overflow of 16-bit field (paranoia) */
+                rnvol->ents[n].name_len = strnlen(argv[1], sizeof(rnvol->ents[n].name));
                 if (rnvol->ents[n].name_len >= sizeof(rnvol->ents[n].name))
                         bb_error_msg_and_die("new name '%s' is too long", argv[1]);
+
                 strcpy(rnvol->ents[n].name, argv[1]);
                 n++;
                 argv += 2;
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index ec06bcb51..392d05646 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -101,8 +101,9 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
         char *st_arg;
         char *ht_arg;
 
-        opt_complementary = "=1"; /* must have exactly 1 argument */
-        opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
+        opts = getopt32(argv, "^" "Ft:T:" "\0" "=1"/*must have exactly 1 arg*/,
+                                &st_arg, &ht_arg
+        );
 
         /* We need to daemonize *before* opening the watchdog as many drivers
          * will only allow one process at a time to do so.  Since daemonizing
diff --git a/modutils/insmod.c b/modutils/insmod.c
index b8ede8a81..4dc0b6608 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -13,7 +13,7 @@
 //config:       help
 //config:       insmod is used to load specified modules in the running kernel.
 
-//applet:IF_INSMOD(IF_NOT_MODPROBE_SMALL(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP)))
+//applet:IF_INSMOD(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(insmod, insmod, BB_DIR_SBIN, BB_SUID_DROP, insmod)))
 
 //kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_INSMOD) += insmod.o modutils.o
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 4bf8f8481..84860cd79 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -23,7 +23,7 @@
 //config:       the format of module-init-tools for Linux kernel 2.6.
 //config:       Increases size somewhat.
 
-//applet:IF_LSMOD(IF_NOT_MODPROBE_SMALL(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP)))
+//applet:IF_LSMOD(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(lsmod, lsmod, BB_DIR_SBIN, BB_SUID_DROP, lsmod)))
 
 //kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_LSMOD) += lsmod.o modutils.o
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 371c93991..3f91622a9 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -12,7 +12,7 @@
 //config:       help
 //config:       Show information about a Linux Kernel module
 
-//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_MODINFO(APPLET_NOEXEC(modinfo, modinfo, BB_DIR_SBIN, BB_SUID_DROP, modinfo))
 
 //kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
 
@@ -148,8 +148,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
         unsigned i;
 
         field = NULL;
-        opt_complementary = "-1"; /* minimum one param */
-        opts = getopt32(argv, "0F:nadlp", &field);
+        opts = getopt32(argv, "^" "0F:nadlp" "\0" "-1"/*minimum one arg*/, &field);
         /* If no field selected, show all */
         if (!(opts & (OPT_TAGS|OPT_F)))
                 option_mask32 |= OPT_TAGS;
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 053a7df89..a94b0b9a6 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -11,12 +11,15 @@
 /* modprobe-small configs are defined in Config.src to ensure better
  * "make config" order */
 
-//applet:IF_LSMOD(   IF_MODPROBE_SMALL(APPLET(lsmod,    BB_DIR_SBIN, BB_SUID_DROP)))
-//applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
-//                                   APPLET_ODDNAME:name    main      location     suid_type     help
-//applet:IF_DEPMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod)))
-//applet:IF_INSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod)))
-//applet:IF_RMMOD( IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod,  modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod)))
+//applet:IF_LSMOD(   IF_MODPROBE_SMALL(APPLET_NOEXEC( lsmod,    lsmod,    BB_DIR_SBIN, BB_SUID_DROP, lsmod   )))
+//applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET_NOEXEC( modprobe, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)))
+//                                     APPLET_ODDNAME:name      main      location     suid_type     help
+//applet:IF_DEPMOD(  IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod,   modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod  )))
+//applet:IF_INSMOD(  IF_MODPROBE_SMALL(APPLET_NOEXEC( insmod,   modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod  )))
+//applet:IF_RMMOD(   IF_MODPROBE_SMALL(APPLET_NOEXEC( rmmod,    modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod   )))
+/* noexec speeds up boot with many modules loaded (need SH_STANDALONE=y) */
+/* I measured about ~5 times faster insmod */
+/* depmod is not noexec, it runs longer and benefits from memory trimming via exec */
 
 //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
 
@@ -985,10 +988,9 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_MODPROBE || ENABLE_INSMOD || ENABLE_RMMOD
         /* modprobe, insmod, rmmod require at least one argument */
-        opt_complementary = "-1";
         /* only -q (quiet) and -r (rmmod),
          * the rest are accepted and ignored (compat) */
-        getopt32(argv, "qrfsvwb");
+        getopt32(argv, "^" "qrfsvwb" "\0" "-1");
         argv += optind;
 
         if (is_modprobe) {
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 1a7db09f2..59f6d54f3 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -26,7 +26,7 @@
 //config:       hardware autodetection scripts to load modules like evdev, frame
 //config:       buffer drivers etc.
 
-//applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
+//applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(modprobe, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)))
 
 //kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_MODPROBE) += modprobe.o modutils.o
@@ -133,7 +133,7 @@
  */
 #define MODPROBE_OPTS  "alrDb"
 /* -a and -D _are_ in fact compatible */
-#define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl")
+#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--arD:r--alD:a--lr:D--rl"
 //#define MODPROBE_OPTS  "acd:lnrt:C:b"
 //#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
 enum {
@@ -566,9 +566,10 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        IF_LONG_OPTS(applet_long_options = modprobe_longopts;)
-        opt_complementary = MODPROBE_COMPLEMENTARY;
-        opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS);
+        opt = getopt32long(argv, "^" INSMOD_OPTS MODPROBE_OPTS "\0" MODPROBE_COMPLEMENTARY,
+                        modprobe_longopts
+                        INSMOD_ARGS
+        );
         argv += optind;
 
         /* Goto modules location */
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index 9ce91351d..1a30dd87c 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -2269,8 +2269,8 @@ static int add_symbols_from(struct obj_file *f,
 
 #ifdef SYMBOL_PREFIX
                 /* Prepend SYMBOL_PREFIX to the symbol's name (the
-                   kernel exports `C names', but module object files
-                   reference `linker names').  */
+                   kernel exports 'C names', but module object files
+                   reference 'linker names').  */
                 size_t extra = sizeof SYMBOL_PREFIX;
                 size_t name_size = strlen(name) + extra;
                 if (name_size > name_alloced_size) {
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index d60e49413..df50e58af 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -14,7 +14,7 @@
 //config:       help
 //config:       rmmod is used to unload specified modules from the kernel.
 
-//applet:IF_RMMOD(IF_NOT_MODPROBE_SMALL(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP)))
+//applet:IF_RMMOD(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(rmmod, rmmod, BB_DIR_SBIN, BB_SUID_DROP, rmmod)))
 
 //kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_RMMOD) += rmmod.o modutils.o
diff --git a/networking/arping.c b/networking/arping.c
index 71672957e..f9967d81e 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -295,8 +295,8 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
 
         sock_fd = xsocket(AF_PACKET, SOCK_DGRAM, 0);
 
-        // Drop suid root privileges
-        // Need to remove SUID_NEVER from applets.h for this to work
+        // If you ever change BB_SUID_DROP to BB_SUID_REQUIRE,
+        // drop suid root privileges here:
         //xsetuid(getuid());
 
         {
@@ -306,9 +306,9 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                 /* Dad also sets quit_on_reply.
                  * Advert also sets unsolicited.
                  */
-                opt_complementary = "=1:Df:AU";
-                opt = getopt32(argv, "DUAqfbc:+w:I:s:",
-                                &count, &str_timeout, &device, &source);
+                opt = getopt32(argv, "^" "DUAqfbc:+w:I:s:" "\0" "=1:Df:AU",
+                                &count, &str_timeout, &device, &source
+                );
                 if (opt & 0x80) /* -w: timeout */
                         timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000;
                 //if (opt & 0x200) /* -s: source */
diff --git a/networking/brctl.c b/networking/brctl.c
index 690791e4c..5d5f0af30 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -39,7 +39,7 @@
 //config:       Add support for option which prints the current config:
 //config:               show
 
-//applet:IF_BRCTL(APPLET(brctl, BB_DIR_USR_SBIN, BB_SUID_DROP))
+//applet:IF_BRCTL(APPLET_NOEXEC(brctl, brctl, BB_DIR_USR_SBIN, BB_SUID_DROP, brctl))
 
 //kbuild:lib-$(CONFIG_BRCTL) += brctl.o
 
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 52522e76d..6677f07d5 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -212,8 +212,7 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv)
         struct whereto_t whereto;  /* who to wake up */
 
         /* handle misc user options */
-        opt_complementary = "=1";
-        flags = getopt32(argv, "bi:p:", &ifname, &pass);
+        flags = getopt32(argv, "^" "bi:p:" "\0" "=1", &ifname, &pass);
         if (flags & 4) /* -p */
                 wol_passwd_sz = get_wol_pw(pass, wol_passwd);
         flags &= 1; /* we further interested only in -b [bcast] flag */
diff --git a/networking/ftpd.c b/networking/ftpd.c
index c562c2886..8af5acac2 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1174,17 +1174,20 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
         abs_timeout = 1 * 60 * 60;
         verbose_S = 0;
         G.timeout = 2 * 60;
-        opt_complementary = "vv:SS";
 #if BB_MMU
-        opts = getopt32(argv,    "vS"
-                IF_FEATURE_FTPD_WRITE("w") "t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:"),
+        opts = getopt32(argv, "^"    "vS"
+                IF_FEATURE_FTPD_WRITE("w") "t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:")
+                "\0" "vv:SS",
                 &G.timeout, &abs_timeout, IF_FEATURE_FTPD_AUTHENTICATION(&anon_opt,)
-                &G.verbose, &verbose_S);
+                &G.verbose, &verbose_S
+        );
 #else
-        opts = getopt32(argv, "l1AvS"
-                IF_FEATURE_FTPD_WRITE("w") "t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:"),
+        opts = getopt32(argv, "^" "l1AvS"
+                IF_FEATURE_FTPD_WRITE("w") "t:+T:+" IF_FEATURE_FTPD_AUTHENTICATION("a:")
+                "\0" "vv:SS",
                 &G.timeout, &abs_timeout, IF_FEATURE_FTPD_AUTHENTICATION(&anon_opt,)
-                &G.verbose, &verbose_S);
+                &G.verbose, &verbose_S
+        );
         if (opts & (OPT_l|OPT_1)) {
                 /* Our secret backdoor to ls */
                 if (fchdir(3) != 0)
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index cb0a96b59..029587aa2 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -39,37 +39,20 @@
 //usage:       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
 //usage:#define ftpget_full_usage "\n\n"
 //usage:       "Download a file via FTP\n"
-//usage:        IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
-//usage:     "\n        -c,--continue           Continue previous transfer"
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:     "\n        -u,--username USER      Username"
-//usage:     "\n        -p,--password PASS      Password"
-//usage:     "\n        -P,--port NUM           Port"
-//usage:        )
-//usage:        IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS(
 //usage:     "\n        -c      Continue previous transfer"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u USER Username"
 //usage:     "\n        -p PASS Password"
 //usage:     "\n        -P NUM  Port"
-//usage:        )
 //usage:
 //usage:#define ftpput_trivial_usage
 //usage:       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
 //usage:#define ftpput_full_usage "\n\n"
 //usage:       "Upload a file to a FTP server\n"
-//usage:        IF_FEATURE_FTPGETPUT_LONG_OPTIONS(
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:     "\n        -u,--username USER      Username"
-//usage:     "\n        -p,--password PASS      Password"
-//usage:     "\n        -P,--port NUM           Port"
-//usage:        )
-//usage:        IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS(
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u USER Username"
 //usage:     "\n        -p PASS Password"
 //usage:     "\n        -P NUM  Port number"
-//usage:        )
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -367,12 +350,15 @@ int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
         /*
          * Decipher the command line
          */
+        /* must have 2 to 3 params; -v and -c count */
+#define OPTSTRING "^cvu:p:P:" "\0" "-2:?3:vv:cc"
 #if ENABLE_FEATURE_FTPGETPUT_LONG_OPTIONS
-        applet_long_options = ftpgetput_longopts;
+        getopt32long(argv, OPTSTRING, ftpgetput_longopts,
+#else
+        getopt32(argv, OPTSTRING,
 #endif
-        opt_complementary = "-2:vv:cc"; /* must have 2 to 3 params; -v and -c count */
-        getopt32(argv, "cvu:p:P:", &user, &password, &port,
-                                        &verbose_flag, &do_continue);
+                        &user, &password, &port, &verbose_flag, &do_continue
+        );
         argv += optind;
 
         /* We want to do exactly _one_ DNS lookup, since some
diff --git a/networking/hostname.c b/networking/hostname.c
index 4b305d2b6..d87f6562f 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -22,9 +22,9 @@
 //config:       help
 //config:       Alias to "hostname -d".
 
-//                        APPLET_ODDNAME:name           main      location    suid_type     help
-//applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
-//applet:IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP))
+//                        APPLET_NOEXEC:name           main      location    suid_type     help
+//applet:IF_DNSDOMAINNAME(APPLET_NOEXEC(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname))
+//applet:IF_HOSTNAME(     APPLET_NOEXEC(hostname,      hostname, BB_DIR_BIN, BB_SUID_DROP, hostname     ))
 
 //kbuild: lib-$(CONFIG_HOSTNAME) += hostname.o
 //kbuild: lib-$(CONFIG_DNSDOMAINNAME) += hostname.o
@@ -114,7 +114,7 @@ static void do_sethostname(char *s, int isfile)
  *  { bbox: not supported }
  * -F, --file filename
  *  Read the host name from the specified file. Comments (lines
- *  starting with a `#') are ignored.
+ *  starting with a '#') are ignored.
  */
 int hostname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hostname_main(int argc UNUSED_PARAM, char **argv)
@@ -132,8 +132,9 @@ int hostname_main(int argc UNUSED_PARAM, char **argv)
         char *buf;
         char *hostname_str;
 
-#if ENABLE_LONG_OPTS
-        applet_long_options =
+        /* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
+         * supports hostname's options too (not just -v as manpage says) */
+        opts = getopt32(argv, "dfisF:v", &hostname_str,
                 "domain\0"     No_argument "d"
                 "fqdn\0"       No_argument "f"
         //Enable if seen in active use in some distro:
@@ -142,12 +143,7 @@ int hostname_main(int argc UNUSED_PARAM, char **argv)
         //      "short\0"      No_argument "s"
         //      "verbose\0"    No_argument "v"
                 "file\0"       No_argument "F"
-                ;
-
-#endif
-        /* dnsdomainname from net-tools 1.60, hostname 1.100 (2001-04-14),
-         * supports hostname's options too (not just -v as manpage says) */
-        opts = getopt32(argv, "dfisF:v", &hostname_str);
+        );
         argv += optind;
         buf = safe_gethostname();
         if (ENABLE_DNSDOMAINNAME) {
diff --git a/networking/httpd.c b/networking/httpd.c
index 079145757..9369de824 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2636,17 +2636,19 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         home_httpd = xrealloc_getcwd_or_warn(NULL);
-        /* -v counts, -i implies -f */
-        opt_complementary = "vv:if";
         /* We do not "absolutize" path given by -h (home) opt.
          * If user gives relative path in -h,
          * $SCRIPT_FILENAME will not be set. */
-        opt = getopt32(argv, "c:d:h:"
+        opt = getopt32(argv, "^"
+                        "c:d:h:"
                         IF_FEATURE_HTTPD_ENCODE_URL_STR("e:")
                         IF_FEATURE_HTTPD_BASIC_AUTH("r:")
                         IF_FEATURE_HTTPD_AUTH_MD5("m:")
                         IF_FEATURE_HTTPD_SETUID("u:")
-                        "p:ifv",
+                        "p:ifv"
+                        "\0"
+                        /* -v counts, -i implies -f */
+                        "vv:if",
                         &opt_c_configFile, &url_for_decode, &home_httpd
                         IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
                         IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 26e5e8cf3..5e769b61d 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -105,7 +105,7 @@
 //config:       Userspace application to bind several interfaces
 //config:       to a logical interface (use with kernel bonding driver).
 
-//applet:IF_IFENSLAVE(APPLET(ifenslave, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_IFENSLAVE(APPLET_NOEXEC(ifenslave, ifenslave, BB_DIR_SBIN, BB_SUID_DROP, ifenslave))
 
 //kbuild:lib-$(CONFIG_IFENSLAVE) += ifenslave.o interface.o
 
@@ -113,10 +113,10 @@
 //usage:       "[-cdf] MASTER_IFACE SLAVE_IFACE..."
 //usage:#define ifenslave_full_usage "\n\n"
 //usage:       "Configure network interfaces for parallel routing\n"
-//usage:     "\n        -c,--change-active      Change active slave"
-//usage:     "\n        -d,--detach             Remove slave interface from bonding device"
-//usage:     "\n        -f,--force              Force, even if interface is not Ethernet"
-/* //usage:  "\n        -r,--receive-slave      Create a receive-only slave" */
+//usage:     "\n        -c      Change active slave"
+//usage:     "\n        -d      Remove slave interface from bonding device"
+//usage:     "\n        -f      Force, even if interface is not Ethernet"
+/* //usage:  "\n        -r      Create a receive-only slave" */
 //usage:
 //usage:#define ifenslave_example_usage
 //usage:       "To create a bond device, simply follow these three steps:\n"
@@ -493,19 +493,15 @@ int ifenslave_main(int argc UNUSED_PARAM, char **argv)
                 OPT_d = (1 << 1),
                 OPT_f = (1 << 2),
         };
-#if ENABLE_LONG_OPTS
-        static const char ifenslave_longopts[] ALIGN1 =
+
+        INIT_G();
+
+        opt = getopt32long(argv, "cdfa",
                 "change-active\0"  No_argument "c"
                 "detach\0"         No_argument "d"
                 "force\0"          No_argument "f"
                 /* "all-interfaces\0" No_argument "a" */
-                ;
-
-        applet_long_options = ifenslave_longopts;
-#endif
-        INIT_G();
-
-        opt = getopt32(argv, "cdfa");
+        );
         argv += optind;
         if (opt & (opt-1)) /* Only one option can be given */
                 bb_show_usage();
diff --git a/networking/inetd.c b/networking/inetd.c
index 91545d0a3..67984accb 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -217,7 +217,6 @@
 //config:       bool "Support RPC services"
 //config:       default n  # very rarely used, and needs Sun RPC support in libc
 //config:       depends on INETD
-//config:       select FEATURE_HAVE_RPC
 //config:       help
 //config:       Support Sun-RPC based services
 
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 9888a6ff2..cdae8eea8 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -31,7 +31,7 @@
 //config:       Adds the options hostname, prefix and silent to the output of
 //config:       "ipcalc".
 
-//applet:IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_IPCALC(APPLET_NOEXEC(ipcalc, ipcalc, BB_DIR_BIN, BB_SUID_DROP, ipcalc))
 
 //kbuild:lib-$(CONFIG_IPCALC) += ipcalc.o
 
@@ -39,26 +39,14 @@
 //usage:       "[OPTIONS] ADDRESS"
 //usage:       IF_FEATURE_IPCALC_FANCY("[/PREFIX]") " [NETMASK]"
 //usage:#define ipcalc_full_usage "\n\n"
-//usage:       "Calculate IP network settings from a IP address\n"
-//usage:        IF_FEATURE_IPCALC_LONG_OPTIONS(
-//usage:     "\n        -b,--broadcast  Display calculated broadcast address"
-//usage:     "\n        -n,--network    Display calculated network address"
-//usage:     "\n        -m,--netmask    Display default netmask for IP"
+//usage:       "Calculate and display network settings from IP address\n"
+//usage:     "\n        -b      Broadcast address"
+//usage:     "\n        -n      Network address"
+//usage:     "\n        -m      Default netmask for IP"
 //usage:        IF_FEATURE_IPCALC_FANCY(
-//usage:     "\n        -p,--prefix     Display the prefix for IP/NETMASK"
-//usage:     "\n        -h,--hostname   Display first resolved host name"
-//usage:     "\n        -s,--silent     Don't ever display error messages"
-//usage:        )
-//usage:        )
-//usage:        IF_NOT_FEATURE_IPCALC_LONG_OPTIONS(
-//usage:     "\n        -b      Display calculated broadcast address"
-//usage:     "\n        -n      Display calculated network address"
-//usage:     "\n        -m      Display default netmask for IP"
-//usage:        IF_FEATURE_IPCALC_FANCY(
-//usage:     "\n        -p      Display the prefix for IP/NETMASK"
-//usage:     "\n        -h      Display first resolved host name"
-//usage:     "\n        -s      Don't ever display error messages"
-//usage:        )
+//usage:     "\n        -p      Prefix for IP/NETMASK"
+//usage:     "\n        -h      Resolved host name"
+//usage:     "\n        -s      No error messages"
 //usage:        )
 
 #include "libbb.h"
@@ -120,6 +108,11 @@ int get_prefix(unsigned long netmask);
                 "silent\0"    No_argument "s" // don’t ever display error messages
 # endif
                 ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,ipcalc_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 int ipcalc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -137,11 +130,11 @@ int ipcalc_main(int argc UNUSED_PARAM, char **argv)
 #define ipaddr    (s_ipaddr.s_addr)
         char *ipstr;
 
-#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
-        applet_long_options = ipcalc_longopts;
-#endif
-        opt_complementary = "-1:?2"; /* minimum 1 arg, maximum 2 args */
-        opt = getopt32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs"));
+        opt = GETOPT32(argv, "^"
+                        "mbn" IF_FEATURE_IPCALC_FANCY("phs")
+                        "\0" "-1:?2"/*min 1, max 2 args*/
+                        LONGOPTS
+        );
         argv += optind;
         if (opt & SILENT)
                 logmode = LOGMODE_NONE; /* suppress error_msg() output */
diff --git a/networking/nameif.c b/networking/nameif.c
index 31ee98a39..1f2695495 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -40,7 +40,7 @@
 //config:               new_interface_name  mac=00:80:C8:38:91:B5
 //config:               new_interface_name  00:80:C8:38:91:B5
 
-//applet:IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_NAMEIF(APPLET_NOEXEC(nameif, nameif, BB_DIR_SBIN, BB_SUID_DROP, nameif))
 
 //kbuild:lib-$(CONFIG_NAMEIF) += nameif.o
 
diff --git a/networking/nbd-client.c b/networking/nbd-client.c
index a5e25e6aa..cf1857231 100644
--- a/networking/nbd-client.c
+++ b/networking/nbd-client.c
@@ -7,7 +7,7 @@
 #include <netinet/tcp.h>
 #include <linux/fs.h>
 
-//applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
+//applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
 
 //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o
 
@@ -43,7 +43,7 @@
 //blocksizes other than 1024 without patches
 
 int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int nbdclient_main(int argc, char **argv)
+int nbdclient_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned long timeout = 0;
 #if BB_MMU
@@ -61,7 +61,7 @@ int nbdclient_main(int argc, char **argv)
         BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4);
 
         // Parse command line stuff (just a stub now)
-        if (argc != 4)
+        if (!argv[1] || !argv[2] || !argv[3] || argv[4])
                 bb_show_usage();
 
 #if !BB_MMU
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 3db784982..64098648a 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -787,11 +787,15 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
  e_found:
 
         // -g -G -t -r deleted, unimplemented -a deleted too
-        opt_complementary = "?2:vv:ll"; /* max 2 params; -v and -l are counters; -w N */
-        getopt32(argv, "np:s:uvw:+" IF_NC_SERVER("lk")
-                        IF_NC_EXTRA("i:o:z"),
-                        &str_p, &str_s, &o_wait
-                        IF_NC_EXTRA(, &str_i, &str_o), &o_verbose IF_NC_SERVER(, &cnt_l));
+        getopt32(argv, "^"
+                "np:s:uvw:+"/* -w N */ IF_NC_SERVER("lk")
+                IF_NC_EXTRA("i:o:z")
+                        "\0"
+                        "?2:vv:ll", /* max 2 params; -v and -l are counters */
+                &str_p, &str_s, &o_wait
+                IF_NC_EXTRA(, &str_i, &str_o)
+                        , &o_verbose IF_NC_SERVER(, &cnt_l)
+        );
         argv += optind;
 #if ENABLE_NC_EXTRA
         if (option_mask32 & OPT_i) /* line-interval time */
diff --git a/networking/ntpd.c b/networking/ntpd.c
index f21f9513d..25fa44389 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -2230,15 +2230,16 @@ static NOINLINE void ntp_init(char **argv)
 
         /* Parse options */
         peers = NULL;
-        opt_complementary = "dd:wn"  /* -d: counter; -p: list; -w implies -n */
-                IF_FEATURE_NTPD_SERVER(":Il"); /* -I implies -l */
-        opts = getopt32(argv,
+        opts = getopt32(argv, "^"
                         "nqNx" /* compat */
                         "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
                         IF_FEATURE_NTPD_SERVER("I:") /* compat */
                         "d" /* compat */
                         "46aAbgL", /* compat, ignored */
-                        &peers, &G.script_name,
+                                "\0"
+                                "dd:wn"  /* -d: counter; -p: list; -w implies -n */
+                                IF_FEATURE_NTPD_SERVER(":Il") /* -I implies -l */
+                        , &peers, &G.script_name,
 #if ENABLE_FEATURE_NTPD_SERVER
                         &G.if_name,
 #endif
diff --git a/networking/ping.c b/networking/ping.c
index 506e7b11b..7460e4414 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -340,7 +340,8 @@ static int common_ping_main(sa_family_t af, char **argv)
 
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:+s:t:+w:+W:+I:np:4" IF_PING6("6"))
+/* -c NUM, -t NUM, -w NUM, -W NUM */
+#define OPT_STRING "qvc:+s:t:+w:+W:+I:np:4"IF_PING6("6")
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
@@ -863,9 +864,12 @@ static int common_ping_main(int opt, char **argv)
 
         INIT_G();
 
-        /* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */
-        opt_complementary = "=1:q--v:v--q";
-        opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p);
+        opt |= getopt32(argv, "^"
+                        OPT_STRING
+                        /* exactly one arg; -v and -q don't mix */
+                        "\0" "=1:q--v:v--q",
+                        &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p
+        );
         if (opt & OPT_s)
                 datalen = xatou16(str_s); // -s
         if (opt & OPT_I) { // -I
@@ -953,7 +957,7 @@ int ping6_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/networking/pscan.c b/networking/pscan.c
index 17985d2c8..95b0a937d 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -75,8 +75,11 @@ int pscan_main(int argc UNUSED_PARAM, char **argv)
         unsigned rtt_4;
         unsigned start, diff;
 
-        opt_complementary = "=1"; /* exactly one non-option */
-        opt = getopt32(argv, "cbp:P:t:T:", &opt_min_port, &opt_max_port, &opt_timeout, &opt_min_rtt);
+        opt = getopt32(argv, "^"
+                "cbp:P:t:T:"
+                "\0" "=1", /* exactly one non-option */
+                &opt_min_port, &opt_max_port, &opt_timeout, &opt_min_rtt
+        );
         argv += optind;
         max_port = xatou_range(opt_max_port, 1, 65535);
         port = xatou_range(opt_min_port, 1, max_port);
diff --git a/networking/slattach.c b/networking/slattach.c
index 71b5bf427..e0a388926 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -17,23 +17,23 @@
 //config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
-//config:       slattach is a small utility to attach network interfaces to serial
-//config:       lines.
+//config:       slattach configures serial line as SLIP network interface.
 
 //applet:IF_SLATTACH(APPLET(slattach, BB_DIR_SBIN, BB_SUID_DROP))
+/* shouldn't be NOEXEC: may sleep indefinitely */
 
 //kbuild:lib-$(CONFIG_SLATTACH) += slattach.o
 
 //usage:#define slattach_trivial_usage
-//usage:       "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
+//usage:       "[-ehmLF] [-c SCRIPT] [-s BAUD] [-p PROTOCOL] SERIAL_DEVICE"
 //usage:#define slattach_full_usage "\n\n"
-//usage:       "Attach network interface(s) to serial line(s)\n"
-//usage:     "\n        -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)"
-//usage:     "\n        -s SPD  Set line speed"
-//usage:     "\n        -e      Exit after initializing device"
-//usage:     "\n        -h      Exit when the carrier is lost"
-//usage:     "\n        -c PROG Run PROG when the line is hung up"
-//usage:     "\n        -m      Do NOT initialize the line in raw 8 bits mode"
+//usage:       "Configure serial line as SLIP network interface\n"
+//usage:     "\n        -p PROT Protocol: slip, cslip (default), slip6, clisp6, adaptive"
+//usage:     "\n        -s BAUD Line speed"
+//usage:     "\n        -e      Exit after initialization"
+//usage:     "\n        -h      Exit if carrier is lost (else never exits)"
+//usage:     "\n        -c PROG Run PROG on carrier loss"
+//usage:     "\n        -m      Do NOT set raw 8bit mode"
 //usage:     "\n        -L      Enable 3-wire operation"
 //usage:     "\n        -F      Disable RTS/CTS flow control"
 
@@ -42,103 +42,53 @@
 #include "libiproute/utils.h" /* invarg_1_to_2() */
 
 struct globals {
-        int handle;
         int saved_disc;
         struct termios saved_state;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-#define handle       (G.handle      )
-#define saved_disc   (G.saved_disc  )
-#define saved_state  (G.saved_state )
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 
+#define serial_fd 3
 
-/*
- * Save tty state and line discipline
- *
- * It is fine here to bail out on errors, since we haven modified anything yet
- */
-static void save_state(void)
-{
-        /* Save line status */
-        if (tcgetattr(handle, &saved_state) < 0)
-                bb_perror_msg_and_die("get state");
-
-        /* Save line discipline */
-        xioctl(handle, TIOCGETD, &saved_disc);
-}
-
-static int set_termios_state_or_warn(struct termios *state)
+static int tcsetattr_serial_or_warn(struct termios *state)
 {
         int ret;
 
-        ret = tcsetattr(handle, TCSANOW, state);
-        if (ret < 0) {
-                bb_perror_msg("set state");
+        ret = tcsetattr(serial_fd, TCSANOW, state);
+        if (ret != 0) {
+                bb_perror_msg("tcsetattr");
                 return 1; /* used as exitcode */
         }
-        return 0;
+        return ret; /* 0 */
 }
 
-/*
- * Restore state and line discipline for ALL managed ttys
- *
- * Restoring ALL managed ttys is the only way to have a single
- * hangup delay.
- *
- * Go on after errors: we want to restore as many controlled ttys
- * as possible.
- */
 static void restore_state_and_exit(int exitcode) NORETURN;
 static void restore_state_and_exit(int exitcode)
 {
         struct termios state;
 
         /* Restore line discipline */
-        if (ioctl_or_warn(handle, TIOCSETD, &saved_disc) < 0) {
+        if (ioctl_or_warn(serial_fd, TIOCSETD, &G.saved_disc)) {
                 exitcode = 1;
         }
 
         /* Hangup */
-        memcpy(&state, &saved_state, sizeof(state));
+        memcpy(&state, &G.saved_state, sizeof(state));
         cfsetispeed(&state, B0);
         cfsetospeed(&state, B0);
-        if (set_termios_state_or_warn(&state))
-                exitcode = 1;
+        exitcode |= tcsetattr_serial_or_warn(&state);
         sleep(1);
 
         /* Restore line status */
-        if (set_termios_state_or_warn(&saved_state))
+        if (tcsetattr_serial_or_warn(&G.saved_state))
                 exit(EXIT_FAILURE);
+
         if (ENABLE_FEATURE_CLEAN_UP)
-                close(handle);
+                close(serial_fd);
 
         exit(exitcode);
 }
 
-/*
- * Set tty state, line discipline and encapsulation
- */
-static void set_state(struct termios *state, int encap)
-{
-        int disc;
-
-        /* Set line status */
-        if (set_termios_state_or_warn(state))
-                goto bad;
-        /* Set line discliple (N_SLIP always) */
-        disc = N_SLIP;
-        if (ioctl_or_warn(handle, TIOCSETD, &disc) < 0) {
-                goto bad;
-        }
-
-        /* Set encapsulation (SLIP, CSLIP, etc) */
-        if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) {
- bad:
-                restore_state_and_exit(EXIT_FAILURE);
-        }
-}
-
 static void sig_handler(int signo UNUSED_PARAM)
 {
         restore_state_and_exit(EXIT_SUCCESS);
@@ -155,13 +105,14 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
                 "cslip6\0"      /* 3 */
                 "adaptive\0"    /* 8 */
                 ;
+        static const int int_N_SLIP = N_SLIP;
 
-        int i, encap, opt;
+        int encap, opt, fd;
         struct termios state;
         const char *proto = "cslip";
         const char *extcmd;   /* Command to execute after hangup */
         const char *baud_str;
-        int baud_code = -1;   /* Line baud rate (system code) */
+        int baud_code = baud_code; /* for compiler */
 
         enum {
                 OPT_p_proto  = 1 << 0,
@@ -177,15 +128,13 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         /* Parse command line options */
-        opt = getopt32(argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd);
+        opt = getopt32(argv, "^" "p:s:c:ehmLF" "\0" "=1",
+                                &proto, &baud_str, &extcmd
+        );
         /*argc -= optind;*/
         argv += optind;
 
-        if (!*argv)
-                bb_show_usage();
-
         encap = index_in_strings(proto_names, proto);
-
         if (encap < 0)
                 invarg_1_to_2(proto, "protocol");
         if (encap > 3)
@@ -198,6 +147,22 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
                         invarg_1_to_2(baud_str, "baud rate");
         }
 
+        /* Open tty */
+        fd = open(*argv, O_RDWR | O_NDELAY);
+        if (fd < 0) {
+                char *buf = concat_path_file("/dev", *argv);
+                fd = xopen(buf, O_RDWR | O_NDELAY);
+                /* maybe if (ENABLE_FEATURE_CLEAN_UP) ?? */
+                free(buf);
+        }
+        xmove_fd(fd, serial_fd);
+
+        /* Save current tty state */
+        if (tcgetattr(serial_fd, &G.saved_state) != 0)
+                bb_perror_msg_and_die("tcgetattr");
+        /* Save line discipline */
+        xioctl(serial_fd, TIOCGETD, &G.saved_disc);
+
         /* Trap signals in order to restore tty states upon exit */
         if (!(opt & OPT_e_quit)) {
                 bb_signals(0
@@ -208,43 +173,37 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
                         , sig_handler);
         }
 
-        /* Open tty */
-        handle = open(*argv, O_RDWR | O_NDELAY);
-        if (handle < 0) {
-                char *buf = concat_path_file("/dev", *argv);
-                handle = xopen(buf, O_RDWR | O_NDELAY);
-                /* maybe if (ENABLE_FEATURE_CLEAN_UP) ?? */
-                free(buf);
-        }
-
-        /* Save current tty state */
-        save_state();
-
         /* Configure tty */
-        memcpy(&state, &saved_state, sizeof(state));
+        memcpy(&state, &G.saved_state, sizeof(state));
         if (!(opt & OPT_m_nonraw)) { /* raw not suppressed */
                 memset(&state.c_cc, 0, sizeof(state.c_cc));
                 state.c_cc[VMIN] = 1;
                 state.c_iflag = IGNBRK | IGNPAR;
-                state.c_oflag = 0;
-                state.c_lflag = 0;
+                /*state.c_oflag = 0;*/
+                /*state.c_lflag = 0;*/
                 state.c_cflag = CS8 | HUPCL | CREAD
                               | ((opt & OPT_L_local) ? CLOCAL : 0)
                               | ((opt & OPT_F_noflow) ? 0 : CRTSCTS);
-                cfsetispeed(&state, cfgetispeed(&saved_state));
-                cfsetospeed(&state, cfgetospeed(&saved_state));
+                cfsetispeed(&state, cfgetispeed(&G.saved_state));
+                cfsetospeed(&state, cfgetospeed(&G.saved_state));
         }
-
         if (opt & OPT_s_baud) {
                 cfsetispeed(&state, baud_code);
                 cfsetospeed(&state, baud_code);
         }
-
-        set_state(&state, encap);
+        /* Set line status */
+        if (tcsetattr_serial_or_warn(&state))
+                goto bad;
+        /* Set line disclipline (N_SLIP always) */
+        if (ioctl_or_warn(serial_fd, TIOCSETD, (void*)&int_N_SLIP))
+                goto bad;
+        /* Set encapsulation (SLIP, CSLIP, etc) */
+        if (ioctl_or_warn(serial_fd, SIOCSIFENCAP, &encap))
+                goto bad;
 
         /* Exit now if option -e was passed */
         if (opt & OPT_e_quit)
-                return 0;
+                return EXIT_SUCCESS;
 
         /* If we're not requested to watch, just keep descriptor open
          * until we are killed */
@@ -254,17 +213,20 @@ int slattach_main(int argc UNUSED_PARAM, char **argv)
 
         /* Watch line for hangup */
         while (1) {
-                if (ioctl(handle, TIOCMGET, &i) < 0 || !(i & TIOCM_CAR))
-                        goto no_carrier;
+                int modem_stat;
+                if (ioctl(serial_fd, TIOCMGET, &modem_stat))
+                        break;
+                if (!(modem_stat & TIOCM_CAR))
+                        break;
                 sleep(15);
         }
 
- no_carrier:
-
         /* Execute command on hangup */
         if (opt & OPT_c_extcmd)
                 system(extcmd);
 
         /* Restore states and exit */
         restore_state_and_exit(EXIT_SUCCESS);
+ bad:
+        restore_state_and_exit(EXIT_FAILURE);
 }
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 270325164..d4c69e0f7 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -269,10 +269,11 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
 
         tcp = (applet_name[0] == 't');
 
-        /* 3+ args, -i at most once, -p implies -h, -v is counter, -b N, -c N */
-        opt_complementary = "-3:i--i:ph:vv";
 #ifdef SSLSVD
-        opts = getopt32(argv, "+c:+C:i:x:u:l:Eb:+hpt:vU:/:Z:K:",
+        opts = getopt32(argv, "^+"
+                "c:+C:i:x:u:l:Eb:+hpt:vU:/:Z:K:" /* -c NUM, -b NUM */
+                /* 3+ args, -i at most once, -p implies -h, -v is a counter */
+                "\0" "-3:i--i:ph:vv",
                 &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
                 &backlog, &str_t, &ssluser, &root, &cert, &key, &verbose
         );
diff --git a/networking/telnet.c b/networking/telnet.c
index 9f191f7ad..1f8a44466 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -44,7 +44,7 @@
 //config:       Setting this option will forward the USER environment variable to the
 //config:       remote host you are connecting to. This is useful when you need to
 //config:       log into a machine without telling the username (autologin). This
-//config:       option enables `-a' and `-l USER' arguments.
+//config:       option enables '-a' and '-l USER' options.
 //config:
 //config:config FEATURE_TELNET_WIDTH
 //config:       bool "Enable window size autodetection"
@@ -643,8 +643,10 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
         }
 
 #if ENABLE_FEATURE_TELNET_AUTOLOGIN
-        if (1 & getopt32(argv, "al:", &G.autologin))
+        if (1 == getopt32(argv, "al:", &G.autologin)) {
+                /* Only -a without -l USER picks $USER from envvar */
                 G.autologin = getenv("USER");
+        }
         argv += optind;
 #else
         argv++;
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 16c572e8d..a6bafa21d 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -659,13 +659,15 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
 #endif
         INIT_G();
 
-        /* -w NUM, and implies -F. -w and -i don't mix */
-        IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:i--w:w--i";)
         /* Even if !STANDALONE, we accept (and ignore) -i, thus people
          * don't need to guess whether it's ok to pass -i to us */
-        opt = getopt32(argv, "f:l:Ki"
+        opt = getopt32(argv, "^"
+                        "f:l:Ki"
                         IF_FEATURE_TELNETD_STANDALONE("p:b:F")
-                        IF_FEATURE_TELNETD_INETD_WAIT("Sw:+"),
+                        IF_FEATURE_TELNETD_INETD_WAIT("Sw:+") /* -w NUM */
+                        "\0"
+                        /* -w implies -F. -w and -i don't mix */
+                        IF_FEATURE_TELNETD_INETD_WAIT("wF:i--w:w--i"),
                         &G.issuefile, &G.loginpath
                         IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)
                         IF_FEATURE_TELNETD_INETD_WAIT(, &sec_linger)
diff --git a/networking/tftp.c b/networking/tftp.c
index 5baa80448..73a9829aa 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -761,15 +761,16 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        /* -p or -g is mandatory, and they are mutually exclusive */
-        opt_complementary = "" IF_FEATURE_TFTP_GET("g:") IF_FEATURE_TFTP_PUT("p:")
-                        IF_GETPUT("g--p:p--g:");
-
-        IF_GETPUT(opt =) getopt32(argv,
+        IF_GETPUT(opt =) getopt32(argv, "^"
                         IF_FEATURE_TFTP_GET("g") IF_FEATURE_TFTP_PUT("p")
-                                "l:r:" IF_FEATURE_TFTP_BLOCKSIZE("b:"),
+                        "l:r:" IF_FEATURE_TFTP_BLOCKSIZE("b:")
+                        "\0"
+                        /* -p or -g is mandatory, and they are mutually exclusive */
+                        IF_FEATURE_TFTP_GET("g:") IF_FEATURE_TFTP_PUT("p:")
+                        IF_GETPUT("g--p:p--g:"),
                         &local_file, &remote_file
-                        IF_FEATURE_TFTP_BLOCKSIZE(, &blksize_str));
+                        IF_FEATURE_TFTP_BLOCKSIZE(, &blksize_str)
+        );
         argv += optind;
 
 # if ENABLE_FEATURE_TFTP_BLOCKSIZE
diff --git a/networking/traceroute.c b/networking/traceroute.c
index a958a2c6c..8b6247482 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -12,12 +12,12 @@
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
+ * ''This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may be used to endorse
  * or promote products derived from this software without specific prior
  * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * THIS SOFTWARE IS PROVIDED ''AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
@@ -833,9 +833,9 @@ common_traceroute_main(int op, char **argv)
 
         INIT_G();
 
-        /* minimum 1 arg */
-        opt_complementary = "-1:x-x";
-        op |= getopt32(argv, OPT_STRING
+        op |= getopt32(argv, "^"
+                OPT_STRING
+                "\0" "-1:x-x" /* minimum 1 arg */
                 , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
                 , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
         );
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 0a26ff7fb..f2dc645a1 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -24,7 +24,7 @@
 //config:       Allow to specify owner and group of newly created interface.
 //config:       340 bytes of pure bloat. Say no here.
 
-//applet:IF_TUNCTL(APPLET(tunctl, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_TUNCTL(APPLET_NOEXEC(tunctl, tunctl, BB_DIR_SBIN, BB_SUID_DROP, tunctl))
 
 //kbuild:lib-$(CONFIG_TUNCTL) += tunctl.o
 
@@ -83,10 +83,13 @@ int tunctl_main(int argc UNUSED_PARAM, char **argv)
 #endif
         };
 
-        opt_complementary = "=0:t--d:d--t"; // no arguments; t ^ d
-        opts = getopt32(argv, "f:t:d:" IF_FEATURE_TUNCTL_UG("u:g:b"),
+        opts = getopt32(argv, "^"
+                        "f:t:d:" IF_FEATURE_TUNCTL_UG("u:g:b")
+                        "\0"
+                        "=0:t--d:d--t", // no arguments; t ^ d
                         &opt_device, &opt_name, &opt_name
-                        IF_FEATURE_TUNCTL_UG(, &opt_user, &opt_group));
+                        IF_FEATURE_TUNCTL_UG(, &opt_user, &opt_group)
+        );
 
         // select device
         memset(&ifr, 0, sizeof(ifr));
@@ -153,9 +156,12 @@ int tunctl_main(int argc UNUSED_PARAM, char **argv)
                 OPT_d = 1 << 2, // delete named interface
         };
 
-        opt_complementary = "=0:t--d:d--t"; // no arguments; t ^ d
-        opts = getopt32(argv, "f:t:d:u:g:b", // u, g, b accepted and ignored
-                        &opt_device, &opt_name, &opt_name, NULL, NULL);
+        opts = getopt32(argv, "^"
+                        "f:t:d:u:g:b" // u, g, b accepted and ignored
+                        "\0"
+                        "=0:t--d:d--t", // no arguments; t ^ d
+                        &opt_device, &opt_name, &opt_name, NULL, NULL
+        );
 
         // set interface name
         memset(&ifr, 0, sizeof(ifr));
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 43081efca..849ca1388 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1101,14 +1101,15 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         client_config.script = CONFIG_UDHCPC_DEFAULT_SCRIPT;
 
         /* Parse command line */
-        /* O,x: list; -T,-t,-A take numeric param */
-        IF_UDHCP_VERBOSE(opt_complementary = "vv";)
-        IF_LONG_OPTS(applet_long_options = udhcpc6_longopts;)
-        opt = getopt32(argv, "i:np:qRr:s:T:+t:+SA:+O:*ox:*f"
+        opt = getopt32long(argv, "^"
+                /* O,x: list; -T,-t,-A take numeric param */
+                "i:np:qRr:s:T:+t:+SA:+O:*ox:*f"
                 USE_FOR_MMU("b")
                 ///IF_FEATURE_UDHCPC_ARPING("a")
                 IF_FEATURE_UDHCP_PORT("P:")
                 "v"
+                "\0" IF_UDHCP_VERBOSE("vv") /* -v is a counter */
+                , udhcpc6_longopts
                 , &client_config.interface, &client_config.pidfile, &str_r /* i,p */
                 , &client_config.script /* s */
                 , &discover_timeout, &discover_retries, &tryagain_timeout /* T,t,A */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index ccf04993d..55e0400b9 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1295,16 +1295,18 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         str_V = "udhcp "BB_VER;
 
         /* Parse command line */
-        /* O,x: list; -T,-t,-A take numeric param */
-        IF_UDHCP_VERBOSE(opt_complementary = "vv";)
-        IF_LONG_OPTS(applet_long_options = udhcpc_longopts;)
-        opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
+        opt = getopt32long(argv, "^"
+                /* O,x: list; -T,-t,-A take numeric param */
+                "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
                 USE_FOR_MMU("b")
                 IF_FEATURE_UDHCPC_ARPING("a::")
                 IF_FEATURE_UDHCP_PORT("P:")
                 "v"
+                "\0" IF_UDHCP_VERBOSE("vv") /* -v is a counter */
+                , udhcpc_longopts
                 , &str_V, &str_h, &str_h, &str_F
-                , &client_config.interface, &client_config.pidfile, &str_r /* i,p */
+                , &client_config.interface, &client_config.pidfile /* i,p */
+                , &str_r /* r */
                 , &client_config.script /* s */
                 , &discover_timeout, &discover_retries, &tryagain_timeout /* T,t,A */
                 , &list_O
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 3a5fc2db7..05ddc8649 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -814,11 +814,12 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_UDHCP_PORT(SERVER_PORT = 67;)
         IF_FEATURE_UDHCP_PORT(CLIENT_PORT = 68;)
 
+        opt = getopt32(argv, "^"
+                "fSI:va:"IF_FEATURE_UDHCP_PORT("P:")
+                "\0"
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
-        opt_complementary = "vv";
+                "vv"
 #endif
-        opt = getopt32(argv, "fSI:va:"
-                IF_FEATURE_UDHCP_PORT("P:")
                 , &str_I
                 , &str_a
                 IF_FEATURE_UDHCP_PORT(, &str_P)
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index dce9084b3..70d2d1434 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -2,7 +2,7 @@
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-//applet:IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_DUMPLEASES(APPLET_NOEXEC(dumpleases, dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP, dumpleases))
 
 //kbuild:lib-$(CONFIG_DUMPLEASES) += dumpleases.o
 
@@ -51,12 +51,15 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                 "decimal\0"   No_argument       "d"
                 ;
 
-        applet_long_options = dumpleases_longopts;
 #endif
         init_unicode();
 
-        opt_complementary = "=0:a--r:r--a";
-        opt = getopt32(argv, "arf:d", &file);
+        opt = getopt32long(argv, "^"
+                        "arf:d"
+                        "\0" "=0:a--r:r--a",
+                        dumpleases_longopts,
+                        &file
+        );
 
         fd = xopen(file, O_RDONLY);
 
diff --git a/networking/vconfig.c b/networking/vconfig.c
index e6e2872bf..62a483865 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -16,7 +16,7 @@
 //config:       help
 //config:       Creates, removes, and configures VLAN interfaces
 
-//applet:IF_VCONFIG(APPLET(vconfig, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_VCONFIG(APPLET_NOEXEC(vconfig, vconfig, BB_DIR_SBIN, BB_SUID_DROP, vconfig))
 
 //kbuild:lib-$(CONFIG_VCONFIG) += vconfig.o
 
diff --git a/networking/wget.c b/networking/wget.c
index ab9bc1836..0001ddcba 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1371,6 +1371,11 @@ IF_DESKTOP(	"no-clobber\0"       No_argument       "\xf0")
 IF_DESKTOP(     "no-host-directories\0" No_argument    "\xf0")
 IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
                 ;
+# define GETOPT32 getopt32long
+# define LONGOPTS ,wget_longopts
+#else
+# define GETOPT32 getopt32
+# define LONGOPTS
 #endif
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
@@ -1387,11 +1392,9 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
         G.user_agent = "Wget"; /* "User-Agent" header field */
 
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
-        applet_long_options = wget_longopts;
 #endif
-        opt_complementary = "-1" /* at least one URL */
-                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::"); /* --header is a list */
-        getopt32(argv, "cqSO:P:Y:U:T:+"
+        GETOPT32(argv, "^"
+                "cqSO:P:Y:U:T:+"
                 /*ignored:*/ "t:"
                 /*ignored:*/ "n::"
                 /* wget has exactly four -n<letter> opts, all of which we can ignore:
@@ -1402,6 +1405,10 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
                  * "n::" above says that we accept -n[ARG].
                  * Specifying "n:" would be a bug: "-n ARG" would eat ARG!
                  */
+                "\0"
+                "-1" /* at least one URL */
+                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::") /* --header is a list */
+                LONGOPTS
                 , &G.fname_out, &G.dir_prefix,
                 &G.proxy_flag, &G.user_agent,
                 IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
diff --git a/networking/whois.c b/networking/whois.c
index 0cb7e5411..fd1cdf43e 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -167,8 +167,7 @@ int whois_main(int argc UNUSED_PARAM, char **argv)
         int port = 43;
         const char *host = "whois.iana.org";
 
-        opt_complementary = "-1";
-        getopt32(argv, "ih:p:+", &host, &port);
+        getopt32(argv, "^" "ih:p:+" "\0" "-1", &host, &port);
         argv += optind;
 
         do {
diff --git a/networking/zcip.c b/networking/zcip.c
index 94174a165..55440285f 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -253,8 +253,9 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
 #define QUIT       (opts & 2)
         // Parse commandline: prog [options] ifname script
         // exactly 2 args; -v accumulates and implies -f
-        opt_complementary = "=2:vv:vf";
-        opts = getopt32(argv, "fqr:l:v", &r_opt, &l_opt, &verbose);
+        opts = getopt32(argv, "^" "fqr:l:v" "\0" "=2:vv:vf",
+                                &r_opt, &l_opt, &verbose
+        );
 #if !BB_MMU
         // on NOMMU reexec early (or else we will rerun things twice)
         if (!FOREGROUND)
diff --git a/printutils/lpd.c b/printutils/lpd.c
index 3fdba5d2b..662d3a224 100644
--- a/printutils/lpd.c
+++ b/printutils/lpd.c
@@ -198,9 +198,8 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[])
                                 q = p; // next line
                         }
                         // helper should not talk over network.
-                        // this call reopens stdio fds to "/dev/null"
-                        // (no daemonization is done)
-                        bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO | DAEMON_ONLY_SANITIZE, NULL);
+                        // this call reopens stdio fds to "/dev/null".
+                        bb_daemon_helper(DAEMON_DEVNULL_STDIO);
                         BB_EXECVP_or_die(argv);
                 }
 
diff --git a/procps/free.c b/procps/free.c
index 618664e08..b57e4a322 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -15,7 +15,7 @@
 //config:       memory in the system, as well as the buffers used by the kernel.
 //config:       The shared memory column should be ignored; it is obsolete.
 
-//applet:IF_FREE(APPLET(free, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_FREE(APPLET_NOEXEC(free, free, BB_DIR_USR_BIN, BB_SUID_DROP, free))
 
 //kbuild:lib-$(CONFIG_FREE) += free.o
 
@@ -47,7 +47,10 @@ struct globals {
 #endif
 } 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)
 
 
 static unsigned long long scale(unsigned long d)
diff --git a/procps/fuser.c b/procps/fuser.c
index 2585a4203..418f57b57 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -299,8 +299,7 @@ int fuser_main(int argc UNUSED_PARAM, char **argv)
                 break;
         }
 
-        opt_complementary = "-1"; /* at least one param */
-        getopt32(argv, OPTION_STRING);
+        getopt32(argv, "^" OPTION_STRING "\0" "-1"/*at least one arg*/);
         argv += optind;
 
         pp = argv;
diff --git a/procps/iostat.c b/procps/iostat.c
index 6a39c324f..050625f57 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -418,8 +418,7 @@ int iostat_main(int argc UNUSED_PARAM, char **argv)
 
         /* Parse and process arguments */
         /* -k and -m are mutually exclusive */
-        opt_complementary = "k--m:m--k";
-        opt = getopt32(argv, "cdtzkm");
+        opt = getopt32(argv, "^" "cdtzkm" "\0" "k--m:m--k");
         if (!(opt & (OPT_c + OPT_d)))
                 /* Default is -cd */
                 opt |= OPT_c + OPT_d;
diff --git a/procps/kill.c b/procps/kill.c
index 09beefb2d..0ddae2f70 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -32,10 +32,10 @@
 //config:       in its own session, so it won't kill the shell that is running
 //config:       the script it was called from.
 
-//applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
-//                   APPLET_ODDNAME:name      main  location         suid_type     help
-//applet:IF_KILLALL( APPLET_ODDNAME(killall,  kill, BB_DIR_USR_BIN,  BB_SUID_DROP, killall))
-//applet:IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5))
+//applet:IF_KILL(    APPLET_NOFORK(kill,     kill, BB_DIR_BIN,      BB_SUID_DROP, kill))
+//                   APPLET_NOFORK:name      main  location         suid_type     help
+//applet:IF_KILLALL( APPLET_NOFORK(killall,  kill, BB_DIR_USR_BIN,  BB_SUID_DROP, killall))
+//applet:IF_KILLALL5(APPLET_NOFORK(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5))
 
 //kbuild:lib-$(CONFIG_KILL) += kill.o
 //kbuild:lib-$(CONFIG_KILLALL) += kill.o
@@ -87,7 +87,7 @@
  * + we can't use xfunc here
  * + we can't use applet_name
  * + we can't use bb_show_usage
- * (Above doesn't apply for killall[5] cases)
+ * (doesn't apply for killall[5], still should be careful b/c NOFORK)
  *
  * kill %n gets translated into kill ' -<process group>' by shell (note space!)
  * This is needed to avoid collision with kill -9 ... syntax
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 05a3f3ff3..c6279f9d8 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -8,6 +8,7 @@
  */
 
 //applet:IF_MPSTAT(APPLET(mpstat, BB_DIR_BIN, BB_SUID_DROP))
+/* shouldn't be noexec: "mpstat INTERVAL" runs indefinitely */
 
 //kbuild:lib-$(CONFIG_MPSTAT) += mpstat.o
 
diff --git a/procps/pgrep.c b/procps/pgrep.c
index a3ca9e295..a16a6e959 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -18,9 +18,13 @@
 //config:       help
 //config:       Send signals to processes by name.
 
-//applet:IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_PGREP(APPLET_ODDNAME(pgrep, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pgrep))
 //                APPLET_ODDNAME:name   main   location        suid_type     help
 //applet:IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill))
+/* can't be noexec: can find _itself_ under wrong name, since after fork only,
+ * /proc/PID/cmdline and comm are wrong! Can fix comm (prctl(PR_SET_NAME)),
+ * but cmdline?
+ */
 
 //kbuild:lib-$(CONFIG_PGREP) += pgrep.o
 //kbuild:lib-$(CONFIG_PKILL) += pgrep.o
diff --git a/procps/pidof.c b/procps/pidof.c
index 41247a02c..98d7949f8 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -30,6 +30,10 @@
 //config:       of the pidof, in other words the calling shell or shell script.
 
 //applet:IF_PIDOF(APPLET(pidof, BB_DIR_BIN, BB_SUID_DROP))
+/* can't be noexec: can find _itself_ under wrong name, since after fork only,
+ * /proc/PID/cmdline and comm are wrong! Can fix comm (prctl(PR_SET_NAME)),
+ * but cmdline?
+ */
 
 //kbuild:lib-$(CONFIG_PIDOF) += pidof.o
 
diff --git a/procps/pmap.c b/procps/pmap.c
index c8f728897..5c2d1ad59 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -18,7 +18,7 @@
 //kbuild:lib-$(CONFIG_PMAP) += pmap.o
 
 //usage:#define pmap_trivial_usage
-//usage:       "[-xq] PID"
+//usage:       "[-xq] PID..."
 //usage:#define pmap_full_usage "\n\n"
 //usage:       "Display process memory usage"
 //usage:     "\n"
@@ -96,7 +96,7 @@ int pmap_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         int ret;
 
-        opts = getopt32(argv, "xq");
+        opts = getopt32(argv, "^" "xq" "\0" "-1"); /* min one arg */
         argv += optind;
 
         ret = 0;
diff --git a/procps/powertop.c b/procps/powertop.c
index ebd659bdb..5d522bf91 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -8,11 +8,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
-//applet:IF_POWERTOP(APPLET(powertop, BB_DIR_USR_SBIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_POWERTOP) += powertop.o
-
 //config:config POWERTOP
 //config:       bool "powertop (9.1 kb)"
 //config:       default y
@@ -27,6 +22,10 @@
 //config:       Without this, powertop will only refresh display every 10 seconds.
 //config:       No keyboard commands will work, only ^C to terminate.
 
+//applet:IF_POWERTOP(APPLET(powertop, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_POWERTOP) += powertop.o
+
 // XXX This should be configurable
 #define ENABLE_FEATURE_POWERTOP_PROCIRQ 1
 
@@ -718,7 +717,7 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
         set_termios_to_raw(STDIN_FILENO, &G.init_settings, TERMIOS_CLEAR_ISIG);
         bb_signals(BB_FATAL_SIGS, sig_handler);
         /* So we don't forget to reset term settings */
-        atexit(reset_term);
+        die_func = reset_term;
 #endif
 
         /* Collect initial data */
@@ -855,6 +854,9 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
         } /* for (;;) */
 
         bb_putchar('\n');
+#if ENABLE_FEATURE_POWERTOP_INTERACTIVE
+        reset_term();
+#endif
 
         return EXIT_SUCCESS;
 }
diff --git a/procps/ps.c b/procps/ps.c
index 3e83a3e03..742d1715e 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -15,26 +15,26 @@
 //config:       ps gives a snapshot of the current processes.
 //config:
 //config:config FEATURE_PS_WIDE
-//config:       bool "Enable wide output option (-w)"
+//config:       bool "Enable wide output (-w)"
 //config:       default y
-//config:       depends on PS && !DESKTOP
+//config:       depends on (PS || MINIPS) && !DESKTOP
 //config:       help
 //config:       Support argument 'w' for wide output.
 //config:       If given once, 132 chars are printed, and if given more
 //config:       than once, the length is unlimited.
 //config:
 //config:config FEATURE_PS_LONG
-//config:       bool "Enable long output option (-l)"
+//config:       bool "Enable long output (-l)"
 //config:       default y
-//config:       depends on PS && !DESKTOP
+//config:       depends on (PS || MINIPS) && !DESKTOP
 //config:       help
 //config:       Support argument 'l' for long output.
 //config:       Adds fields PPID, RSS, START, TIME & TTY
 //config:
 //config:config FEATURE_PS_TIME
-//config:       bool "Support -o time and -o etime output specifiers"
+//config:       bool "Enable -o time and -o etime specifiers"
 //config:       default y
-//config:       depends on PS && DESKTOP
+//config:       depends on (PS || MINIPS) && DESKTOP
 //config:       select PLATFORM_LINUX
 //config:
 //config:config FEATURE_PS_UNUSUAL_SYSTEMS
@@ -46,13 +46,16 @@
 //config:       (if you are on Linux 2.4.0+ and use ELF, you don't need this)
 //config:
 //config:config FEATURE_PS_ADDITIONAL_COLUMNS
-//config:       bool "Support -o rgroup, -o ruser, -o nice specifiers"
+//config:       bool "Enable -o rgroup, -o ruser, -o nice specifiers"
 //config:       default y
-//config:       depends on PS && DESKTOP
+//config:       depends on (PS || MINIPS) && DESKTOP
 
-//applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
+//                 APPLET_NOEXEC:name    main location    suid_type     help
+//applet:IF_PS(    APPLET_NOEXEC(ps,     ps,  BB_DIR_BIN, BB_SUID_DROP, ps))
+//applet:IF_MINIPS(APPLET_NOEXEC(minips, ps,  BB_DIR_BIN, BB_SUID_DROP, ps))
 
 //kbuild:lib-$(CONFIG_PS) += ps.o
+//kbuild:lib-$(CONFIG_MINIPS) += ps.o
 
 //usage:#if ENABLE_DESKTOP
 //usage:
@@ -144,12 +147,6 @@ static unsigned long get_uptime(void)
 #endif
 
 #if ENABLE_DESKTOP
-
-#include <sys/times.h> /* for times() */
-#ifndef AT_CLKTCK
-# define AT_CLKTCK 17
-#endif
-
 /* TODO:
  * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html
  * specifies (for XSI-conformant systems) following default columns
@@ -186,7 +183,9 @@ struct globals {
         char *buffer;
         unsigned terminal_width;
 #if ENABLE_FEATURE_PS_TIME
+# if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS || !defined(__linux__)
         unsigned kernel_HZ;
+# endif
         unsigned long seconds_since_boot;
 #endif
 } FIX_ALIASING;
@@ -197,91 +196,15 @@ struct globals {
 #define need_flags         (G.need_flags        )
 #define buffer             (G.buffer            )
 #define terminal_width     (G.terminal_width    )
-#define kernel_HZ          (G.kernel_HZ         )
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 #if ENABLE_FEATURE_PS_TIME
-/* for ELF executables, notes are pushed before environment and args */
-static uintptr_t find_elf_note(uintptr_t findme)
-{
-        uintptr_t *ep = (uintptr_t *) environ;
-
-        while (*ep++)
-                continue;
-        while (*ep) {
-                if (ep[0] == findme) {
-                        return ep[1];
-                }
-                ep += 2;
-        }
-        return -1;
-}
-
-#if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS
-static unsigned get_HZ_by_waiting(void)
-{
-        struct timeval tv1, tv2;
-        unsigned t1, t2, r, hz;
-        unsigned cnt = cnt; /* for compiler */
-        int diff;
-
-        r = 0;
-
-        /* Wait for times() to reach new tick */
-        t1 = times(NULL);
-        do {
-                t2 = times(NULL);
-        } while (t2 == t1);
-        gettimeofday(&tv2, NULL);
-
-        do {
-                t1 = t2;
-                tv1.tv_usec = tv2.tv_usec;
-
-                /* Wait exactly one times() tick */
-                do {
-                        t2 = times(NULL);
-                } while (t2 == t1);
-                gettimeofday(&tv2, NULL);
-
-                /* Calculate ticks per sec, rounding up to even */
-                diff = tv2.tv_usec - tv1.tv_usec;
-                if (diff <= 0) diff += 1000000;
-                hz = 1000000u / (unsigned)diff;
-                hz = (hz+1) & ~1;
-
-                /* Count how many same hz values we saw */
-                if (r != hz) {
-                        r = hz;
-                        cnt = 0;
-                }
-                cnt++;
-        } while (cnt < 3); /* exit if saw 3 same values */
-
-        return r;
-}
-#else
-static inline unsigned get_HZ_by_waiting(void)
-{
-        /* Better method? */
-        return 100;
-}
-#endif
-
-static unsigned get_kernel_HZ(void)
-{
-        if (kernel_HZ)
-                return kernel_HZ;
-
-        /* Works for ELF only, Linux 2.4.0+ */
-        kernel_HZ = find_elf_note(AT_CLKTCK);
-        if (kernel_HZ == (unsigned)-1)
-                kernel_HZ = get_HZ_by_waiting();
-
-        G.seconds_since_boot = get_uptime();
-
-        return kernel_HZ;
-}
+# if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS || !defined(__linux__)
+#  define get_kernel_HZ() (G.kernel_HZ)
+# else
+    /* non-ancient Linux standardized on 100 for "times" freq */
+#  define get_kernel_HZ() ((unsigned)100)
+# endif
 #endif
 
 /* Print value to buf, max size+1 chars (including trailing '\0') */
@@ -379,52 +302,71 @@ static void func_tty(char *buf, int size, const procps_status_t *ps)
 #endif
 
 #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
-
 static void func_rgroup(char *buf, int size, const procps_status_t *ps)
 {
         safe_strncpy(buf, get_cached_groupname(ps->rgid), size+1);
 }
-
 static void func_ruser(char *buf, int size, const procps_status_t *ps)
 {
         safe_strncpy(buf, get_cached_username(ps->ruid), size+1);
 }
-
 static void func_nice(char *buf, int size, const procps_status_t *ps)
 {
         sprintf(buf, "%*d", size, ps->niceness);
 }
-
 #endif
 
 #if ENABLE_FEATURE_PS_TIME
+static void format_time(char *buf, int size, unsigned long tt)
+{
+        unsigned ff;
 
+        /* Used to show "14453:50" if tt is large. Ugly.
+         * procps-ng 3.3.10 uses "[[dd-]hh:]mm:ss" format.
+         * TODO: switch to that?
+         */
+
+        /* Formatting for 5-char TIME column.
+         * NB: "size" is not always 5: ELAPSED is wider (7),
+         * not taking advantage of that (yet?).
+         */
+        ff = tt % 60;
+        tt /= 60;
+        if (tt < 60) {
+                snprintf(buf, size+1, "%2u:%02u", (unsigned)tt, ff);
+                return;
+        }
+        ff = tt % 60;
+        tt /= 60;
+        if (tt < 24) {
+                snprintf(buf, size+1, "%2uh%02u", (unsigned)tt, ff);
+                return;
+        }
+        ff = tt % 24;
+        tt /= 24;
+        if (tt < 100) {
+                snprintf(buf, size+1, "%2ud%02u", (unsigned)tt, ff);
+                return;
+        }
+        snprintf(buf, size+1, "%4lud", tt);
+}
 static void func_etime(char *buf, int size, const procps_status_t *ps)
 {
         /* elapsed time [[dd-]hh:]mm:ss; here only mm:ss */
         unsigned long mm;
-        unsigned ss;
 
         mm = ps->start_time / get_kernel_HZ();
-        /* must be after get_kernel_HZ()! */
         mm = G.seconds_since_boot - mm;
-        ss = mm % 60;
-        mm /= 60;
-        snprintf(buf, size+1, "%3lu:%02u", mm, ss);
+        format_time(buf, size, mm);
 }
-
 static void func_time(char *buf, int size, const procps_status_t *ps)
 {
         /* cumulative time [[dd-]hh:]mm:ss; here only mm:ss */
         unsigned long mm;
-        unsigned ss;
 
         mm = (ps->utime + ps->stime) / get_kernel_HZ();
-        ss = mm % 60;
-        mm /= 60;
-        snprintf(buf, size+1, "%3lu:%02u", mm, ss);
+        format_time(buf, size, mm);
 }
-
 #endif
 
 #if ENABLE_SELINUX
@@ -465,7 +407,7 @@ static const ps_out_t out_spec[] = {
 //      { 5                  , "pcpu"  ,"%CPU"   ,func_pcpu  ,PSSCAN_        },
 #endif
 #if ENABLE_FEATURE_PS_TIME
-        { 6                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
+        { 5                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
 #endif
 #if !ENABLE_PLATFORM_MINGW32
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
@@ -641,6 +583,12 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
         };
 
         INIT_G();
+#if ENABLE_FEATURE_PS_TIME
+        G.seconds_since_boot = get_uptime();
+# if ENABLE_FEATURE_PS_UNUSUAL_SYSTEMS || !defined(__linux__)
+        G.kernel_HZ = bb_clk_tck(); /* this is sysconf(_SC_CLK_TCK) */
+# endif
+#endif
 
         // POSIX:
         // -a  Write information for all processes associated with terminals
@@ -731,9 +679,12 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 # if ENABLE_FEATURE_PS_WIDE
         /* -w is a bit complicated */
         int w_count = 0;
-        opt_complementary = "-:ww";
-        opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l")
-                                        "w", &w_count);
+        make_all_argv_opts(argv);
+        opts = getopt32(argv, "^"
+                IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l")"w"
+                "\0" "ww",
+                &w_count
+        );
         /* if w is given once, GNU ps sets the width to 132,
          * if w is given more than once, it is "unlimited"
          */
@@ -747,7 +698,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         }
 # else
         /* -w is not supported, only -Z and/or -T */
-        opt_complementary = "-";
+        make_all_argv_opts(argv);
         opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")IF_FEATURE_PS_LONG("l"));
 # endif
 
diff --git a/procps/pstree.c b/procps/pstree.c
index 212cda23c..4fda1c21c 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -9,14 +9,13 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config PSTREE
 //config:       bool "pstree (9.4 kb)"
 //config:       default y
 //config:       help
 //config:       Display a tree of processes.
 
-//applet:IF_PSTREE(APPLET(pstree, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_PSTREE(APPLET_NOEXEC(pstree, pstree, BB_DIR_USR_BIN, BB_SUID_DROP, pstree))
 
 //kbuild:lib-$(CONFIG_PSTREE) += pstree.o
 
@@ -387,8 +386,7 @@ int pstree_main(int argc UNUSED_PARAM, char **argv)
 
         G.output_width = get_terminal_width(0);
 
-        opt_complementary = "?1";
-        getopt32(argv, "p");
+        getopt32(argv, "^" "p" "\0" "?1");
         argv += optind;
 
         if (argv[0]) {
diff --git a/procps/pwdx.c b/procps/pwdx.c
index dac238950..c72cf804a 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -14,7 +14,7 @@
 //config:       help
 //config:       Report current working directory of a process
 
-//applet:IF_PWDX(APPLET(pwdx, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_PWDX(APPLET_NOFORK(pwdx, pwdx, BB_DIR_USR_BIN, BB_SUID_DROP, pwdx))
 
 //kbuild:lib-$(CONFIG_PWDX) += pwdx.o
 
@@ -28,8 +28,7 @@
 int pwdx_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int pwdx_main(int argc UNUSED_PARAM, char **argv)
 {
-        opt_complementary = "-1";
-        getopt32(argv, "");
+        getopt32(argv, "^" "" "\0" "-1");
         argv += optind;
 
         do {
@@ -50,6 +49,7 @@ int pwdx_main(int argc UNUSED_PARAM, char **argv)
 
                 sprintf(buf, "/proc/%u/cwd", pid);
 
+                /* NOFORK: only one alloc is allowed; must free */
                 s = xmalloc_readlink(buf);
                 // "pwdx /proc/1" says "/proc/1: DIR", not "1: DIR"
                 printf("%s: %s\n", *argv, s ? s : strerror(errno == ENOENT ? ESRCH : errno));
diff --git a/procps/sysctl.c b/procps/sysctl.c
index b17f5e896..827e09cce 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -16,22 +16,22 @@
 //config:       help
 //config:       Configure kernel parameters at runtime.
 
-//applet:IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_BB_SYSCTL(APPLET_NOEXEC(sysctl, sysctl, BB_DIR_SBIN, BB_SUID_DROP, sysctl))
 
 //kbuild:lib-$(CONFIG_BB_SYSCTL) += sysctl.o
 
 //usage:#define sysctl_trivial_usage
-//usage:       "[OPTIONS] [KEY[=VALUE]]..."
+//usage:       "-p [-enq] [FILE...] / [-enqaw] [KEY[=VALUE]]..."
 //usage:#define sysctl_full_usage "\n\n"
 //usage:       "Show/set kernel parameters\n"
+//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -e      Don't warn about unknown keys"
 //usage:     "\n        -n      Don't show key names"
+//usage:     "\n        -q      Quiet"
 //usage:     "\n        -a      Show all values"
 /* Same as -a, no need to show it */
 /* //usage:     "\n     -A      Show all values in table form" */
 //usage:     "\n        -w      Set values"
-//usage:     "\n        -p FILE Set values from FILE (default /etc/sysctl.conf)"
-//usage:     "\n        -q      Set values silently"
 //usage:
 //usage:#define sysctl_example_usage
 //usage:       "sysctl [-n] [-e] variable...\n"
@@ -48,7 +48,7 @@ enum {
         FLAG_TABLE_FORMAT    = 1 << 2, /* not implemented */
         FLAG_SHOW_ALL        = 1 << 3,
         FLAG_PRELOAD_FILE    = 1 << 4,
-/* TODO: procps 3.2.8 seems to not require -w for KEY=VAL to work: */
+        /* NB: procps 3.2.8 does not require -w for KEY=VAL to work, it only rejects non-KEY=VAL form */
         FLAG_WRITE           = 1 << 5,
         FLAG_QUIET           = 1 << 6,
 };
@@ -104,6 +104,7 @@ static int sysctl_act_on_setting(char *setting)
         int fd, retval = EXIT_SUCCESS;
         char *cptr, *outname;
         char *value = value; /* for compiler */
+        bool writing = (option_mask32 & FLAG_WRITE);
 
         outname = xstrdup(setting);
 
@@ -114,8 +115,10 @@ static int sysctl_act_on_setting(char *setting)
                 cptr++;
         }
 
-        if (option_mask32 & FLAG_WRITE) {
-                cptr = strchr(setting, '=');
+        cptr = strchr(setting, '=');
+        if (cptr)
+                writing = 1;
+        if (writing) {
                 if (cptr == NULL) {
                         bb_error_msg("error: '%s' must be of the form name=value",
                                 outname);
@@ -147,7 +150,7 @@ static int sysctl_act_on_setting(char *setting)
                         break;
                 default:
                         bb_perror_msg("error %sing key '%s'",
-                                        option_mask32 & FLAG_WRITE ?
+                                        writing ?
                                                 "sett" : "read",
                                         outname);
                         break;
@@ -156,7 +159,7 @@ static int sysctl_act_on_setting(char *setting)
                 goto end;
         }
 
-        if (option_mask32 & FLAG_WRITE) {
+        if (writing) {
 //TODO: procps 3.2.7 writes "value\n", note trailing "\n"
                 xwrite_str(fd, value);
                 close(fd);
@@ -238,23 +241,33 @@ static int sysctl_handle_preload_file(const char *filename)
 {
         char *token[2];
         parser_t *parser;
+        int parse_flags;
 
         parser = config_open(filename);
         /* Must do it _after_ config_open(): */
         xchdir("/proc/sys");
-        /* xchroot("/proc/sys") - if you are paranoid */
 
-//TODO: ';' is comment char too
-//TODO: comment may be only at line start. "var=1 #abc" - "1 #abc" is the value
-// (but _whitespace_ from ends should be trimmed first (and we do it right))
-//TODO: "var==1" is mishandled (must use "=1" as a value, but uses "1")
-// can it be fixed by removing PARSE_COLLAPSE bit?
-        while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) {
+        parse_flags = 0;
+        parse_flags &= ~PARSE_COLLAPSE;   // NO (var==val is not var=val) - treat consecutive delimiters as one
+        parse_flags &= ~PARSE_TRIM;       // NO - trim leading and trailing delimiters
+        parse_flags |= PARSE_GREEDY;      // YES - last token takes entire remainder of the line
+        parse_flags &= ~PARSE_MIN_DIE;    // NO - die if < min tokens found
+        parse_flags &= ~PARSE_EOL_COMMENTS; // NO (only first char) - comments are recognized even if not first char
+        parse_flags |= PARSE_ALT_COMMENTS;// YES - two comment chars: ';' and '#'
+        /* <space><tab><space>#comment is also comment, not strictly 1st char only */
+        parse_flags |= PARSE_WS_COMMENTS; // YES - comments are recognized even if there is whitespace before
+        while (config_read(parser, token, 2, 2, ";#=", parse_flags)) {
                 char *tp;
+
+                trim(token[1]);
+                tp = trim(token[0]);
                 sysctl_dots_to_slashes(token[0]);
-                tp = xasprintf("%s=%s", token[0], token[1]);
-                sysctl_act_recursive(tp);
-                free(tp);
+                /* ^^^converted in-place. tp still points to NUL */
+                /* now, add "=TOKEN1" */
+                *tp++ = '=';
+                overlapping_strcpy(tp, token[1]);
+
+                sysctl_act_on_setting(token[0]);
         }
         if (ENABLE_FEATURE_CLEAN_UP)
                 config_close(parser);
@@ -273,12 +286,19 @@ int sysctl_main(int argc UNUSED_PARAM, char **argv)
         option_mask32 = opt;
 
         if (opt & FLAG_PRELOAD_FILE) {
+                int cur_dir_fd;
                 option_mask32 |= FLAG_WRITE;
-                /* xchdir("/proc/sys") is inside */
-                return sysctl_handle_preload_file(*argv ? *argv : "/etc/sysctl.conf");
+                if (!*argv)
+                        *--argv = (char*)"/etc/sysctl.conf";
+                cur_dir_fd = xopen(".", O_RDONLY | O_DIRECTORY);
+                do {
+                        /* xchdir("/proc/sys") is inside */
+                        sysctl_handle_preload_file(*argv);
+                        xfchdir(cur_dir_fd); /* files can be relative, must restore cwd */
+                } while (*++argv);
+                return 0; /* procps-ng 3.3.10 does not flag parse errors */
         }
         xchdir("/proc/sys");
-        /* xchroot("/proc/sys") - if you are paranoid */
         if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) {
                 return sysctl_act_recursive(".");
         }
diff --git a/procps/top.c b/procps/top.c
index 015d1ab74..f97ded5d6 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -116,7 +116,6 @@
 //kbuild:lib-$(CONFIG_TOP) += top.o
 
 #include "libbb.h"
-#include "common_bufsiz.h"
 
 
 typedef struct top_status_t {
@@ -154,6 +153,8 @@ typedef int (*cmp_funcp)(top_status_t *P, top_status_t *Q);
 
 enum { SORT_DEPTH = 3 };
 
+/* Screens wider than this are unlikely */
+enum { LINE_BUF_SIZE = 512 - 64 };
 
 struct globals {
         top_status_t *top;
@@ -192,10 +193,9 @@ struct globals {
 #if ENABLE_FEATURE_TOP_INTERACTIVE
         char kbd_input[KEYCODE_BUFFER_SIZE];
 #endif
-        char line_buf[80];
-}; //FIX_ALIASING; - large code growth
-enum { LINE_BUF_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line_buf) };
-#define G (*(struct globals*)bb_common_bufsiz1)
+        char line_buf[LINE_BUF_SIZE];
+};
+#define G (*ptr_to_globals)
 #define top              (G.top               )
 #define ntop             (G.ntop              )
 #define sort_field       (G.sort_field        )
@@ -213,8 +213,7 @@ enum { LINE_BUF_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line_buf) };
 #define total_pcpu       (G.total_pcpu        )
 #define line_buf         (G.line_buf          )
 #define INIT_G() do { \
-        setup_common_bufsiz(); \
-        BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
         BUILD_BUG_ON(LINE_BUF_SIZE <= 80); \
 } while (0)
 
@@ -1110,15 +1109,14 @@ int top_main(int argc UNUSED_PARAM, char **argv)
 #endif
 
         /* all args are options; -n NUM */
-        opt_complementary = "-"; /* options can be specified w/o dash */
+        make_all_argv_opts(argv); /* options can be specified w/o dash */
         col = getopt32(argv, "d:n:b"IF_FEATURE_TOPMEM("m"), &str_interval, &str_iterations);
 #if ENABLE_FEATURE_TOPMEM
         if (col & OPT_m) /* -m (busybox specific) */
                 scan_mask = TOPMEM_MASK;
 #endif
         if (col & OPT_d) {
-                /* work around for "-d 1" -> "-d -1" done by getopt32
-                 * (opt_complementary == "-" does this) */
+                /* work around for "-d 1" -> "-d -1" done by make_all_argv_opts() */
                 if (str_interval[0] == '-')
                         str_interval++;
                 /* Need to limit it to not overflow poll timeout */
@@ -1148,6 +1146,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
         else {
                 /* Turn on unbuffered input; turn off echoing, ^C ^Z etc */
                 set_termios_to_raw(STDIN_FILENO, &initial_settings, TERMIOS_CLEAR_ISIG);
+                die_func = reset_term;
         }
 
         bb_signals(BB_FATAL_SIGS, sig_catcher);
diff --git a/procps/uptime.c b/procps/uptime.c
index 24b2b39df..b0ee8391b 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -27,7 +27,7 @@
 //config:       help
 //config:       Display the number of users currently logged on.
 
-//applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_UPTIME(APPLET_NOEXEC(uptime, uptime, BB_DIR_USR_BIN, BB_SUID_DROP, uptime))
 
 //kbuild:lib-$(CONFIG_UPTIME) += uptime.o
 
diff --git a/procps/watch.c b/procps/watch.c
index 2bb7cca90..6fc9f7db7 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -62,9 +62,9 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
         xopen("/dev/null", O_RDONLY);
 #endif
 
-        opt_complementary = "-1"; // at least one param; -n NUM
-        // "+": stop at first non-option (procps 3.x only)
-        opt = getopt32(argv, "+dtn:+", &period);
+        // "+": stop at first non-option (procps 3.x only); -n NUM
+        // at least one param
+        opt = getopt32(argv, "^+" "dtn:+" "\0" "-1", &period);
         argv += optind;
 
         // watch from both procps 2.x and 3.x does concatenation. Example:
diff --git a/runit/chpst.c b/runit/chpst.c
index 3a2f9e616..3ecb85cba 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -59,12 +59,12 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //config:       help
 //config:       Sets soft resource limits as specified by options
 
-//applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP))
-//                    APPLET_ODDNAME:name       main   location        suid_type     help
-//applet:IF_ENVDIR(   APPLET_ODDNAME(envdir,    chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
-//applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
-//applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
-//applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
+//applet:IF_CHPST(    APPLET_NOEXEC(chpst,     chpst, BB_DIR_USR_BIN, BB_SUID_DROP, chpst))
+//                    APPLET_NOEXEC:name       main   location        suid_type     help
+//applet:IF_ENVDIR(   APPLET_NOEXEC(envdir,    chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
+//applet:IF_ENVUIDGID(APPLET_NOEXEC(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
+//applet:IF_SETUIDGID(APPLET_NOEXEC(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
+//applet:IF_SOFTLIMIT(APPLET_NOEXEC(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
 
 //kbuild:lib-$(CONFIG_CHPST) += chpst.o
 //kbuild:lib-$(CONFIG_ENVDIR) += chpst.o
@@ -301,9 +301,10 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
                 // FIXME: can we live with int-sized limits?
                 // can we live with 40000 days?
                 // if yes -> getopt converts strings to numbers for us
-                opt_complementary = "-1";
-                opt = getopt32(argv, "+a:+c:+d:+f:+l:+m:+o:+p:+r:+s:+t:+u:U:e:"
-                        IF_CHPST("/:n:vP012"),
+                opt = getopt32(argv, "^+"
+                        "a:+c:+d:+f:+l:+m:+o:+p:+r:+s:+t:+u:U:e:"
+                        IF_CHPST("/:n:vP012")
+                        "\0" "-1",
                         &limita, &limitc, &limitd, &limitf, &limitl,
                         &limitm, &limito, &limitp, &limitr, &limits, &limitt,
                         &set_user, &set_user, &env_dir
diff --git a/runit/runit_lib.h b/runit/runit_lib.h
index c36ea4ca5..c54561616 100644
--- a/runit/runit_lib.h
+++ b/runit/runit_lib.h
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
diff --git a/runit/runsv.c b/runit/runsv.c
index ad7d82cb8..a67280b4b 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index b4f5c303b..11ab40abf 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -248,10 +248,9 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "-1";
         opt_s_argv[0] = NULL;
         opt_s_argv[2] = NULL;
-        getopt32(argv, "Ps:", &opt_s_argv[0]);
+        getopt32(argv, "^" "Ps:" "\0" "-1", &opt_s_argv[0]);
         argv += optind;
 
         i_am_init = (getpid() == 1);
diff --git a/runit/sv.c b/runit/sv.c
index 2d5b466bf..1d0809be8 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -175,8 +175,8 @@ Exit Codes
 //config:       svc controls the state of services monitored by the runsv supervisor.
 //config:       It is comaptible with daemontools command with the same name.
 
-//applet:IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP))
-//applet:IF_SVC(APPLET(svc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_SV( APPLET_NOEXEC(sv,  sv,  BB_DIR_USR_BIN, BB_SUID_DROP, sv ))
+//applet:IF_SVC(APPLET_NOEXEC(svc, svc, BB_DIR_USR_BIN, BB_SUID_DROP, svc))
 
 //kbuild:lib-$(CONFIG_SV) += sv.o
 //kbuild:lib-$(CONFIG_SVC) += sv.o
@@ -193,7 +193,7 @@ struct globals {
 /* "Bernstein" time format: unix + 0x400000000000000aULL */
         uint64_t tstart, tnow;
         svstatus_t svstatus;
-        unsigned islog;
+        smallint islog;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define acts         (G.acts        )
@@ -203,7 +203,11 @@ struct globals {
 #define tnow         (G.tnow        )
 #define svstatus     (G.svstatus    )
 #define islog        (G.islog       )
-#define INIT_G() do { setup_common_bufsiz(); } while (0)
+#define INIT_G() do { \
+        setup_common_bufsiz(); \
+        /* need to zero out, svc calls sv() repeatedly */ \
+        memset(&G, 0, sizeof(G)); \
+} while (0)
 
 
 #define str_equal(s,t) (strcmp((s), (t)) == 0)
@@ -502,8 +506,9 @@ static int sv(char **argv)
         x = getenv("SVWAIT");
         if (x) waitsec = xatou(x);
 
-        opt_complementary = "vv"; /* -w N, -v is a counter */
-        getopt32(argv, "w:+v", &waitsec, &verbose);
+        getopt32(argv, "^" "w:+v" "\0" "vv" /* -w N, -v is a counter */,
+                        &waitsec, &verbose
+        );
         argv += optind;
         action = *argv++;
         if (!action || !*argv) bb_show_usage();
@@ -701,8 +706,6 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         const char *optstring;
         unsigned opts;
 
-        INIT_G();
-
         optstring = "udopchaitkx";
         opts = getopt32(argv, optstring);
         argv += optind;
@@ -718,15 +721,16 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = command;
         command[1] = '\0';
 
-        /* getopt32() was already called:
-         * reset the libc getopt() function, which keeps internal state.
-         */
-        GETOPT_RESET();
-
         do {
                 if (opts & 1) {
                         int r;
+
                         command[0] = *optstring;
+
+                        /* getopt() was already called by getopt32():
+                         * reset the libc getopt() function's internal state.
+                         */
+                        GETOPT_RESET();
                         r = sv(argv);
                         if (r)
                                 return 1;
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 8dbf67106..739483356 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -1037,9 +1037,10 @@ int svlogd_main(int argc, char **argv)
 
         INIT_G();
 
-        opt_complementary = "tt:vv";
-        opt = getopt32(argv, "r:R:l:b:tv",
-                        &r, &replace, &l, &b, &timestamp, &verbose);
+        opt = getopt32(argv, "^"
+                        "r:R:l:b:tv" "\0" "tt:vv",
+                        &r, &replace, &l, &b, &timestamp, &verbose
+        );
         if (opt & 1) { // -r
                 repl = r[0];
                 if (!repl || r[1])
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index 0eced2982..f155108d7 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -115,6 +115,9 @@ lib-y:=
 include debianutils/Kbuild
 lib-all-y += $(patsubst %,debianutils/%,$(sort $(lib-y)))
 lib-y:=
+include klibc-utils/Kbuild
+lib-all-y += $(patsubst %,klibc-utils/%,$(sort $(lib-y)))
+lib-y:=
 include runit/Kbuild
 lib-all-y += $(patsubst %,runit/%,$(sort $(lib-y)))
 lib-y:=
diff --git a/scripts/echo.c b/scripts/echo.c
index cb207ae05..8c6b409d3 100644
--- a/scripts/echo.c
+++ b/scripts/echo.c
@@ -214,7 +214,7 @@ int 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/selinux/chcon.c b/selinux/chcon.c
index ae87fb554..3ddb2dd46 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -13,11 +13,6 @@
 //config:       depends on SELINUX
 //config:       help
 //config:       Enable support to change the security context of file.
-//config:
-//config:config FEATURE_CHCON_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on CHCON && LONG_OPTS
 
 //applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -26,34 +21,24 @@
 //usage:#define chcon_trivial_usage
 //usage:       "[OPTIONS] CONTEXT FILE..."
 //usage:       "\n      chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..."
-//usage:        IF_FEATURE_CHCON_LONG_OPTIONS(
+//usage:        IF_LONG_OPTS(
 //usage:       "\n      chcon [OPTIONS] --reference=RFILE FILE..."
 //usage:        )
+//usage:
 //usage:#define chcon_full_usage "\n\n"
 //usage:       "Change the security context of each FILE to CONTEXT\n"
-//usage:        IF_FEATURE_CHCON_LONG_OPTIONS(
-//usage:     "\n        -v,--verbose            Verbose"
-//usage:     "\n        -c,--changes            Report changes made"
-//usage:     "\n        -h,--no-dereference     Affect symlinks instead of their targets"
-//usage:     "\n        -f,--silent,--quiet     Suppress most error messages"
-//usage:     "\n        --reference RFILE       Use RFILE's group instead of using a CONTEXT value"
-//usage:     "\n        -u,--user USER          Set user/role/type/range in the target"
-//usage:     "\n        -r,--role ROLE          security context"
-//usage:     "\n        -t,--type TYPE"
-//usage:     "\n        -l,--range RANGE"
-//usage:     "\n        -R,--recursive          Recurse"
-//usage:        )
-//usage:        IF_NOT_FEATURE_CHCON_LONG_OPTIONS(
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -c      Report changes made"
 //usage:     "\n        -h      Affect symlinks instead of their targets"
 //usage:     "\n        -f      Suppress most error messages"
+//usage:        IF_LONG_OPTS(
+//usage:     "\n        --reference RFILE Use RFILE's group instead of using a CONTEXT value"
+//usage:        )
 //usage:     "\n        -u USER Set user/role/type/range in the target security context"
 //usage:     "\n        -r ROLE"
 //usage:     "\n        -t TYPE"
 //usage:     "\n        -l RNG"
 //usage:     "\n        -R      Recurse"
-//usage:        )
 
 #include <selinux/context.h>
 
@@ -68,7 +53,7 @@
 #define OPT_TYPE                (1<<6)  /* 't' */
 #define OPT_RANGE               (1<<7)  /* 'l' */
 #define OPT_VERBOSE             (1<<8)  /* 'v' */
-#define OPT_REFERENCE           ((1<<9) * ENABLE_FEATURE_CHCON_LONG_OPTIONS)
+#define OPT_REFERENCE           ((1<<9) * ENABLE_LONG_OPTS)
 #define OPT_COMPONENT_SPECIFIED (OPT_USER | OPT_ROLE | OPT_TYPE | OPT_RANGE)
 
 static char *user = NULL;
@@ -157,7 +142,7 @@ skip:
         return rc;
 }
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
 static const char chcon_longopts[] ALIGN1 =
         "recursive\0"      No_argument       "R"
         "changes\0"        No_argument       "c"
@@ -180,20 +165,21 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
         char *fname;
         int i, errors = 0;
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
-        applet_long_options = chcon_longopts;
-#endif
-        opt_complementary = "-1"  /* at least 1 param */
-                ":?"  /* error if exclusivity constraints are violated */
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+        getopt32long(argv, "^"
+                "Rchfu:r:t:l:v"
+                "\0"
+                "-1" /* at least 1 arg */
+                ":?" /* error if exclusivity constraints are violated */
+#if ENABLE_LONG_OPTS
                 ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
 #endif
-                ":f--v:v--f";  /* 'verbose' and 'quiet' are exclusive */
-        getopt32(argv, "Rchfu:r:t:l:v",
-                &user, &role, &type, &range, &reference_file);
+                ":f--v:v--f"  /* 'verbose' and 'quiet' are exclusive */
+                , chcon_longopts,
+                &user, &role, &type, &range, &reference_file
+        );
         argv += optind;
 
-#if ENABLE_FEATURE_CHCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
         if (option_mask32 & OPT_REFERENCE) {
                 /* FIXME: lgetfilecon() should be used when '-h' is specified.
                  * But current implementation follows the original one. */
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c
index 3388d0857..e57120d3b 100644
--- a/selinux/matchpathcon.c
+++ b/selinux/matchpathcon.c
@@ -58,9 +58,13 @@ int matchpathcon_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
         char *fcontext, *prefix, *path;
 
-        opt_complementary = "-1" /* at least one param reqd */
-                ":?:f--p:p--f"; /* mutually exclusive */
-        opts = getopt32(argv, "nNf:p:V", &fcontext, &prefix);
+        opts = getopt32(argv, "^"
+                        "nNf:p:V"
+                        "\0"
+                        "-1" /* at least one param reqd */
+                        ":?:f--p:p--f" /* mutually exclusive */
+                        , &fcontext, &prefix
+        );
         argv += optind;
 
         if (opts & OPT_NOT_TRANS) {
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 09082d6c2..a5a394427 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -34,11 +34,6 @@
 //config:       depends on SELINUX
 //config:       help
 //config:       Enable support to run command in specified security context.
-//config:
-//config:config FEATURE_RUNCON_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on RUNCON && LONG_OPTS
 
 //applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
 
@@ -50,20 +45,11 @@
 //usage:#define runcon_full_usage "\n\n"
 //usage:       "Run PROG in a different security context\n"
 //usage:     "\n        CONTEXT         Complete security context\n"
-//usage:        IF_FEATURE_RUNCON_LONG_OPTIONS(
-//usage:     "\n        -c,--compute    Compute process transition context before modifying"
-//usage:     "\n        -t,--type TYPE  Type (for same role as parent)"
-//usage:     "\n        -u,--user USER  User identity"
-//usage:     "\n        -r,--role ROLE  Role"
-//usage:     "\n        -l,--range RNG  Levelrange"
-//usage:        )
-//usage:        IF_NOT_FEATURE_RUNCON_LONG_OPTIONS(
 //usage:     "\n        -c      Compute process transition context before modifying"
 //usage:     "\n        -t TYPE Type (for same role as parent)"
 //usage:     "\n        -u USER User identity"
 //usage:     "\n        -r ROLE Role"
 //usage:     "\n        -l RNG  Levelrange"
-//usage:        )
 
 #include <selinux/context.h>
 /* from deprecated <selinux/flask.h>: */
@@ -108,7 +94,7 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
         return con;
 }
 
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
 static const char runcon_longopts[] ALIGN1 =
         "user\0"    Required_argument "u"
         "role\0"    Required_argument "r"
@@ -140,11 +126,12 @@ int runcon_main(int argc UNUSED_PARAM, char **argv)
 
         selinux_or_die();
 
-#if ENABLE_FEATURE_RUNCON_LONG_OPTIONS
-        applet_long_options = runcon_longopts;
-#endif
-        opt_complementary = "-1";
-        opts = getopt32(argv, "r:t:u:l:ch", &role, &type, &user, &range);
+        opts = getopt32long(argv, "^"
+                        "r:t:u:l:ch"
+                        "\0" "-1",
+                        runcon_longopts,
+                        &role, &type, &user, &range
+        );
         argv += optind;
 
         if (!(opts & OPTS_CONTEXT_COMPONENT)) {
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index daf4b223b..6954aca70 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -167,8 +167,7 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv)
         const char *pol_path;
         int rc;
 
-        opt_complementary = "?0";  /* no arguments are required. */
-        opts = getopt32(argv, "vb");
+        opts = getopt32(argv, "^" "vb" "\0" "=0"/*no arguments*/);
 
         /* SELinux status: line */
         rc = is_selinux_enabled();
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 01106bd67..8da47d274 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -610,17 +610,23 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
 
         set_matchpathcon_flags(matchpathcon_flags);
 
-        opt_complementary = "vv:v--p:p--v:v--q:q--v";
         /* Option order must match OPT_x definitions! */
         if (applet_name[0] == 'r') { /* restorecon */
-                flags = getopt32(argv, "de:*f:ilnpqrsvo:FWR",
-                        &exclude_dir, &input_filename, &out_filename, &verbose);
+                flags = getopt32(argv, "^"
+                        "de:*f:ilnpqrsvo:FWR",
+                        "\0" "vv:v--p:p--v:v--q:q--v";
+                        &exclude_dir, &input_filename, &out_filename,
+                        &verbose
+                );
         } else { /* setfiles */
-                flags = getopt32(argv, "de:*f:ilnpqr:svo:FW"
-                                IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
+                flags = getopt32(argv, "^"
+                        "de:*f:ilnpqr:svo:FW"
+                        IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
+                        "\0" "vv:v--p:p--v:v--q:q--v";
                         &exclude_dir, &input_filename, &rootpath, &out_filename,
-                                IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
-                        &verbose);
+                        IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
+                        &verbose
+                );
         }
         argv += optind;
 
@@ -673,7 +679,7 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
                         bb_show_usage();
                 xstat(argv[0], &sb);
                 if (!S_ISREG(sb.st_mode)) {
-                        bb_error_msg_and_die("spec file %s is not a regular file", argv[0]);
+                        bb_error_msg_and_die("'%s' is not a regular file", argv[0]);
                 }
                 /* Load the file contexts configuration and check it. */
                 rc = matchpathcon_init(argv[0]);
diff --git a/shell/ash.c b/shell/ash.c
index 6a572cbc3..ac1ae05fc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -215,6 +215,9 @@
 #define    BASH_PIPEFAIL        ENABLE_ASH_BASH_COMPAT
 #define    BASH_HOSTNAME_VAR    ENABLE_ASH_BASH_COMPAT
 #define    BASH_SHLVL_VAR       ENABLE_ASH_BASH_COMPAT
+#define    BASH_XTRACEFD        ENABLE_ASH_BASH_COMPAT
+#define    BASH_READ_D          ENABLE_ASH_BASH_COMPAT
+#define IF_BASH_READ_D              IF_ASH_BASH_COMPAT
 
 #if defined(__ANDROID_API__) && __ANDROID_API__ <= 24
 /* Bionic at least up to version 24 has no glob() */
@@ -452,7 +455,7 @@ struct globals_misc {
 #define S_DFL      1            /* default signal handling (SIG_DFL) */
 #define S_CATCH    2            /* signal is caught */
 #define S_IGN      3            /* signal is ignored (SIG_IGN) */
-#define S_HARD_IGN 4            /* signal is ignored permanently */
+#define S_HARD_IGN 4            /* signal is ignored permanently (it was SIG_IGN on entry to shell) */
 
         /* indicates specified signal received */
         uint8_t gotsig[NSIG - 1]; /* offset by 1: "signal" 0 is meaningless */
@@ -1313,6 +1316,10 @@ struct strpush {
         int unget;
 };
 
+/*
+ * The parsefile structure pointed to by the global variable parsefile
+ * contains information about the current file being read.
+ */
 struct parsefile {
         struct parsefile *prev; /* preceding file on stack */
         int linno;              /* current line */
@@ -1986,10 +1993,6 @@ nextopt(const char *optstring)
 
 /* ============ Shell variables */
 
-/*
- * The parsefile structure pointed to by the global variable parsefile
- * contains information about the current file being read.
- */
 struct shparam {
         int nparam;             /* # of positional parameters (without $0) */
 #if ENABLE_ASH_GETOPTS
@@ -2183,7 +2186,9 @@ extern struct globals_var *const ash_ptr_to_globals_var;
 static void FAST_FUNC
 getoptsreset(const char *value)
 {
-        shellparam.optind = number(value) ?: 1;
+        shellparam.optind = 1;
+        if (is_number(value))
+                shellparam.optind = number(value) ?: 1;
         shellparam.optoff = -1;
 }
 #endif
@@ -3751,9 +3756,12 @@ setsignal(int signo)
 #endif
                 }
         }
-//TODO: if !rootshell, we reset SIGQUIT to DFL,
-//whereas we have to restore it to what shell got on entry
-//from the parent. See comment above
+        /* if !rootshell, we reset SIGQUIT to DFL,
+         * whereas we have to restore it to what shell got on entry.
+         * This is handled by the fact that if signal was IGNored on entry,
+         * then cur_act is S_HARD_IGN and we never change its sigaction
+         * (see code below).
+         */
 
         if (signo == SIGCHLD)
                 new_act = S_CATCH;
@@ -3777,10 +3785,18 @@ setsignal(int signo)
                                 cur_act = S_IGN;   /* don't hard ignore these */
                         }
                 }
+                if (act.sa_handler == SIG_DFL && new_act == S_DFL) {
+                        /* installing SIG_DFL over SIG_DFL is a no-op */
+                        /* saves one sigaction call in each "sh -c SCRIPT" invocation */
+                        *t = S_DFL;
+                        return;
+                }
         }
         if (cur_act == S_HARD_IGN || cur_act == new_act)
                 return;
 
+        *t = new_act;
+
         act.sa_handler = SIG_DFL;
         switch (new_act) {
         case S_CATCH:
@@ -3790,16 +3806,13 @@ setsignal(int signo)
                 act.sa_handler = SIG_IGN;
                 break;
         }
-
         /* flags and mask matter only if !DFL and !IGN, but we do it
          * for all cases for more deterministic behavior:
          */
-        act.sa_flags = 0;
+        act.sa_flags = 0; //TODO: why not SA_RESTART?
         sigfillset(&act.sa_mask);
 
         sigaction_set(signo, &act);
-
-        *t = new_act;
 }
 #else
 #define setsignal(s)
@@ -5915,12 +5928,10 @@ static void
 redirect(union node *redir, int flags)
 {
         struct redirtab *sv;
-        int sv_pos;
 
         if (!redir)
                 return;
 
-        sv_pos = 0;
         sv = NULL;
         INT_OFF;
         if (flags & REDIR_PUSH)
@@ -8076,8 +8087,9 @@ static int
 patmatch(char *pattern, const char *string)
 {
         char *p = preglob(pattern, 0);
-        //bb_error_msg("fnmatch(pattern:'%s',str:'%s')", p, string);
-        return pmatch(p, string);
+        int r = pmatch(p, string);
+        //bb_error_msg("!fnmatch(pattern:'%s',str:'%s',0):%d", p, string, r);
+        return r;
 }
 
 /*
@@ -8179,7 +8191,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
                         while (*envp)
                                 putenv(*envp++);
                         popredir(/*drop:*/ 1);
-                        run_applet_no_and_exit(applet_no, cmd, argv);
+                        run_noexec_applet_and_exit(applet_no, cmd, argv);
                 }
                 /* re-exec ourselves with the new arguments */
                 execve(bb_busybox_exec_path, argv, envp);
@@ -10250,6 +10262,15 @@ evalcommand(union node *cmd, int flags)
         expredir(cmd->ncmd.redirect);
         redir_stop = pushredir(cmd->ncmd.redirect);
         preverrout_fd = 2;
+        if (BASH_XTRACEFD && xflag) {
+                /* NB: bash closes fd == $BASH_XTRACEFD when it is changed.
+                 * we do not emulate this. We only use its value.
+                 */
+                const char *xtracefd = lookupvar("BASH_XTRACEFD");
+                if (xtracefd && is_number(xtracefd))
+                        preverrout_fd = atoi(xtracefd);
+
+        }
         status = redirectsafe(cmd->ncmd.redirect, REDIR_PUSH | REDIR_SAVEFD2);
 
         path = vpath.var_text;
@@ -10383,12 +10404,30 @@ evalcommand(union node *cmd, int flags)
 #endif
                 ) {
                         listsetvar(varlist.list, VEXPORT|VSTACK);
-                        /* run <applet>_main() */
+                        /*
+                         * Run <applet>_main().
+                         * Signals (^C) can't interrupt here.
+                         * Otherwise we can mangle stdio or malloc internal state.
+                         * This makes applets which can run for a long time
+                         * and/or wait for user input ineligible for NOFORK:
+                         * for example, "yes" or "rm" (rm -i waits for input).
+                         */
+                        INT_OFF;
                         status = run_nofork_applet(applet_no, argv);
+                        /*
+                         * Try enabling NOFORK for "yes" applet.
+                         * ^C _will_ stop it (write returns EINTR),
+                         * but this causes stdout FILE to be stuck
+                         * and needing clearerr(). What if other applets
+                         * also can get EINTRs? Do we need to switch
+                         * our signals to SA_RESTART?
+                         */
+                        /*clearerr(stdout);*/
+                        INT_ON;
                         break;
                 }
 #endif
-                /* Can we avoid forking off? For example, very last command
+                /* Can we avoid forking? For example, very last command
                  * in a script or a subshell does not need forking,
                  * we can just exec it.
                  */
@@ -10674,8 +10713,8 @@ preadfd(void)
         if (!iflag || g_parsefile->pf_fd != STDIN_FILENO)
                 nr = nonblock_immune_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
         else {
-                int timeout = -1;
 # if ENABLE_ASH_IDLE_TIMEOUT
+                int timeout = -1;
                 if (iflag) {
                         const char *tmout_var = lookupvar("TMOUT");
                         if (tmout_var) {
@@ -10684,12 +10723,13 @@ preadfd(void)
                                         timeout = -1;
                         }
                 }
+                line_input_state->timeout = timeout;
 # endif
 # if ENABLE_FEATURE_TAB_COMPLETION
                 line_input_state->path_lookup = pathval();
 # endif
                 reinit_unicode_for_ash();
-                nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ, timeout);
+                nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ);
                 if (nr == 0) {
                         /* ^C pressed, "convert" to SIGINT */
                         write(STDOUT_FILENO, "^C", 2);
@@ -11399,6 +11439,7 @@ getopts(char *optstr, char *optvar, char **optfirst)
                 p = *optnext;
                 if (p == NULL || *p != '-' || *++p == '\0') {
  atend:
+                        unsetvar("OPTARG");
                         p = NULL;
                         done = 1;
                         goto out;
@@ -11411,7 +11452,11 @@ getopts(char *optstr, char *optvar, char **optfirst)
         c = *p++;
         for (q = optstr; *q != c;) {
                 if (*q == '\0') {
-                        if (optstr[0] == ':') {
+                        /* OPTERR is a bashism */
+                        const char *cp = lookupvar("OPTERR");
+                        if ((cp && LONE_CHAR(cp, '0'))
+                         || (optstr[0] == ':')
+                        ) {
                                 sbuf[0] = c;
                                 /*sbuf[1] = '\0'; - already is */
                                 setvar0("OPTARG", sbuf);
@@ -11428,7 +11473,11 @@ getopts(char *optstr, char *optvar, char **optfirst)
 
         if (*++q == ':') {
                 if (*p == '\0' && (p = *optnext) == NULL) {
-                        if (optstr[0] == ':') {
+                        /* OPTERR is a bashism */
+                        const char *cp = lookupvar("OPTERR");
+                        if ((cp && LONE_CHAR(cp, '0'))
+                         || (optstr[0] == ':')
+                        ) {
                                 sbuf[0] = c;
                                 /*sbuf[1] = '\0'; - already is */
                                 setvar0("OPTARG", sbuf);
@@ -12571,7 +12620,7 @@ parsesub: {
                                 STPUTC(c, out);
                                 c = pgetc_eatbnl();
                         } while (isdigit(c));
-                } else if (is_special(c)) {
+                } else {
                         /* $[{[#]]<specialchar>[}] */
                         int cc = c;
 
@@ -12589,10 +12638,16 @@ parsesub: {
                                         cc = '#';
                                 }
                         }
+
+                        if (!is_special(cc)) {
+                                if (subtype == VSLENGTH)
+                                        subtype = 0;
+                                goto badsub;
+                        }
+
                         USTPUTC(cc, out);
-                } else {
-                        goto badsub;
                 }
+
                 if (c != '}' && subtype == VSLENGTH) {
                         /* ${#VAR didn't end with } */
                         goto badsub;
@@ -13850,21 +13905,23 @@ static const unsigned char timescmd_str[] ALIGN1 = {
 static int FAST_FUNC
 timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        unsigned long clk_tck, s, t;
+        unsigned clk_tck;
         const unsigned char *p;
         struct tms buf;
 
         clk_tck = bb_clk_tck();
-        times(&buf);
 
+        times(&buf);
         p = timescmd_str;
         do {
+                unsigned sec, frac;
+                unsigned long t;
                 t = *(clock_t *)(((char *) &buf) + p[1]);
-                s = t / clk_tck;
-                t = t % clk_tck;
-                out1fmt("%lum%lu.%03lus%c",
-                        s / 60, s % 60,
-                        (t * 1000) / clk_tck,
+                sec = t / clk_tck;
+                frac = t % clk_tck;
+                out1fmt("%um%u.%03us%c",
+                        sec / 60, sec % 60,
+                        (frac * 1000) / clk_tck,
                         p[0]);
                 p += 2;
         } while (*p);
@@ -13903,10 +13960,10 @@ letcmd(int argc UNUSED_PARAM, char **argv)
  *      -p PROMPT       Display PROMPT on stderr (if input is from tty)
  *      -t SECONDS      Timeout after SECONDS (tty or pipe only)
  *      -u FD           Read from given FD instead of fd 0
+ *      -d DELIM        End on DELIM char, not newline
  * This uses unbuffered input, which may be avoidable in some cases.
  * TODO: bash also has:
  *      -a ARRAY        Read into array[0],[1],etc
- *      -d DELIM        End on DELIM char, not newline
  *      -e              Use line editing (tty only)
  */
 static int FAST_FUNC
@@ -13916,11 +13973,12 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         char *opt_p = NULL;
         char *opt_t = NULL;
         char *opt_u = NULL;
+        char *opt_d = NULL; /* optimized out if !BASH */
         int read_flags = 0;
         const char *r;
         int i;
 
-        while ((i = nextopt("p:u:rt:n:s")) != '\0') {
+        while ((i = nextopt("p:u:rt:n:sd:")) != '\0') {
                 switch (i) {
                 case 'p':
                         opt_p = optionarg;
@@ -13940,6 +13998,11 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 case 'u':
                         opt_u = optionarg;
                         break;
+#if BASH_READ_D
+                case 'd':
+                        opt_d = optionarg;
+                        break;
+#endif
                 default:
                         break;
                 }
@@ -13957,12 +14020,15 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 opt_n,
                 opt_p,
                 opt_t,
-                opt_u
+                opt_u,
+                opt_d
         );
         INT_ON;
 
         if ((uintptr_t)r == 1 && errno == EINTR) {
-                /* to get SIGCHLD: sleep 1 & read x; echo $x */
+                /* To get SIGCHLD: sleep 1 & read x; echo $x
+                 * Correct behavior is to not exit "read"
+                 */
                 if (pending_sig == 0)
                         goto again;
         }
@@ -14077,7 +14143,8 @@ exitshell(void)
         /* NOTREACHED */
 }
 
-static void
+/* Don't inline: conserve stack of caller from having our locals too */
+static NOINLINE void
 #if ENABLE_PLATFORM_MINGW32
 init(int xp)
 #else
@@ -14086,8 +14153,9 @@ init(void)
 {
         /* we will never free this */
         basepf.next_to_pgetc = basepf.buf = ckmalloc(IBUFSIZ);
+        basepf.linno = 1;
 
-        sigmode[SIGCHLD - 1] = S_DFL;
+        sigmode[SIGCHLD - 1] = S_DFL; /* ensure we install handler even if it is SIG_IGNed */
         setsignal(SIGCHLD);
 
         /* bash re-enables SIGHUP which is SIG_IGNed on entry.
@@ -14098,7 +14166,6 @@ init(void)
         {
                 char **envp;
                 const char *p;
-                struct stat st1, st2;
 
                 initvar();
 
@@ -14204,6 +14271,7 @@ init(void)
 #endif
                 p = lookupvar("PWD");
                 if (p) {
+                        struct stat st1, st2;
                         if (p[0] != '/' || stat(p, &st1) || stat(".", &st2)
                          || st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino
                         ) {
@@ -15161,7 +15229,7 @@ sticky_free(void *base)
  *    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/shell/ash_LINENO.patch b/shell/ash_LINENO.patch
new file mode 100644
index 000000000..a71549d6a
--- /dev/null
+++ b/shell/ash_LINENO.patch
@@ -0,0 +1,498 @@
+This patch is a backport from dash of the combination of:
+        [SHELL] Add preliminary LINENO support
+        [VAR] Fix varinit ordering that broke fc
+        [SHELL] Improve LINENO support
+
+Applies cleanly on top of:
+        commit 9832bbaba966f0e52e183f10cd93fad7f8f643fe
+        Date: Tue Aug 15 15:44:41 2017 +0200
+
+Testsuite needs some tweaks (line numbers in some messages change).
+
+Unfortunately, it is somewhat big:
+
+function                                             old     new   delta
+parse_command                                       1581    1658     +77
+calcsize                                             203     272     +69
+copynode                                             195     257     +62
+lookupvar                                             59     108     +49
+evaltree                                             494     534     +40
+evalfor                                              152     187     +35
+evalcase                                             278     313     +35
+evalcommand                                         1547    1581     +34
+evalsubshell                                         169     199     +30
+linenovar                                              -      22     +22
+raise_error_syntax                                    11      29     +18
+evalfun                                              266     280     +14
+varinit_data                                          96     108     +12
+cmdtxt                                               626     631      +5
+lineno                                                 -       4      +4
+funcline                                               -       4      +4
+ash_vmsg                                             144     141      -3
+startlinno                                             4       -      -4
+funcnest                                               4       -      -4
+xxreadtoken                                          272     259     -13
+readtoken1                                          2635    2594     -41
+------------------------------------------------------------------------------
+(add/remove: 3/2 grow/shrink: 13/3 up/down: 510/-65)          Total: 445 bytes
+   text    data     bss     dec     hex filename
+ 912030     563    5844  918437   e03a5 busybox_old
+ 912473     587    5844  918904   e0578 busybox_unstripped
+
+diff --git a/shell/ash.c b/shell/ash.c
+index 703802f..93a3814 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -312,6 +312,8 @@ struct globals_misc {
+        /* shell level: 0 for the main shell, 1 for its children, and so on */
+        int shlvl;
+ #define rootshell (!shlvl)
++       int errlinno;
++
+        char *minusc;  /* argument to -c option */
+ 
+        char *curdir; // = nullstr;     /* current working directory */
+@@ -389,6 +391,7 @@ extern struct globals_misc *const ash_ptr_to_globals_misc;
+ #define job_warning       (G_misc.job_warning)
+ #define rootpid     (G_misc.rootpid    )
+ #define shlvl       (G_misc.shlvl      )
++#define errlinno    (G_misc.errlinno   )
+ #define minusc      (G_misc.minusc     )
+ #define curdir      (G_misc.curdir     )
+ #define physdir     (G_misc.physdir    )
+@@ -723,6 +726,7 @@ union node;
+ 
+ struct ncmd {
+        smallint type; /* Nxxxx */
++       int linno;
+        union node *assign;
+        union node *args;
+        union node *redirect;
+@@ -736,6 +740,7 @@ struct npipe {
+ 
+ struct nredir {
+        smallint type;
++       int linno;
+        union node *n;
+        union node *redirect;
+ };
+@@ -755,6 +760,7 @@ struct nif {
+ 
+ struct nfor {
+        smallint type;
++       int linno;
+        union node *args;
+        union node *body;
+        char *var;
+@@ -762,6 +768,7 @@ struct nfor {
+ 
+ struct ncase {
+        smallint type;
++       int linno;
+        union node *expr;
+        union node *cases;
+ };
+@@ -773,6 +780,13 @@ struct nclist {
+        union node *body;
+ };
+ 
++struct ndefun {
++       smallint type;
++       int linno;
++       char *text;
++       union node *body;
++};
++
+ struct narg {
+        smallint type;
+        union node *next;
+@@ -824,6 +838,7 @@ union node {
+        struct nfor nfor;
+        struct ncase ncase;
+        struct nclist nclist;
++       struct ndefun ndefun;
+        struct narg narg;
+        struct nfile nfile;
+        struct ndup ndup;
+@@ -1253,7 +1268,6 @@ struct parsefile {
+ 
+ static struct parsefile basepf;        /* top level input file */
+ static struct parsefile *g_parsefile = &basepf;  /* current input file */
+-static int startlinno;                 /* line # where last token started */
+ static char *commandname;              /* currently executing command */
+ 
+ 
+@@ -1267,7 +1281,7 @@ ash_vmsg(const char *msg, va_list ap)
+                if (strcmp(arg0, commandname))
+                        fprintf(stderr, "%s: ", commandname);
+                if (!iflag || g_parsefile->pf_fd > 0)
+-                       fprintf(stderr, "line %d: ", startlinno);
++                       fprintf(stderr, "line %d: ", errlinno);
+        }
+        vfprintf(stderr, msg, ap);
+        newline_and_flush(stderr);
+@@ -1327,6 +1341,7 @@ static void raise_error_syntax(const char *) NORETURN;
+ static void
+ raise_error_syntax(const char *msg)
+ {
++       errlinno = g_parsefile->linno;
+        ash_msg_and_raise_error("syntax error: %s", msg);
+        /* NOTREACHED */
+ }
+@@ -1993,6 +2008,9 @@ static void changepath(const char *) FAST_FUNC;
+ static void change_random(const char *) FAST_FUNC;
+ #endif
+ 
++static int lineno;
++static char linenovar[sizeof("LINENO=%d") + sizeof(int)*3] = "LINENO=";
++
+ static const struct {
+        int flags;
+        const char *var_text;
+@@ -2014,6 +2032,7 @@ static const struct {
+ #if ENABLE_ASH_GETOPTS
+        { VSTRFIXED|VTEXTFIXED       , defoptindvar, getoptsreset    },
+ #endif
++       { VSTRFIXED|VTEXTFIXED       , linenovar   , NULL            },
+ #if ENABLE_ASH_RANDOM_SUPPORT
+        { VSTRFIXED|VTEXTFIXED|VUNSET|VDYNAMIC, "RANDOM", change_random },
+ #endif
+@@ -2066,12 +2085,14 @@ extern struct globals_var *const ash_ptr_to_globals_var;
+ #define vps4      (&vps2)[1]
+ #if ENABLE_ASH_GETOPTS
+ # define voptind  (&vps4)[1]
++# define vlineno  (&voptind)[1]
+ # if ENABLE_ASH_RANDOM_SUPPORT
+-#  define vrandom (&voptind)[1]
++#  define vrandom (&vlineno)[1]
+ # endif
+ #else
++# define vlineno  (&vps4)[1]
+ # if ENABLE_ASH_RANDOM_SUPPORT
+-#  define vrandom (&vps4)[1]
++#  define vrandom (&vlineno)[1]
+ # endif
+ #endif
+ 
+@@ -2209,8 +2230,12 @@ lookupvar(const char *name)
+                if (v->flags & VDYNAMIC)
+                        v->var_func(NULL);
+ #endif
+-               if (!(v->flags & VUNSET))
++               if (!(v->flags & VUNSET)) {
++                       if (v == &vlineno && v->var_text == linenovar) {
++                               fmtstr(linenovar+7, sizeof(linenovar)-7, "%d", lineno);
++                       }
+                        return var_end(v->var_text);
++               }
+        }
+        return NULL;
+ }
+@@ -4783,7 +4808,7 @@ cmdtxt(union node *n)
+                p = "; done";
+                goto dodo;
+        case NDEFUN:
+-               cmdputs(n->narg.text);
++               cmdputs(n->ndefun.text);
+                p = "() { ... }";
+                goto dotail2;
+        case NCMD:
+@@ -8551,6 +8576,9 @@ calcsize(int funcblocksize, union node *n)
+                funcblocksize = calcsize(funcblocksize, n->nclist.next);
+                break;
+        case NDEFUN:
++               funcblocksize = calcsize(funcblocksize, n->ndefun.body);
++               funcblocksize += SHELL_ALIGN(strlen(n->ndefun.text) + 1);
++               break;
+        case NARG:
+                funcblocksize = sizenodelist(funcblocksize, n->narg.backquote);
+                funcblocksize += SHELL_ALIGN(strlen(n->narg.text) + 1); /* was funcstringsize += ... */
+@@ -8626,6 +8654,7 @@ copynode(union node *n)
+                new->ncmd.redirect = copynode(n->ncmd.redirect);
+                new->ncmd.args = copynode(n->ncmd.args);
+                new->ncmd.assign = copynode(n->ncmd.assign);
++               new->ncmd.linno = n->ncmd.linno;
+                break;
+        case NPIPE:
+                new->npipe.cmdlist = copynodelist(n->npipe.cmdlist);
+@@ -8636,6 +8665,7 @@ copynode(union node *n)
+        case NSUBSHELL:
+                new->nredir.redirect = copynode(n->nredir.redirect);
+                new->nredir.n = copynode(n->nredir.n);
++               new->nredir.linno = n->nredir.linno;
+                break;
+        case NAND:
+        case NOR:
+@@ -8654,10 +8684,12 @@ copynode(union node *n)
+                new->nfor.var = nodeckstrdup(n->nfor.var);
+                new->nfor.body = copynode(n->nfor.body);
+                new->nfor.args = copynode(n->nfor.args);
++               new->nfor.linno = n->nfor.linno;
+                break;
+        case NCASE:
+                new->ncase.cases = copynode(n->ncase.cases);
+                new->ncase.expr = copynode(n->ncase.expr);
++               new->ncase.linno = n->ncase.linno;
+                break;
+        case NCLIST:
+                new->nclist.body = copynode(n->nclist.body);
+@@ -8665,6 +8697,10 @@ copynode(union node *n)
+                new->nclist.next = copynode(n->nclist.next);
+                break;
+        case NDEFUN:
++               new->ndefun.body = copynode(n->ndefun.body);
++               new->ndefun.text = nodeckstrdup(n->ndefun.text);
++               new->ndefun.linno = n->ndefun.linno;
++               break;
+        case NARG:
+                new->narg.backquote = copynodelist(n->narg.backquote);
+                new->narg.text = nodeckstrdup(n->narg.text);
+@@ -8733,7 +8769,7 @@ defun(union node *func)
+        INT_OFF;
+        entry.cmdtype = CMDFUNCTION;
+        entry.u.func = copyfunc(func);
+-       addcmdentry(func->narg.text, &entry);
++       addcmdentry(func->ndefun.text, &entry);
+        INT_ON;
+ }
+ 
+@@ -8743,8 +8779,8 @@ defun(union node *func)
+ #define SKIPFUNC       (1 << 2)
+ static smallint evalskip;       /* set to SKIPxxx if we are skipping commands */
+ static int skipcount;           /* number of levels to skip */
+-static int funcnest;            /* depth of function calls */
+ static int loopnest;            /* current loop nesting level */
++static int funcline;            /* starting line number of current function, or 0 if not in a function */
+ 
+ /* Forward decl way out to parsing code - dotrap needs it */
+ static int evalstring(char *s, int flags);
+@@ -8839,6 +8875,9 @@ evaltree(union node *n, int flags)
+                status = !evaltree(n->nnot.com, EV_TESTED);
+                goto setstatus;
+        case NREDIR:
++               errlinno = lineno = n->nredir.linno;
++               if (funcline)
++                       lineno -= funcline - 1;
+                expredir(n->nredir.redirect);
+                pushredir(n->nredir.redirect);
+                status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
+@@ -8993,6 +9032,10 @@ evalfor(union node *n, int flags)
+        struct stackmark smark;
+        int status = 0;
+ 
++       errlinno = lineno = n->ncase.linno;
++       if (funcline)
++               lineno -= funcline - 1;
++
+        setstackmark(&smark);
+        arglist.list = NULL;
+        arglist.lastp = &arglist.list;
+@@ -9024,6 +9067,10 @@ evalcase(union node *n, int flags)
+        struct stackmark smark;
+        int status = 0;
+ 
++       errlinno = lineno = n->ncase.linno;
++       if (funcline)
++               lineno -= funcline - 1;
++
+        setstackmark(&smark);
+        arglist.list = NULL;
+        arglist.lastp = &arglist.list;
+@@ -9058,6 +9105,10 @@ evalsubshell(union node *n, int flags)
+        int backgnd = (n->type == NBACKGND); /* FORK_BG(1) if yes, else FORK_FG(0) */
+        int status;
+ 
++       errlinno = lineno = n->nredir.linno;
++       if (funcline)
++               lineno -= funcline - 1;
++
+        expredir(n->nredir.redirect);
+        if (!backgnd && (flags & EV_EXIT) && !may_have_traps)
+                goto nofork;
+@@ -9365,8 +9416,10 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
+        struct jmploc *volatile savehandler;
+        struct jmploc jmploc;
+        int e;
++       int savefuncline;
+ 
+        saveparam = shellparam;
++       savefuncline = funcline;
+        savehandler = exception_handler;
+        e = setjmp(jmploc.loc);
+        if (e) {
+@@ -9376,7 +9429,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
+        exception_handler = &jmploc;
+        shellparam.malloced = 0;
+        func->count++;
+-       funcnest++;
++       funcline = func->n.ndefun.linno;
+        INT_ON;
+        shellparam.nparam = argc - 1;
+        shellparam.p = argv + 1;
+@@ -9385,11 +9438,11 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
+        shellparam.optoff = -1;
+ #endif
+        pushlocalvars();
+-       evaltree(func->n.narg.next, flags & EV_TESTED);
++       evaltree(func->n.ndefun.body, flags & EV_TESTED);
+        poplocalvars(0);
+  funcdone:
+        INT_OFF;
+-       funcnest--;
++       funcline = savefuncline;
+        freefunc(func);
+        freeparam(&shellparam);
+        shellparam = saveparam;
+@@ -9753,6 +9806,10 @@ evalcommand(union node *cmd, int flags)
+        char **nargv;
+        smallint cmd_is_exec;
+ 
++       errlinno = lineno = cmd->ncmd.linno;
++       if (funcline)
++               lineno -= funcline - 1;
++
+        /* First expand the arguments. */
+        TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
+        setstackmark(&smark);
+@@ -9798,7 +9855,7 @@ evalcommand(union node *cmd, int flags)
+        *nargv = NULL;
+ 
+        lastarg = NULL;
+-       if (iflag && funcnest == 0 && argc > 0)
++       if (iflag && funcline == 0 && argc > 0)
+                lastarg = nargv[-1];
+ 
+        expredir(cmd->ncmd.redirect);
+@@ -11317,6 +11374,7 @@ simplecmd(void)
+        union node *vars, **vpp;
+        union node **rpp, *redir;
+        int savecheckkwd;
++       int savelinno;
+ #if BASH_TEST2
+        smallint double_brackets_flag = 0;
+ #endif
+@@ -11330,6 +11388,7 @@ simplecmd(void)
+        rpp = &redir;
+ 
+        savecheckkwd = CHKALIAS;
++       savelinno = g_parsefile->linno;
+        for (;;) {
+                int t;
+                checkkwd = savecheckkwd;
+@@ -11419,7 +11478,9 @@ simplecmd(void)
+                                }
+                                n->type = NDEFUN;
+                                checkkwd = CHKNL | CHKKWD | CHKALIAS;
+-                               n->narg.next = parse_command();
++                               n->ndefun.text = n->narg.text;
++                               n->ndefun.linno = g_parsefile->linno;
++                               n->ndefun.body = parse_command();
+                                return n;
+                        }
+                        IF_BASH_FUNCTION(function_flag = 0;)
+@@ -11435,6 +11496,7 @@ simplecmd(void)
+        *rpp = NULL;
+        n = stzalloc(sizeof(struct ncmd));
+        n->type = NCMD;
++       n->ncmd.linno = savelinno;
+        n->ncmd.args = args;
+        n->ncmd.assign = vars;
+        n->ncmd.redirect = redir;
+@@ -11450,10 +11512,13 @@ parse_command(void)
+        union node *redir, **rpp;
+        union node **rpp2;
+        int t;
++       int savelinno;
+ 
+        redir = NULL;
+        rpp2 = &redir;
+ 
++       savelinno = g_parsefile->linno;
++
+        switch (readtoken()) {
+        default:
+                raise_error_unexpected_syntax(-1);
+@@ -11504,6 +11569,7 @@ parse_command(void)
+                        raise_error_syntax("bad for loop variable");
+                n1 = stzalloc(sizeof(struct nfor));
+                n1->type = NFOR;
++               n1->nfor.linno = savelinno;
+                n1->nfor.var = wordtext;
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                if (readtoken() == TIN) {
+@@ -11544,6 +11610,7 @@ parse_command(void)
+        case TCASE:
+                n1 = stzalloc(sizeof(struct ncase));
+                n1->type = NCASE;
++               n1->ncase.linno = savelinno;
+                if (readtoken() != TWORD)
+                        raise_error_unexpected_syntax(TWORD);
+                n1->ncase.expr = n2 = stzalloc(sizeof(struct narg));
+@@ -11595,6 +11662,7 @@ parse_command(void)
+        case TLP:
+                n1 = stzalloc(sizeof(struct nredir));
+                n1->type = NSUBSHELL;
++               n1->nredir.linno = savelinno;
+                n1->nredir.n = list(0);
+                /*n1->nredir.redirect = NULL; - stzalloc did it */
+                t = TRP;
+@@ -11628,6 +11696,7 @@ parse_command(void)
+                if (n1->type != NSUBSHELL) {
+                        n2 = stzalloc(sizeof(struct nredir));
+                        n2->type = NREDIR;
++                       n2->nredir.linno = savelinno;
+                        n2->nredir.n = n1;
+                        n1 = n2;
+                }
+@@ -11726,10 +11795,8 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
+        IF_FEATURE_SH_MATH(int arinest;)    /* levels of arithmetic expansion */
+        IF_FEATURE_SH_MATH(int parenlevel;) /* levels of parens in arithmetic */
+        int dqvarnest;       /* levels of variables expansion within double quotes */
+-
+        IF_BASH_DOLLAR_SQUOTE(smallint bash_dollar_squote = 0;)
+ 
+-       startlinno = g_parsefile->linno;
+        bqlist = NULL;
+        quotef = 0;
+        IF_FEATURE_SH_MATH(prevsyntax = 0;)
+@@ -11906,7 +11973,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
+        if (syntax != BASESYNTAX && eofmark == NULL)
+                raise_error_syntax("unterminated quoted string");
+        if (varnest != 0) {
+-               startlinno = g_parsefile->linno;
+                /* { */
+                raise_error_syntax("missing '}'");
+        }
+@@ -12298,7 +12364,6 @@ parsebackq: {
+ 
+                        case PEOF:
+                        IF_ASH_ALIAS(case PEOA:)
+-                               startlinno = g_parsefile->linno;
+                                raise_error_syntax("EOF in backquote substitution");
+ 
+                        case '\n':
+@@ -12380,8 +12445,6 @@ parsearith: {
+  *      quoted.
+  * If the token is TREDIR, then we set redirnode to a structure containing
+  *      the redirection.
+- * In all cases, the variable startlinno is set to the number of the line
+- *      on which the token starts.
+  *
+  * [Change comment:  here documents and internal procedures]
+  * [Readtoken shouldn't have any arguments.  Perhaps we should make the
+@@ -12419,7 +12482,6 @@ xxreadtoken(void)
+                return lasttoken;
+        }
+        setprompt_if(needprompt, 2);
+-       startlinno = g_parsefile->linno;
+        for (;;) {                      /* until token or start of word found */
+                c = pgetc();
+                if (c == ' ' || c == '\t' IF_ASH_ALIAS( || c == PEOA))
+@@ -12480,7 +12542,6 @@ xxreadtoken(void)
+                return lasttoken;
+        }
+        setprompt_if(needprompt, 2);
+-       startlinno = g_parsefile->linno;
+        for (;;) {      /* until token or start of word found */
+                c = pgetc();
+                switch (c) {
diff --git a/shell/ash_test/ash-getopts/getopt_optarg.right b/shell/ash_test/ash-getopts/getopt_optarg.right
new file mode 100644
index 000000000..dff28de57
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_optarg.right
@@ -0,0 +1,18 @@
+*** no OPTIND, optstring:'w:et' args:-q -w e -r -t -y
+Illegal option -q
+var:'?' OPTIND:2 OPTARG:''
+var:'w' OPTIND:4 OPTARG:'e'
+Illegal option -r
+var:'?' OPTIND:5 OPTARG:''
+var:'t' OPTIND:6 OPTARG:''
+Illegal option -y
+var:'?' OPTIND:7 OPTARG:''
+exited: var:'?' OPTIND:7 OPTARG:''
+*** OPTIND=0, optstring:'w:et' args:-w 1 -w2 -w -e -e -t -t
+var:'w' OPTIND:3 OPTARG:'1'
+var:'w' OPTIND:4 OPTARG:'2'
+var:'w' OPTIND:6 OPTARG:'-e'
+var:'e' OPTIND:7 OPTARG:''
+var:'t' OPTIND:8 OPTARG:''
+var:'t' OPTIND:9 OPTARG:''
+exited: var:'?' OPTIND:9 OPTARG:''
diff --git a/shell/ash_test/ash-getopts/getopt_optarg.tests b/shell/ash_test/ash-getopts/getopt_optarg.tests
new file mode 100755
index 000000000..33682e868
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_optarg.tests
@@ -0,0 +1,18 @@
+set -- -q -w e -r -t -y
+echo "*** no OPTIND, optstring:'w:et' args:$*"
+var=QWERTY
+OPTARG=ASDFGH
+while getopts "w:et" var; do
+        echo "var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+        OPTARG=ASDFGH
+done
+echo "exited: var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+set -- -w 1 -w2 -w -e -e -t -t
+echo "*** OPTIND=0, optstring:'w:et' args:$*"
+OPTIND=0
+while getopts "w:et" var; do
+        echo "var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+        OPTARG=ASDFGH
+done
+echo "exited: var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
diff --git a/shell/ash_test/ash-getopts/getopt_positional.right b/shell/ash_test/ash-getopts/getopt_positional.right
new file mode 100644
index 000000000..37d0ec845
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_positional.right
@@ -0,0 +1,6 @@
+*** no OPTIND, optstring:'we' args:-q -w -e r -t -y
+Illegal option -q
+var:'?' OPTIND:2
+var:'w' OPTIND:3
+var:'e' OPTIND:4
+exited: var:'?' OPTIND:4
diff --git a/shell/ash_test/ash-getopts/getopt_positional.tests b/shell/ash_test/ash-getopts/getopt_positional.tests
new file mode 100755
index 000000000..a5404a2a0
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_positional.tests
@@ -0,0 +1,8 @@
+set -- -q -w -e r -t -y
+echo "*** no OPTIND, optstring:'we' args:$*"
+var=QWERTY
+while getopts "we" var; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+# unfortunately, "rc:0" is shown since while's overall exitcode is "success"
+echo "exited: var:'$var' OPTIND:$OPTIND"
diff --git a/shell/ash_test/ash-getopts/getopt_silent.right b/shell/ash_test/ash-getopts/getopt_silent.right
new file mode 100644
index 000000000..03d4eb149
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_silent.right
@@ -0,0 +1,6 @@
+*** optstring:':ac' args:-a -b -c
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+2 rc:0 var:'?' OPTIND:3 OPTARG:'b'
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+4 rc:1 var:'?' OPTIND:4 OPTARG:''
+5 rc:1 var:'?' OPTIND:4 OPTARG:''
diff --git a/shell/ash_test/ash-getopts/getopt_silent.tests b/shell/ash_test/ash-getopts/getopt_silent.tests
new file mode 100755
index 000000000..097d7ba85
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_silent.tests
@@ -0,0 +1,23 @@
+# Open Group Base Specifications Issue 7:
+# """
+# If an unknown option is met, VAR shall be set to "?". In this case,
+# if the first character in optstring is ":", OPTARG shall be set
+# to the option character found, but no output shall be written
+# to standard error; otherwise, the shell variable OPTARG shall be
+# unset and a diagnostic message shall be written to standard error."
+# ...
+# If an option-argument is missing:
+# If the first character of optstring is ":", VAR shall be set to ":"
+# and OPTARG shall be set to the option character found.
+# """
+
+echo "*** optstring:':ac' args:-a -b -c"
+getopts ":ac" var -a -b -c; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts ":ac" var -a -b -c; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts ":ac" var -a -b -c; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts ":ac" var -a -b -c; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+# Previous line should result in "rc:1", which is normally treated
+# in getopts loops as exit condition.
+# Nevertheless, let's verify that calling it yet another time doesn't do
+# anything weird:
+getopts ":ac" var -a -b -c; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
diff --git a/shell/ash_test/ash-getopts/getopt_simple.right b/shell/ash_test/ash-getopts/getopt_simple.right
new file mode 100644
index 000000000..07e3c57f5
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_simple.right
@@ -0,0 +1,34 @@
+*** no OPTIND, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** OPTIND=1, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** OPTIND=0, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** unset OPTIND, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** optstring:'ab' args:-a -b c
+1 rc:0 var:'a' OPTIND:2
+2 rc:0 var:'b' OPTIND:3
+3 rc:1 var:'?' OPTIND:3
+*** unset OPTIND, optstring:'ab' args:-a c -c -b d
+var:'a' OPTIND:2
+exited: rc:0 var:'?' OPTIND:2
+*** unset OPTIND, optstring:'ab' args:-a -c -b d
+var:'a' OPTIND:2
+Illegal option -c
+var:'?' OPTIND:3
+var:'b' OPTIND:4
+exited: rc:0 var:'?' OPTIND:4
+*** unset OPTIND, OPTERR=0, optstring:'ab' args:-a -c -b d
+var:'a' OPTIND:2
+var:'?' OPTIND:3
+var:'b' OPTIND:4
+exited: rc:0 var:'?' OPTIND:4
diff --git a/shell/ash_test/ash-getopts/getopt_simple.tests b/shell/ash_test/ash-getopts/getopt_simple.tests
new file mode 100755
index 000000000..8615ae366
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_simple.tests
@@ -0,0 +1,75 @@
+# Simple usage cases for getopts.
+#
+# OPTIND is either not touched at all (first loop with getopts,
+# relying on shell startup init), or getopts state is reset
+# before new loop with "unset OPTIND", "OPTIND=1" or "OPTIND=0".
+#
+# Each option is a separate argument (no "-abc"). This conceptually
+# needs only $OPTIND to hold getopts state.
+#
+# We check that loop does not stop on unknown option (sets "?"),
+# stops on _first_ non-option argument.
+
+echo "*** no OPTIND, optstring:'ab' args:-a -b c"
+var=QWERTY
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+# unfortunately, "rc:0" is shown since while's overall exitcode is "success"
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Resetting behavior =1
+echo "*** OPTIND=1, optstring:'ab' args:-a -b c"
+OPTIND=1
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Resetting behavior =0
+echo "*** OPTIND=0, optstring:'ab' args:-a -b c"
+OPTIND=0
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Resetting behavior "unset"
+echo "*** unset OPTIND, optstring:'ab' args:-a -b c"
+unset OPTIND
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# What is the final exitcode?
+echo "*** optstring:'ab' args:-a -b c"
+unset OPTIND
+getopts "ab" var -a -b c; echo "1 rc:$? var:'$var' OPTIND:$OPTIND"
+getopts "ab" var -a -b c; echo "2 rc:$? var:'$var' OPTIND:$OPTIND"
+getopts "ab" var -a -b c; echo "3 rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Where would it stop? c or -c?
+echo "*** unset OPTIND, optstring:'ab' args:-a c -c -b d"
+unset OPTIND
+while getopts "ab" var -a c -c -b d; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# What happens on unknown option?
+echo "*** unset OPTIND, optstring:'ab' args:-a -c -b d"
+unset OPTIND
+while getopts "ab" var -a -c -b d; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# ORTERR=0 suppresses error message?
+echo "*** unset OPTIND, OPTERR=0, optstring:'ab' args:-a -c -b d"
+unset OPTIND
+OPTERR=0
+while getopts "ab" var -a -c -b d; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
diff --git a/shell/ash_test/ash-getopts/getopt_test_libc_bug.right b/shell/ash_test/ash-getopts/getopt_test_libc_bug.right
new file mode 100644
index 000000000..f6ad4602d
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_test_libc_bug.right
@@ -0,0 +1,26 @@
+*** optstring:'ac' args:-a -b -c -d e
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+Illegal option -b
+2 rc:0 var:'?' OPTIND:3 OPTARG:''
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+Illegal option -d
+4 rc:0 var:'?' OPTIND:5 OPTARG:''
+5 rc:1 var:'?' OPTIND:5 OPTARG:''
+
+*** optstring:'ac' args:-a -b -c -d e
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+Illegal option -b
+2 rc:0 var:'?' OPTIND:3 OPTARG:''
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+Illegal option -d
+4 rc:0 var:'?' OPTIND:5 OPTARG:''
+5 rc:1 var:'?' OPTIND:5 OPTARG:''
+
+*** optstring:'ac' args:-a -b -c -d e
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+Illegal option -b
+2 rc:0 var:'?' OPTIND:3 OPTARG:''
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+Illegal option -d
+4 rc:0 var:'?' OPTIND:5 OPTARG:''
+5 rc:1 var:'?' OPTIND:5 OPTARG:''
diff --git a/shell/ash_test/ash-getopts/getopt_test_libc_bug.tests b/shell/ash_test/ash-getopts/getopt_test_libc_bug.tests
new file mode 100755
index 000000000..fcaac81a2
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_test_libc_bug.tests
@@ -0,0 +1,38 @@
+# This test can fail with libc with buggy getopt() implementation.
+# If getopt() wants to parse multi-option args (-abc),
+# it needs to remember a position within current arg.
+#
+# If this position is kept as a POINTER, not an offset,
+# and if argv[] ADDRESSES (not contents!) change, it blows up.
+
+echo "*** optstring:'ac' args:-a -b -c -d e"
+getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+# Above: args are (usually) in the same locations in memory.
+# Below: variable allocations change the location.
+
+echo
+echo "*** optstring:'ac' args:-a -b -c -d e"
+unset OPTIND
+OPTARG=QWERTY; getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+NEWVAR=NEWVAL; getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+VAR111=NEWVAL; getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+VAR222=NEWVAL; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+VAR333=NEWVAL; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+# Slightly different attempts to force reallocations
+
+echo
+echo "*** optstring:'ac' args:-a -b -c -d e"
+unset OPTIND
+export OPTARG; getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export NEWVAR; getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export VAR111; getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export VAR222; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export VAR333; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+# All copies of code above should generate identical output
diff --git a/shell/ash_test/ash-parsing/groups_and_keywords2.right b/shell/ash_test/ash-parsing/groups_and_keywords2.right
new file mode 100644
index 000000000..3fcbeb662
--- /dev/null
+++ b/shell/ash_test/ash-parsing/groups_and_keywords2.right
@@ -0,0 +1,3 @@
+./groups_and_keywords2.tests: eval: line 1: syntax error: unexpected ")"
+Fail:2
+./groups_and_keywords2.tests: line 8: syntax error: unexpected ")"
diff --git a/shell/ash_test/ash-parsing/groups_and_keywords2.tests b/shell/ash_test/ash-parsing/groups_and_keywords2.tests
new file mode 100755
index 000000000..ab33b909f
--- /dev/null
+++ b/shell/ash_test/ash-parsing/groups_and_keywords2.tests
@@ -0,0 +1,9 @@
+# This is an error
+(eval 'if() { echo; }')
+echo Fail:$?
+# ^^^^^^ bash prints 1, but interactively it sets $? = 2
+# we print 2
+
+# This is an error, and it aborts in script
+if() { echo; }
+echo Not reached
diff --git a/shell/ash_test/ash-vars/param_expand_assign.right b/shell/ash_test/ash-vars/param_expand_assign.right
index 9b07d8cd4..6e9ea1379 100644
--- a/shell/ash_test/ash-vars/param_expand_assign.right
+++ b/shell/ash_test/ash-vars/param_expand_assign.right
@@ -1,6 +1,6 @@
 SHELL: line 1: syntax error: bad substitution
 SHELL: line 1: syntax error: bad substitution
-0
+SHELL: line 1: syntax error: bad substitution
 0
 SHELL: line 1: 1: bad variable name
 SHELL: line 1: 1: bad variable name
diff --git a/shell/ash_test/printenv.c b/shell/ash_test/printenv.c
index c0c5e197c..c86308d3b 100644
--- a/shell/ash_test/printenv.c
+++ b/shell/ash_test/printenv.c
@@ -56,7 +56,7 @@ main (argc, argv)
       if (**argv == **envp && strncmp (*envp, *argv, len) == 0)
         {
           eval = *envp + len;
-          /* If the environment variable doesn't have an `=', ignore it. */
+          /* If the environment variable doesn't have an '=', ignore it. */
           if (*eval == '=')
             {
               puts (eval + 1);
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 9004b4763..849fe9e48 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -6,7 +6,7 @@
  */
 #include "libbb.h"
 
-//applet:IF_CTTYHACK(APPLET(cttyhack, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
 
 //kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
 
diff --git a/shell/hush.c b/shell/hush.c
index 9f946d82f..cdc3a8618 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -48,7 +48,7 @@
  *      tilde expansion
  *      aliases
  *      builtins mandated by standards we don't support:
- *          [un]alias, command, fc, getopts, times:
+ *          [un]alias, command, fc:
  *          command -v CMD: print "/path/to/CMD"
  *              prints "CMD" for builtins
  *              prints "alias ALIAS='EXPANSION'" for aliases
@@ -58,8 +58,6 @@
  *              (can use this to override standalone shell as well)
  *              -p: use default $PATH
  *          command BLTIN: disables special-ness (e.g. errors do not abort)
- *          getopts: getopt() for shells
- *          times: print getrusage(SELF/CHILDREN).ru_utime/ru_stime
  *          fc -l[nr] [BEG] [END]: list range of commands in history
  *          fc [-e EDITOR] [BEG] [END]: edit/rerun range of commands
  *          fc -s [PAT=REP] [CMD]: rerun CMD, replacing PAT with REP
@@ -265,6 +263,11 @@
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:
+//config:config HUSH_TIMES
+//config:       bool "times builtin"
+//config:       default y
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
+//config:
 //config:config HUSH_READ
 //config:       bool "read builtin"
 //config:       default y
@@ -290,6 +293,11 @@
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:
+//config:config HUSH_GETOPTS
+//config:       bool "getopts builtin"
+//config:       default y
+//config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
+//config:
 //config:config HUSH_MEMLEAK
 //config:       bool "memleak builtin (debugging)"
 //config:       default n
@@ -325,6 +333,7 @@
 #if ENABLE_HUSH_CASE
 # include <fnmatch.h>
 #endif
+#include <sys/times.h>
 #include <sys/utsname.h> /* for setting $HOSTNAME */
 
 #include "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
@@ -352,6 +361,7 @@
 #define BASH_SOURCE        ENABLE_HUSH_BASH_COMPAT
 #define BASH_HOSTNAME_VAR  ENABLE_HUSH_BASH_COMPAT
 #define BASH_TEST2         (ENABLE_HUSH_BASH_COMPAT && ENABLE_HUSH_TEST)
+#define BASH_READ_D        ENABLE_HUSH_BASH_COMPAT
 
 
 /* Build knobs */
@@ -977,6 +987,9 @@ static int builtin_readonly(char **argv) FAST_FUNC;
 static int builtin_fg_bg(char **argv) FAST_FUNC;
 static int builtin_jobs(char **argv) FAST_FUNC;
 #endif
+#if ENABLE_HUSH_GETOPTS
+static int builtin_getopts(char **argv) FAST_FUNC;
+#endif
 #if ENABLE_HUSH_HELP
 static int builtin_help(char **argv) FAST_FUNC;
 #endif
@@ -1010,6 +1023,9 @@ static int builtin_trap(char **argv) FAST_FUNC;
 #if ENABLE_HUSH_TYPE
 static int builtin_type(char **argv) FAST_FUNC;
 #endif
+#if ENABLE_HUSH_TIMES
+static int builtin_times(char **argv) FAST_FUNC;
+#endif
 static int builtin_true(char **argv) FAST_FUNC;
 #if ENABLE_HUSH_UMASK
 static int builtin_umask(char **argv) FAST_FUNC;
@@ -1070,6 +1086,9 @@ static const struct built_in_command bltins1[] = {
 #if ENABLE_HUSH_JOB
         BLTIN("fg"       , builtin_fg_bg   , "Bring job to foreground"),
 #endif
+#if ENABLE_HUSH_GETOPTS
+        BLTIN("getopts"  , builtin_getopts , NULL),
+#endif
 #if ENABLE_HUSH_HELP
         BLTIN("help"     , builtin_help    , NULL),
 #endif
@@ -1104,6 +1123,9 @@ static const struct built_in_command bltins1[] = {
 #if BASH_SOURCE
         BLTIN("source"   , builtin_source  , NULL),
 #endif
+#if ENABLE_HUSH_TIMES
+        BLTIN("times"    , builtin_times   , NULL),
+#endif
 #if ENABLE_HUSH_TRAP
         BLTIN("trap"     , builtin_trap    , "Trap signals"),
 #endif
@@ -1272,7 +1294,7 @@ static void xxfree(void *ptr)
  * HUSH_DEBUG >= 2 prints line number in this file where it was detected.
  */
 #if HUSH_DEBUG < 2
-# define die_if_script(lineno, ...)             die_if_script(__VA_ARGS__)
+# define msg_and_die_if_script(lineno, ...)     msg_and_die_if_script(__VA_ARGS__)
 # define syntax_error(lineno, msg)              syntax_error(msg)
 # define syntax_error_at(lineno, msg)           syntax_error_at(msg)
 # define syntax_error_unterm_ch(lineno, ch)     syntax_error_unterm_ch(ch)
@@ -1280,7 +1302,16 @@ static void xxfree(void *ptr)
 # define syntax_error_unexpected_ch(lineno, ch) syntax_error_unexpected_ch(ch)
 #endif
 
-static void die_if_script(unsigned lineno, const char *fmt, ...)
+static void die_if_script(void)
+{
+        if (!G_interactive_fd) {
+                if (G.last_exitcode) /* sometines it's 2, not 1 (bash compat) */
+                        xfunc_error_retval = G.last_exitcode;
+                xfunc_die();
+        }
+}
+
+static void msg_and_die_if_script(unsigned lineno, const char *fmt, ...)
 {
         va_list p;
 
@@ -1290,8 +1321,7 @@ static void die_if_script(unsigned lineno, const char *fmt, ...)
         va_start(p, fmt);
         bb_verror_msg(fmt, p, NULL);
         va_end(p);
-        if (!G_interactive_fd)
-                xfunc_die();
+        die_if_script();
 }
 
 static void syntax_error(unsigned lineno UNUSED_PARAM, const char *msg)
@@ -1300,16 +1330,20 @@ static void syntax_error(unsigned lineno UNUSED_PARAM, const char *msg)
                 bb_error_msg("syntax error: %s", msg);
         else
                 bb_error_msg("syntax error");
+        die_if_script();
 }
 
 static void syntax_error_at(unsigned lineno UNUSED_PARAM, const char *msg)
 {
         bb_error_msg("syntax error at '%s'", msg);
+        die_if_script();
 }
 
 static void syntax_error_unterm_str(unsigned lineno UNUSED_PARAM, const char *s)
 {
         bb_error_msg("syntax error: unterminated %s", s);
+//? source4.tests fails: in bash, echo ${^} in script does not terminate the script
+//      die_if_script();
 }
 
 static void syntax_error_unterm_ch(unsigned lineno, char ch)
@@ -1327,17 +1361,18 @@ static void syntax_error_unexpected_ch(unsigned lineno UNUSED_PARAM, int ch)
         bb_error_msg("hush.c:%u", lineno);
 #endif
         bb_error_msg("syntax error: unexpected %s", ch == EOF ? "EOF" : msg);
+        die_if_script();
 }
 
 #if HUSH_DEBUG < 2
-# undef die_if_script
+# undef msg_and_die_if_script
 # undef syntax_error
 # undef syntax_error_at
 # undef syntax_error_unterm_ch
 # undef syntax_error_unterm_str
 # undef syntax_error_unexpected_ch
 #else
-# define die_if_script(...)             die_if_script(__LINE__, __VA_ARGS__)
+# define msg_and_die_if_script(...)     msg_and_die_if_script(__LINE__, __VA_ARGS__)
 # define syntax_error(msg)              syntax_error(__LINE__, msg)
 # define syntax_error_at(msg)           syntax_error_at(__LINE__, msg)
 # define syntax_error_unterm_ch(ch)     syntax_error_unterm_ch(__LINE__, ch)
@@ -1800,7 +1835,7 @@ static void restore_ttypgrp_and__exit(void)
  *      echo END_OF_SCRIPT
  * lseeks fd in input FILE object from EOF to "e" in "echo END_OF_SCRIPT".
  * This makes "echo END_OF_SCRIPT" executed twice.
- * Similar problems can be seen with die_if_script() -> xfunc_die()
+ * Similar problems can be seen with msg_and_die_if_script() -> xfunc_die()
  * and in `cmd` handling.
  * If set as die_func(), this makes xfunc_die() exit via _exit(), not exit():
  */
@@ -1966,6 +2001,9 @@ static int check_and_run_traps(void)
                         break;
 #if ENABLE_HUSH_JOB
                 case SIGHUP: {
+//TODO: why are we doing this? ash and dash don't do this,
+//they have no handler for SIGHUP at all,
+//they rely on kernel to send SIGHUP+SIGCONT to orphaned process groups
                         struct pipe *job;
                         debug_printf_exec("%s: sig:%d default SIGHUP handler\n", __func__, sig);
                         /* bash is observed to signal whole process groups,
@@ -2411,18 +2449,17 @@ static int get_user_input(struct in_str *i)
                 /* buglet: SIGINT will not make new prompt to appear _at once_,
                  * only after <Enter>. (^C works immediately) */
                 r = read_line_input(G.line_input_state, prompt_str,
-                                G.user_input_buf, CONFIG_FEATURE_EDITING_MAX_LEN-1,
-                                /*timeout*/ -1
+                                G.user_input_buf, CONFIG_FEATURE_EDITING_MAX_LEN-1
                 );
                 /* read_line_input intercepts ^C, "convert" it to SIGINT */
-                if (r == 0) {
-                        write(STDOUT_FILENO, "^C", 2);
+                if (r == 0)
                         raise(SIGINT);
-                }
                 check_and_run_traps();
                 if (r != 0 && !G.flag_SIGINT)
                         break;
                 /* ^C or SIGINT: repeat */
+                /* bash prints ^C even on real SIGINT (non-kbd generated) */
+                write(STDOUT_FILENO, "^C", 2);
                 G.last_exitcode = 128 + SIGINT;
         }
         if (r < 0) {
@@ -3384,7 +3421,7 @@ static int done_command(struct parse_context *ctx)
 #if 0   /* Instead we emit error message at run time */
         if (ctx->pending_redirect) {
                 /* For example, "cmd >" (no filename to redirect to) */
-                die_if_script("syntax error: %s", "invalid redirect");
+                syntax_error("invalid redirect");
                 ctx->pending_redirect = NULL;
         }
 #endif
@@ -3950,7 +3987,7 @@ static int parse_redirect(struct parse_context *ctx,
 #if 0           /* Instead we emit error message at run time */
                 if (ctx->pending_redirect) {
                         /* For example, "cmd > <file" */
-                        die_if_script("syntax error: %s", "invalid redirect");
+                        syntax_error("invalid redirect");
                 }
 #endif
                 /* Set ctx->pending_redirect, so we know what to do at the
@@ -5022,10 +5059,16 @@ static struct pipe *parse_stream(char **pstring,
                                 else
                                         o_free_unsafe(&ctx.as_string);
 #endif
-                                debug_leave();
+                                if (ch != ';' && IS_NULL_PIPE(ctx.list_head)) {
+                                        /* Example: bare "{ }", "()" */
+                                        G.last_exitcode = 2; /* bash compat */
+                                        syntax_error_unexpected_ch(ch);
+                                        goto parse_error2;
+                                }
                                 debug_printf_parse("parse_stream return %p: "
                                                 "end_trigger char found\n",
                                                 ctx.list_head);
+                                debug_leave();
                                 return ctx.list_head;
                         }
                 }
@@ -5283,8 +5326,8 @@ static struct pipe *parse_stream(char **pstring,
                         /* proper use of this character is caught by end_trigger:
                          * if we see {, we call parse_group(..., end_trigger='}')
                          * and it will match } earlier (not here). */
-                        syntax_error_unexpected_ch(ch);
                         G.last_exitcode = 2;
+                        syntax_error_unexpected_ch(ch);
                         goto parse_error2;
                 default:
                         if (HUSH_DEBUG)
@@ -5514,7 +5557,7 @@ static arith_t expand_and_evaluate_arith(const char *arg, const char **errmsg_p)
         if (errmsg_p)
                 *errmsg_p = math_state.errmsg;
         if (math_state.errmsg)
-                die_if_script(math_state.errmsg);
+                msg_and_die_if_script(math_state.errmsg);
         return res;
 }
 #endif
@@ -5781,7 +5824,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                                 /* in bash, len=-n means strlen()-n */
                                 len = (arith_t)strlen(val) - beg + len;
                                 if (len < 0) /* bash compat */
-                                        die_if_script("%s: substring expression < 0", var);
+                                        msg_and_die_if_script("%s: substring expression < 0", var);
                         }
                         if (len <= 0 || !val || beg >= strlen(val)) {
  arith_err:
@@ -5795,7 +5838,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                         }
                         debug_printf_varexp("val:'%s'\n", val);
 #else /* not (HUSH_SUBSTR_EXPANSION && FEATURE_SH_MATH) */
-                        die_if_script("malformed ${%s:...}", var);
+                        msg_and_die_if_script("malformed ${%s:...}", var);
                         val = NULL;
 #endif
                 } else { /* one of "-=+?" */
@@ -5832,7 +5875,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                                         exp_word = to_be_freed;
                                 if (exp_op == '?') {
                                         /* mimic bash message */
-                                        die_if_script("%s: %s",
+                                        msg_and_die_if_script("%s: %s",
                                                 var,
                                                 exp_word[0]
                                                 ? exp_word
@@ -5849,7 +5892,7 @@ static NOINLINE const char *expand_one_var(char **to_be_freed_pp, char *arg, cha
                                         /* ${var=[word]} or ${var:=[word]} */
                                         if (isdigit(var[0]) || var[0] == '#') {
                                                 /* mimic bash message */
-                                                die_if_script("$%s: cannot assign in this way", var);
+                                                msg_and_die_if_script("$%s: cannot assign in this way", var);
                                                 val = NULL;
                                         } else {
                                                 char *new_var = xasprintf("%s=%s", var, val);
@@ -6698,7 +6741,8 @@ static struct squirrel *add_squirrel(struct squirrel *sq, int fd, int avoid_fd)
         int moved_to;
         int i;
 
-        if (sq) for (i = 0; sq[i].orig_fd >= 0; i++) {
+        i = 0;
+        if (sq) for (; sq[i].orig_fd >= 0; i++) {
                 /* If we collide with an already moved fd... */
                 if (fd == sq[i].moved_to) {
                         sq[i].moved_to = fcntl_F_DUPFD(sq[i].moved_to, avoid_fd);
@@ -6726,7 +6770,8 @@ static struct squirrel *add_squirrel_closed(struct squirrel *sq, int fd)
 {
         int i;
 
-        if (sq) for (i = 0; sq[i].orig_fd >= 0; i++) {
+        i = 0;
+        if (sq) for (; sq[i].orig_fd >= 0; i++) {
                 /* If we collide with an already moved fd... */
                 if (fd == sq[i].orig_fd) {
                         /* Examples:
@@ -6863,7 +6908,7 @@ static int setup_redirects(struct command *prog, struct squirrel **sqp)
                                  * "cmd >" (no filename)
                                  * "cmd > <file" (2nd redirect starts too early)
                                  */
-                                die_if_script("syntax error: %s", "invalid redirect");
+                                syntax_error("invalid redirect");
                                 continue;
                         }
                         mode = redir_table[redir->rd_type].mode;
@@ -7363,8 +7408,10 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
                                  */
                                 close_saved_fds_and_FILE_fds();
 //FIXME: should also close saved redir fds
+                                /* Without this, "rm -i FILE" can't be ^C'ed: */
+                                switch_off_special_sigs(G.special_sig_mask);
                                 debug_printf_exec("running applet '%s'\n", argv[0]);
-                                run_applet_no_and_exit(a, argv[0], argv);
+                                run_noexec_applet_and_exit(a, argv[0], argv);
                         }
 # endif
                         /* Re-exec ourselves */
@@ -8045,6 +8092,24 @@ static NOINLINE int run_pipe(struct pipe *pi)
                         add_vars(old_vars);
 /* clean_up_and_ret0: */
                         restore_redirects(squirrel);
+                        /*
+                         * Try "usleep 99999999" + ^C + "echo $?"
+                         * with FEATURE_SH_NOFORK=y.
+                         */
+                        if (!funcp) {
+                                /* It was builtin or nofork.
+                                 * if this would be a real fork/execed program,
+                                 * it should have died if a fatal sig was received.
+                                 * But OTOH, there was no separate process,
+                                 * the sig was sent to _shell_, not to non-existing
+                                 * child.
+                                 * Let's just handle ^C only, this one is obvious:
+                                 * we aren't ok with exitcode 0 when ^C was pressed
+                                 * during builtin/nofork.
+                                 */
+                                if (sigismember(&G.pending_set, SIGINT))
+                                        rcode = 128 + SIGINT;
+                        }
  clean_up_and_ret1:
                         free(argv_expanded);
                         IF_HAS_KEYWORDS(if (pi->pi_inverted) rcode = !rcode;)
@@ -8060,6 +8125,14 @@ static NOINLINE int run_pipe(struct pipe *pi)
                                 if (rcode == 0) {
                                         debug_printf_exec(": run_nofork_applet '%s' '%s'...\n",
                                                 argv_expanded[0], argv_expanded[1]);
+                                        /*
+                                         * Note: signals (^C) can't interrupt here.
+                                         * We remember them and they will be acted upon
+                                         * after applet returns.
+                                         * This makes applets which can run for a long time
+                                         * and/or wait for user input ineligible for NOFORK:
+                                         * for example, "yes" or "rm" (rm -i waits for input).
+                                         */
                                         rcode = run_nofork_applet(n, argv_expanded);
                                 }
                                 goto clean_up_and_ret;
@@ -8491,7 +8564,7 @@ static int run_list(struct pipe *pi)
                         G.last_bg_pid = pi->cmds[pi->num_cmds - 1].pid;
                         G.last_bg_pid_exitcode = 0;
                         debug_printf_exec(": cmd&: exitcode EXIT_SUCCESS\n");
-/* Check pi->pi_inverted? "! sleep 1 & echo $?": bash says 1. dash and ash says 0 */
+/* Check pi->pi_inverted? "! sleep 1 & echo $?": bash says 1. dash and ash say 0 */
                         rcode = EXIT_SUCCESS;
                         goto check_traps;
                 } else {
@@ -8600,6 +8673,10 @@ static void install_sighandlers(unsigned mask)
                  */
                 if (sig == SIGCHLD)
                         continue;
+                /* bash re-enables SIGHUP which is SIG_IGNed on entry.
+                 * Try: "trap '' HUP; bash; echo RET" and type "kill -HUP $$"
+                 */
+                //if (sig == SIGHUP) continue; - TODO?
                 if (old_handler == SIG_IGN) {
                         /* oops... restore back to IGN, and record this fact */
                         install_sighandler(sig, old_handler);
@@ -9381,13 +9458,20 @@ static int FAST_FUNC builtin_read(char **argv)
         char *opt_p = NULL;
         char *opt_t = NULL;
         char *opt_u = NULL;
+        char *opt_d = NULL; /* optimized out if !BASH */
         const char *ifs;
         int read_flags;
 
         /* "!": do not abort on errors.
          * Option string must start with "sr" to match BUILTIN_READ_xxx
          */
-        read_flags = getopt32(argv, "!srn:p:t:u:", &opt_n, &opt_p, &opt_t, &opt_u);
+        read_flags = getopt32(argv,
+#if BASH_READ_D
+                "!srn:p:t:u:d:", &opt_n, &opt_p, &opt_t, &opt_u, &opt_d
+#else
+                "!srn:p:t:u:", &opt_n, &opt_p, &opt_t, &opt_u
+#endif
+        );
         if (read_flags == (uint32_t)-1)
                 return EXIT_FAILURE;
         argv += optind;
@@ -9401,7 +9485,8 @@ static int FAST_FUNC builtin_read(char **argv)
                 opt_n,
                 opt_p,
                 opt_t,
-                opt_u
+                opt_u,
+                opt_d
         );
 
         if ((uintptr_t)r == 1 && errno == EINTR) {
@@ -9786,6 +9871,93 @@ static int FAST_FUNC builtin_shift(char **argv)
         return EXIT_FAILURE;
 }
 
+#if ENABLE_HUSH_GETOPTS
+static int FAST_FUNC builtin_getopts(char **argv)
+{
+/* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/getopts.html
+
+TODO:
+If a required argument is not found, and getopts is not silent,
+a question mark (?) is placed in VAR, OPTARG is unset, and a
+diagnostic message is printed.  If getopts is silent, then a
+colon (:) is placed in VAR and OPTARG is set to the option
+character found.
+
+Test that VAR is a valid variable name?
+
+"Whenever the shell is invoked, OPTIND shall be initialized to 1"
+*/
+        char cbuf[2];
+        const char *cp, *optstring, *var;
+        int c, exitcode;
+
+        optstring = *++argv;
+        if (!optstring || !(var = *++argv)) {
+                bb_error_msg("usage: getopts OPTSTRING VAR [ARGS]");
+                return EXIT_FAILURE;
+        }
+
+        c = 0;
+        if (optstring[0] != ':') {
+                cp = get_local_var_value("OPTERR");
+                /* 0 if "OPTERR=0", 1 otherwise */
+                c = (!cp || NOT_LONE_CHAR(cp, '0'));
+        }
+        opterr = c;
+        cp = get_local_var_value("OPTIND");
+        optind = cp ? atoi(cp) : 0;
+        optarg = NULL;
+        cbuf[1] = '\0';
+
+        /* getopts stops on first non-option. Add "+" to force that */
+        /*if (optstring[0] != '+')*/ {
+                char *s = alloca(strlen(optstring) + 2);
+                sprintf(s, "+%s", optstring);
+                optstring = s;
+        }
+
+        if (argv[1])
+                argv[0] = G.global_argv[0]; /* for error messages */
+        else
+                argv = G.global_argv;
+        c = getopt(string_array_len(argv), argv, optstring);
+
+        /* Set OPTARG */
+        /* Always set or unset, never left as-is, even on exit/error:
+         * "If no option was found, or if the option that was found
+         * does not have an option-argument, OPTARG shall be unset."
+         */
+        cp = optarg;
+        if (c == '?') {
+                /* If ":optstring" and unknown option is seen,
+                 * it is stored to OPTARG.
+                 */
+                if (optstring[1] == ':') {
+                        cbuf[0] = optopt;
+                        cp = cbuf;
+                }
+        }
+        if (cp)
+                set_local_var_from_halves("OPTARG", cp);
+        else
+                unset_local_var("OPTARG");
+
+        /* Convert -1 to "?" */
+        exitcode = EXIT_SUCCESS;
+        if (c < 0) { /* -1: end of options */
+                exitcode = EXIT_FAILURE;
+                c = '?';
+        }
+
+        /* Set VAR and OPTIND */
+        cbuf[0] = c;
+        set_local_var_from_halves(var, cbuf);
+        set_local_var_from_halves("OPTIND", utoa(optind));
+
+        return exitcode;
+}
+#endif
+
 static int FAST_FUNC builtin_source(char **argv)
 {
         char *arg_path, *filename;
@@ -10178,6 +10350,7 @@ static int wait_for_child_or_signal(struct pipe *waitfor_pipe, pid_t waitfor_pid
                 /* So, did we get a signal? */
                 sig = check_and_run_traps();
                 if (sig /*&& sig != SIGCHLD - always true */) {
+                        /* Do this for any (non-ignored) signal, not only for ^C */
                         ret = 128 + sig;
                         break;
                 }
@@ -10344,6 +10517,41 @@ static int FAST_FUNC builtin_return(char **argv)
 }
 #endif
 
+#if ENABLE_HUSH_TIMES
+static int FAST_FUNC builtin_times(char **argv UNUSED_PARAM)
+{
+        static const uint8_t times_tbl[] ALIGN1 = {
+                ' ',  offsetof(struct tms, tms_utime),
+                '\n', offsetof(struct tms, tms_stime),
+                ' ',  offsetof(struct tms, tms_cutime),
+                '\n', offsetof(struct tms, tms_cstime),
+                0
+        };
+        const uint8_t *p;
+        unsigned clk_tck;
+        struct tms buf;
+
+        clk_tck = bb_clk_tck();
+
+        times(&buf);
+        p = times_tbl;
+        do {
+                unsigned sec, frac;
+                unsigned long t;
+                t = *(clock_t *)(((char *) &buf) + p[1]);
+                sec = t / clk_tck;
+                frac = t % clk_tck;
+                printf("%um%u.%03us%c",
+                        sec / 60, sec % 60,
+                        (frac * 1000) / clk_tck,
+                        p[0]);
+                p += 2;
+        } while (*p);
+
+        return EXIT_SUCCESS;
+}
+#endif
+
 #if ENABLE_HUSH_MEMLEAK
 static int FAST_FUNC builtin_memleak(char **argv UNUSED_PARAM)
 {
diff --git a/shell/hush_test/hush-getopts/getopt_optarg.right b/shell/hush_test/hush-getopts/getopt_optarg.right
new file mode 100644
index 000000000..9dbd8460e
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_optarg.right
@@ -0,0 +1,18 @@
+*** no OPTIND, optstring:'w:et' args:-q -w e -r -t -y
+./getopt_optarg.tests: invalid option -- q
+var:'?' OPTIND:2 OPTARG:''
+var:'w' OPTIND:4 OPTARG:'e'
+./getopt_optarg.tests: invalid option -- r
+var:'?' OPTIND:5 OPTARG:''
+var:'t' OPTIND:6 OPTARG:''
+./getopt_optarg.tests: invalid option -- y
+var:'?' OPTIND:7 OPTARG:''
+exited: var:'?' OPTIND:7 OPTARG:''
+*** OPTIND=0, optstring:'w:et' args:-w 1 -w2 -w -e -e -t -t
+var:'w' OPTIND:3 OPTARG:'1'
+var:'w' OPTIND:4 OPTARG:'2'
+var:'w' OPTIND:6 OPTARG:'-e'
+var:'e' OPTIND:7 OPTARG:''
+var:'t' OPTIND:8 OPTARG:''
+var:'t' OPTIND:9 OPTARG:''
+exited: var:'?' OPTIND:9 OPTARG:''
diff --git a/shell/hush_test/hush-getopts/getopt_optarg.tests b/shell/hush_test/hush-getopts/getopt_optarg.tests
new file mode 100755
index 000000000..881cc7884
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_optarg.tests
@@ -0,0 +1,24 @@
+(
+
+set -- -q -w e -r -t -y
+echo "*** no OPTIND, optstring:'w:et' args:$*"
+var=QWERTY
+OPTARG=ASDFGH
+while getopts "w:et" var; do
+        echo "var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+        OPTARG=ASDFGH
+done
+echo "exited: var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+set -- -w 1 -w2 -w -e -e -t -t
+echo "*** OPTIND=0, optstring:'w:et' args:$*"
+OPTIND=0
+while getopts "w:et" var; do
+        echo "var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+        OPTARG=ASDFGH
+done
+echo "exited: var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/hush_test/hush-getopts/getopt_positional.right b/shell/hush_test/hush-getopts/getopt_positional.right
new file mode 100644
index 000000000..f1c942476
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_positional.right
@@ -0,0 +1,6 @@
+*** no OPTIND, optstring:'we' args:-q -w -e r -t -y
+./getopt_positional.tests: invalid option -- q
+var:'?' OPTIND:2
+var:'w' OPTIND:3
+var:'e' OPTIND:4
+exited: var:'?' OPTIND:4
diff --git a/shell/hush_test/hush-getopts/getopt_positional.tests b/shell/hush_test/hush-getopts/getopt_positional.tests
new file mode 100755
index 000000000..20716bb0c
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_positional.tests
@@ -0,0 +1,13 @@
+(
+
+set -- -q -w -e r -t -y
+echo "*** no OPTIND, optstring:'we' args:$*"
+var=QWERTY
+while getopts "we" var; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: var:'$var' OPTIND:$OPTIND"
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/hush_test/hush-getopts/getopt_silent.right b/shell/hush_test/hush-getopts/getopt_silent.right
new file mode 100644
index 000000000..03d4eb149
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_silent.right
@@ -0,0 +1,6 @@
+*** optstring:':ac' args:-a -b -c
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+2 rc:0 var:'?' OPTIND:3 OPTARG:'b'
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+4 rc:1 var:'?' OPTIND:4 OPTARG:''
+5 rc:1 var:'?' OPTIND:4 OPTARG:''
diff --git a/shell/hush_test/hush-getopts/getopt_silent.tests b/shell/hush_test/hush-getopts/getopt_silent.tests
new file mode 100755
index 000000000..5f255db7f
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_silent.tests
@@ -0,0 +1,29 @@
+# Open Group Base Specifications Issue 7:
+# """
+# If an unknown option is met, VAR shall be set to "?". In this case,
+# if the first character in optstring is ":", OPTARG shall be set
+# to the option character found, but no output shall be written
+# to standard error; otherwise, the shell variable OPTARG shall be
+# unset and a diagnostic message shall be written to standard error."
+# ...
+# If an option-argument is missing:
+# If the first character of optstring is ":", VAR shall be set to ":"
+# and OPTARG shall be set to the option character found.
+# """
+
+(
+
+echo "*** optstring:':ac' args:-a -b -c"
+getopts ":ac" var -a -b -c; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts ":ac" var -a -b -c; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts ":ac" var -a -b -c; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts ":ac" var -a -b -c; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+# Previous line should result in "rc:1", which is normally treated
+# in getopts loops as exit condition.
+# Nevertheless, let's verify that calling it yet another time doesn't do
+# anything weird:
+getopts ":ac" var -a -b -c; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/hush_test/hush-getopts/getopt_simple.right b/shell/hush_test/hush-getopts/getopt_simple.right
new file mode 100644
index 000000000..b4855fa1a
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_simple.right
@@ -0,0 +1,34 @@
+*** no OPTIND, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** OPTIND=1, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** OPTIND=0, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** unset OPTIND, optstring:'ab' args:-a -b c
+var:'a' OPTIND:2
+var:'b' OPTIND:3
+exited: rc:0 var:'?' OPTIND:3
+*** optstring:'ab' args:-a -b c
+1 rc:0 var:'a' OPTIND:2
+2 rc:0 var:'b' OPTIND:3
+3 rc:1 var:'?' OPTIND:3
+*** unset OPTIND, optstring:'ab' args:-a c -c -b d
+var:'a' OPTIND:2
+exited: rc:0 var:'?' OPTIND:2
+*** unset OPTIND, optstring:'ab' args:-a -c -b d
+var:'a' OPTIND:2
+./getopt_simple.tests: invalid option -- c
+var:'?' OPTIND:3
+var:'b' OPTIND:4
+exited: rc:0 var:'?' OPTIND:4
+*** unset OPTIND, OPTERR=0, optstring:'ab' args:-a -c -b d
+var:'a' OPTIND:2
+var:'?' OPTIND:3
+var:'b' OPTIND:4
+exited: rc:0 var:'?' OPTIND:4
diff --git a/shell/hush_test/hush-getopts/getopt_simple.tests b/shell/hush_test/hush-getopts/getopt_simple.tests
new file mode 100755
index 000000000..50718cc98
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_simple.tests
@@ -0,0 +1,81 @@
+# Simple usage cases for getopts.
+#
+# OPTIND is either not touched at all (first loop with getopts,
+# relying on shell startup init), or getopts state is reset
+# before new loop with "unset OPTIND", "OPTIND=1" or "OPTIND=0".
+#
+# Each option is a separate argument (no "-abc"). This conceptually
+# needs only $OPTIND to hold getopts state.
+#
+# We check that loop does not stop on unknown option (sets "?"),
+# stops on _first_ non-option argument.
+
+(
+
+echo "*** no OPTIND, optstring:'ab' args:-a -b c"
+var=QWERTY
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+# unfortunately, "rc:0" is shown since while's overall exitcode is "success"
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Resetting behavior =1
+echo "*** OPTIND=1, optstring:'ab' args:-a -b c"
+OPTIND=1
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Resetting behavior =0
+echo "*** OPTIND=0, optstring:'ab' args:-a -b c"
+OPTIND=0
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Resetting behavior "unset"
+echo "*** unset OPTIND, optstring:'ab' args:-a -b c"
+unset OPTIND
+while getopts "ab" var -a -b c; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# What is the final exitcode?
+echo "*** optstring:'ab' args:-a -b c"
+unset OPTIND
+getopts "ab" var -a -b c; echo "1 rc:$? var:'$var' OPTIND:$OPTIND"
+getopts "ab" var -a -b c; echo "2 rc:$? var:'$var' OPTIND:$OPTIND"
+getopts "ab" var -a -b c; echo "3 rc:$? var:'$var' OPTIND:$OPTIND"
+
+# Where would it stop? c or -c?
+echo "*** unset OPTIND, optstring:'ab' args:-a c -c -b d"
+unset OPTIND
+while getopts "ab" var -a c -c -b d; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# What happens on unknown option?
+echo "*** unset OPTIND, optstring:'ab' args:-a -c -b d"
+unset OPTIND
+while getopts "ab" var -a -c -b d; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+# ORTERR=0 suppresses error message?
+echo "*** unset OPTIND, OPTERR=0, optstring:'ab' args:-a -c -b d"
+unset OPTIND
+OPTERR=0
+while getopts "ab" var -a -c -b d; do
+        echo "var:'$var' OPTIND:$OPTIND"
+done
+echo "exited: rc:$? var:'$var' OPTIND:$OPTIND"
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/hush_test/hush-getopts/getopt_test_libc_bug.right b/shell/hush_test/hush-getopts/getopt_test_libc_bug.right
new file mode 100644
index 000000000..6694e8f0c
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_test_libc_bug.right
@@ -0,0 +1,26 @@
+*** optstring:'ac' args:-a -b -c -d e
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+./getopt_test_libc_bug.tests: invalid option -- b
+2 rc:0 var:'?' OPTIND:3 OPTARG:''
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+./getopt_test_libc_bug.tests: invalid option -- d
+4 rc:0 var:'?' OPTIND:5 OPTARG:''
+5 rc:1 var:'?' OPTIND:5 OPTARG:''
+
+*** optstring:'ac' args:-a -b -c -d e
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+./getopt_test_libc_bug.tests: invalid option -- b
+2 rc:0 var:'?' OPTIND:3 OPTARG:''
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+./getopt_test_libc_bug.tests: invalid option -- d
+4 rc:0 var:'?' OPTIND:5 OPTARG:''
+5 rc:1 var:'?' OPTIND:5 OPTARG:''
+
+*** optstring:'ac' args:-a -b -c -d e
+1 rc:0 var:'a' OPTIND:2 OPTARG:''
+./getopt_test_libc_bug.tests: invalid option -- b
+2 rc:0 var:'?' OPTIND:3 OPTARG:''
+3 rc:0 var:'c' OPTIND:4 OPTARG:''
+./getopt_test_libc_bug.tests: invalid option -- d
+4 rc:0 var:'?' OPTIND:5 OPTARG:''
+5 rc:1 var:'?' OPTIND:5 OPTARG:''
diff --git a/shell/hush_test/hush-getopts/getopt_test_libc_bug.tests b/shell/hush_test/hush-getopts/getopt_test_libc_bug.tests
new file mode 100755
index 000000000..ab7bc3b09
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_test_libc_bug.tests
@@ -0,0 +1,44 @@
+# This test can fail with libc with buggy getopt() implementation.
+# If getopt() wants to parse multi-option args (-abc),
+# it needs to remember a position within current arg.
+#
+# If this position is kept as a POINTER, not an offset,
+# and if argv[] ADDRESSES (not contents!) change, it blows up.
+
+(
+
+echo "*** optstring:'ac' args:-a -b -c -d e"
+getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+# Above: args are (usually) in the same locations in memory.
+# Below: variable allocations change the location.
+
+echo
+echo "*** optstring:'ac' args:-a -b -c -d e"
+unset OPTIND
+OPTARG=QWERTY; getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+NEWVAR=NEWVAL; getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+VAR111=NEWVAL; getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+VAR222=NEWVAL; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+VAR333=NEWVAL; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+# Slightly different attempts to force reallocations
+
+echo
+echo "*** optstring:'ac' args:-a -b -c -d e"
+unset OPTIND
+export OPTARG; getopts "ac" var -a -b -c -d e; echo "1 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export NEWVAR; getopts "ac" var -a -b -c -d e; echo "2 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export VAR111; getopts "ac" var -a -b -c -d e; echo "3 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export VAR222; getopts "ac" var -a -b -c -d e; echo "4 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+export VAR333; getopts "ac" var -a -b -c -d e; echo "5 rc:$? var:'$var' OPTIND:$OPTIND OPTARG:'$OPTARG'"
+
+# All copies of code above should generate identical output
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/hush_test/hush-parsing/groups_and_keywords2.right b/shell/hush_test/hush-parsing/groups_and_keywords2.right
new file mode 100644
index 000000000..ae74a5db9
--- /dev/null
+++ b/shell/hush_test/hush-parsing/groups_and_keywords2.right
@@ -0,0 +1,3 @@
+hush: syntax error: unexpected )
+Fail:2
+hush: syntax error: unexpected )
diff --git a/shell/hush_test/hush-parsing/groups_and_keywords2.tests b/shell/hush_test/hush-parsing/groups_and_keywords2.tests
new file mode 100755
index 000000000..ab33b909f
--- /dev/null
+++ b/shell/hush_test/hush-parsing/groups_and_keywords2.tests
@@ -0,0 +1,9 @@
+# This is an error
+(eval 'if() { echo; }')
+echo Fail:$?
+# ^^^^^^ bash prints 1, but interactively it sets $? = 2
+# we print 2
+
+# This is an error, and it aborts in script
+if() { echo; }
+echo Not reached
diff --git a/shell/hush_test/run-all b/shell/hush_test/run-all
index 1dd0edc39..3fbc7c531 100755
--- a/shell/hush_test/run-all
+++ b/shell/hush_test/run-all
@@ -80,7 +80,7 @@ do_test()
                 case $? in
                         0)  echo " ok";;
                         77) echo " skip (feature disabled)";;
-                        *)  echo " fail"; tret=1;;
+                        *)  echo " fail ($?)"; tret=1;;
                 esac
         done
         exit ${tret}
diff --git a/shell/math.c b/shell/math.c
index 006221b6a..f01f24362 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -743,7 +743,7 @@ arith(arith_state_t *math_state, const char *expr)
  *    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/shell/shell_common.c b/shell/shell_common.c
index 750adc5d8..bc34de404 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -58,7 +58,8 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
         const char *opt_n,
         const char *opt_p,
         const char *opt_t,
-        const char *opt_u
+        const char *opt_u,
+        const char *opt_d
 )
 {
         struct pollfd pfd[1];
@@ -68,6 +69,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
         int nchars; /* -n NUM */
         char **pp;
         char *buffer;
+        char delim;
         struct termios tty, old_tty;
         const char *retval;
         int bufpos; /* need to be able to hold -1 */
@@ -188,6 +190,7 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                 end_ms += (unsigned)monotonic_ms();
         buffer = NULL;
         bufpos = 0;
+        delim = opt_d ? *opt_d : '\n';
         do {
                 char c;
                 int timeout;
@@ -243,14 +246,14 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
                                 continue;
                         }
                 }
-                if (c == '\n')
+                if (c == delim) /* '\n' or -d CHAR */
                         break;
 
                 /* $IFS splitting. NOT done if we run "read"
                  * without variable names (bash compat).
                  * Thus, "read" and "read REPLY" are not the same.
                  */
-                if (argv[0]) {
+                if (!opt_d && argv[0]) {
 /* http://www.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_05 */
                         const char *is_ifs = strchr(ifs, c);
                         if (startword && is_ifs) {
diff --git a/shell/shell_common.h b/shell/shell_common.h
index a82535c86..875fd9ea7 100644
--- a/shell/shell_common.h
+++ b/shell/shell_common.h
@@ -34,6 +34,11 @@ enum {
         BUILTIN_READ_SILENT = 1 << 0,
         BUILTIN_READ_RAW    = 1 << 1,
 };
+//TODO? do not provide bashisms if not asked for:
+//#if !ENABLE_HUSH_BASH_COMPAT && !ENABLE_ASH_BASH_COMPAT
+//#define shell_builtin_read(setvar,argv,ifs,read_flags,n,p,t,u,d)
+//      shell_builtin_read(setvar,argv,ifs,read_flags)
+//#endif
 const char* FAST_FUNC
 shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
         char       **argv,
@@ -42,7 +47,8 @@ shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val),
         const char *opt_n,
         const char *opt_p,
         const char *opt_t,
-        const char *opt_u
+        const char *opt_u,
+        const char *opt_d
 );
 
 int FAST_FUNC
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 6769a8175..1e0384c09 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -77,14 +77,14 @@ static int pencode(char *s)
                 ;
         if (*s) {
                 *s = '\0';
-                fac = decode(save, facilitynames);
+                fac = decode(save, bb_facilitynames);
                 if (fac < 0)
                         bb_error_msg_and_die("unknown %s name: %s", "facility", save);
                 *s++ = '.';
         } else {
                 s = save;
         }
-        lev = decode(s, prioritynames);
+        lev = decode(s, bb_prioritynames);
         if (lev < 0)
                 bb_error_msg_and_die("unknown %s name: %s", "priority", save);
         return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
@@ -167,7 +167,7 @@ int logger_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/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 31730a7f9..4265f4f90 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -447,7 +447,7 @@ static void parse_syslogdcfg(const char *file)
                                 primap = 0xff; /* all 8 log levels enabled */
                         else {
                                 uint8_t priority;
-                                code = find_by_name(t, prioritynames);
+                                code = find_by_name(t, bb_prioritynames);
                                 if (!code)
                                         goto cfgerr;
                                 primap = 0;
@@ -480,7 +480,7 @@ static void parse_syslogdcfg(const char *file)
                                         next_facility = strchr(t, ',');
                                         if (next_facility)
                                                 *next_facility++ = '\0';
-                                        code = find_by_name(t, facilitynames);
+                                        code = find_by_name(t, bb_facilitynames);
                                         if (!code)
                                                 goto cfgerr;
                                         /* "mark" is not a real facility, skip it */
@@ -797,9 +797,9 @@ static void parse_fac_prio_20(int pri, char *res20)
 {
         const CODE *c_pri, *c_fac;
 
-        c_fac = find_by_val(LOG_FAC(pri) << 3, facilitynames);
+        c_fac = find_by_val(LOG_FAC(pri) << 3, bb_facilitynames);
         if (c_fac) {
-                c_pri = find_by_val(LOG_PRI(pri), prioritynames);
+                c_pri = find_by_val(LOG_PRI(pri), bb_prioritynames);
                 if (c_pri) {
                         snprintf(res20, 20, "%s.%s", c_fac->c_name, c_pri->c_name);
                         return;
@@ -1109,8 +1109,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         /* No non-option params */
-        opt_complementary = "=0";
-        opts = getopt32(argv, OPTION_STR, OPTION_PARAM);
+        opts = getopt32(argv, "^"OPTION_STR"\0""=0", OPTION_PARAM);
 #if ENABLE_FEATURE_REMOTE_LOG
         while (remoteAddrList) {
                 remoteHost_t *rh = xzalloc(sizeof(*rh));
diff --git a/sysklogd/syslogd_and_logger.c b/sysklogd/syslogd_and_logger.c
index 6458a9332..6d06a718b 100644
--- a/sysklogd/syslogd_and_logger.c
+++ b/sysklogd/syslogd_and_logger.c
@@ -43,6 +43,17 @@ typedef struct _code {
  */
 #endif
 
+/* musl decided to be funny and it implements these as giant defines
+ * of the form: ((CODE *)(const CODE []){ ... })
+ * Which works, but causes _every_ function using them
+ * to have a copy on stack (at least with gcc-6.3.0).
+ * If we reference them just once, this saves 150 bytes.
+ * The pointers themselves are optimized out
+ * (no size change on uclibc).
+ */
+static const CODE *const bb_prioritynames = prioritynames;
+static const CODE *const bb_facilitynames = facilitynames;
+
 #if ENABLE_SYSLOGD
 #include "syslogd.c"
 #endif
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index 8515aff31..8e53ec564 100755
--- a/testsuite/mdev.tests
+++ b/testsuite/mdev.tests
@@ -168,7 +168,7 @@ SKIP=
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf
-optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH ASH_ECHO
+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME SH_IS_ASH ASH_ECHO
 testing "mdev command" \
         "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
         ls -lnR mdev.testdir/dev | $FILTER_LS" \
@@ -183,7 +183,7 @@ SKIP=
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 644 =block/ @echo @echo TEST:\$MDEV" >mdev.testdir/etc/mdev.conf
-optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH
+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME SH_IS_ASH
 testing "mdev move and command" \
         "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
         ls -lnR mdev.testdir/dev | $FILTER_LS2" \
diff --git a/testsuite/parse.tests b/testsuite/parse.tests
index 904e1a17a..2cbed6f31 100755
--- a/testsuite/parse.tests
+++ b/testsuite/parse.tests
@@ -5,13 +5,13 @@
 
 . ./testing.sh
 
-COLLAPSE=$(( 0x00010000))
-TRIM=$((     0x00020000))
-GREEDY=$((   0x00040000))
-MIN_DIE=$((  0x00100000))
-KEEP_COPY=$((0x00200000))
-ESCAPE=$((   0x00400000))
-NORMAL=$((   COLLAPSE | TRIM | GREEDY))
+COLLAPSE=$((    0x00010000))
+TRIM=$((        0x00020000))
+GREEDY=$((      0x00040000))
+MIN_DIE=$((     0x00100000))
+KEEP_COPY=$((   0x00200000))
+EOL_COMMENTS=$((0x00400000))
+NORMAL=$((   COLLAPSE | TRIM | GREEDY | EOL_COMMENTS))
 
 # testing "description" "command" "result" "infile" "stdin"
 
@@ -27,6 +27,34 @@ testing "parse notrim" \
         "-" \
         " sda 0:0 644 @echo @echo TEST \n"
 
+testing "parse comments" \
+        "parse -n 4 -m 3 -f $((NORMAL - EOL_COMMENTS)) -" \
+        "[sda][0:0][644][@echo @echo TEST #this is not eaten]\n" \
+        "-" \
+        "\
+# sda 0:0 644 @echo @echo TEST - this gets eaten
+ sda 0:0 644 @echo @echo TEST #this is not eaten
+"
+
+testing "parse bad comment" \
+        "parse -n 2 -m 2 -d '#=' -f $((GREEDY)) - 2>&1" \
+        "\
+[var][val]
+parse: bad line 3: 1 tokens found, 2 needed
+[  #this][ok]
+[  #this][=ok]
+[  #this][=ok=ok=ok=]
+" \
+        "-" \
+        "\
+# this gets eaten
+var=val
+  #this causes error msg
+  #this=ok
+  #this==ok
+  #this==ok=ok=ok=
+"
+
 FILE=__parse
 cat >$FILE <<EOF
 #
@@ -96,6 +124,8 @@ cat >$FILE.res <<EOF
 [option][dns][129.219.13.81]
 [option][domain][local]
 [option][lease][864000]
+[option][msstaticroutes][10.0.0.0/8][10.127.0.1]
+[option][staticroutes][10.0.0.0/8][10.127.0.1,][10.11.12.0/24][10.11.12.1]
 [option][0x08][01020304]
 EOF
 
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 1675b07b1..b7cd74ca5 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -279,7 +279,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2
 testing "tar does not extract into symlinks" "\
 >>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
 " "\
-tar: can't create symlink 'passwd' to '/tmp/passwd'
+tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract
 0
 " \
 "" "\
@@ -299,7 +299,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2
 testing "tar -k does not extract into symlinks" "\
 >>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
 " "\
-tar: can't create symlink 'passwd' to '/tmp/passwd'
+tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract
 0
 " \
 "" "\
@@ -324,11 +324,11 @@ rm -rf etc usr
 ' "\
 etc/ssl/certs/3b2716e5.0
 etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem
+tar: skipping unsafe symlink to '/usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract
 etc/ssl/certs/f80cc7f6.0
 usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt
 0
 etc/ssl/certs/3b2716e5.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem
-etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem -> /usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt
 etc/ssl/certs/f80cc7f6.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem
 " \
 "" ""
@@ -346,9 +346,9 @@ ls symlink/bb_test_evilfile
 ' "\
 anything.txt
 symlink
+tar: skipping unsafe symlink to '/tmp' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract
 symlink/bb_test_evilfile
-tar: can't create symlink 'symlink' to '/tmp'
-1
+0
 ls: /tmp/bb_test_evilfile: No such file or directory
 ls: bb_test_evilfile: No such file or directory
 symlink/bb_test_evilfile
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);