16 files changed, 160 insertions, 180 deletions

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: