Merge branch 'busybox' into merge

23 files changed, 197 insertions, 158 deletions

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