Merge branch 'busybox' into merge

8 files changed, 18 insertions, 16 deletions

diff --git a/miscutils/Kbuild.src b/miscutils/Kbuild.src
index 7b449e6e8..503f54904 100644
--- a/miscutils/Kbuild.src
+++ b/miscutils/Kbuild.src
@@ -25,8 +25,13 @@ lib-$(CONFIG_FLASH_UNLOCK)   += flash_lock_unlock.o
 lib-$(CONFIG_IONICE)      += ionice.o
 lib-$(CONFIG_HDPARM)      += hdparm.o
 lib-$(CONFIG_INOTIFYD)    += inotifyd.o
-lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
-lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o
+
+ifeq ($(CONFIG_FEATURE_LAST_FANCY),y)
+lib-$(CONFIG_FEATURE_LAST_FANCY) += last_fancy.o
+else
+lib-$(CONFIG_LAST)        += last.o
+endif
+
 lib-$(CONFIG_LESS)        += less.o
 lib-$(CONFIG_MAKEDEVS)    += makedevs.o
 lib-$(CONFIG_MAN)         += man.o
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index f6468c116..e80158e39 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -388,8 +388,8 @@ int conspy_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
         strcpy(G.vcsa_name, DEV_VCSA);
 
-        opt_complementary = "x+:y+"; // numeric params
-        opts = getopt32(argv, "vcQsndfFx:y:", &G.x, &G.y);
+        // numeric params
+        opts = getopt32(argv, "vcQsndfFx:+y:+", &G.x, &G.y);
         argv += optind;
         ttynum = 0;
         if (argv[0]) {
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 57bb72ae7..7731466f7 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -908,7 +908,7 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
 
         int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0;
         unsigned first = 0x00, last = 0xff, opts;
-        int *block = (int *)bb_common_bufsiz1;
+        int block[I2CDUMP_NUM_REGS];
         char *opt_r_str, *dash;
         int fd, res;
 
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index 0c14256ab..5fcb653a8 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -60,9 +60,8 @@ int ionice_main(int argc UNUSED_PARAM, char **argv)
         };
 
         /* Numeric params */
-        opt_complementary = "n+:c+:p+";
         /* '+': stop at first non-option */
-        opt = getopt32(argv, "+n:c:p:", &pri, &ioclass, &pid);
+        opt = getopt32(argv, "+n:+c:+p:+", &pri, &ioclass, &pid);
         argv += optind;
 
         if (opt & OPT_c) {
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index d9e8f9187..dfc9771d8 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -64,8 +64,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv)
         unsigned opts;
 
         // fetch options
-        opt_complementary = "=1:s+:d+:t+"; // exactly one arg, numeric options
-        opts = getopt32(argv, "Xs:d:t:", &speed, &delay, &timeout);
+        opts = getopt32(argv, "Xs:+d:+t:+", &speed, &delay, &timeout);
 //      argc -= optind;
         argv += optind;
 
diff --git a/miscutils/setsid.c b/miscutils/setsid.c
index 1b27377b2..9bddc2fcf 100644
--- a/miscutils/setsid.c
+++ b/miscutils/setsid.c
@@ -29,7 +29,7 @@ int setsid_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
 
         opt_complementary = "-1"; /* at least one arg */
-        opt = getopt32(argv, "c");
+        opt = getopt32(argv, "+c"); /* +: stop on first non-opt */
         argv += optind;
 
         /* setsid() is allowed only when we are not a process group leader.
diff --git a/miscutils/timeout.c b/miscutils/timeout.c
index 9d56593ba..8df9ff0fd 100644
--- a/miscutils/timeout.c
+++ b/miscutils/timeout.c
@@ -52,9 +52,8 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         /* -p option is not documented, it is needed to support NOMMU. */
 
         /* -t SECONDS; -p PARENT_PID */
-        opt_complementary = "t+" USE_FOR_NOMMU(":p+");
         /* '+': stop at first non-option */
-        getopt32(argv, "+s:t:" USE_FOR_NOMMU("p:"), &opt_s, &timeout, &parent);
+        getopt32(argv, "+s:t:+" USE_FOR_NOMMU("p:+"), &opt_s, &timeout, &parent);
         /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
         signo = get_signum(opt_s);
         if (signo < 0)
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 4364bc807..8e55e9577 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -134,8 +134,8 @@ 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:d+:n+:a+:O+";
-                opts = getopt32(argv, "md:n:N:s:a:t:O:",
+                opt_complementary = "-1";
+                opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+",
                                 &dev_num, &vol_id,
                                 &vol_name, &size_bytes_str, &alignment, &type,
                                 &vid_hdr_offset
@@ -146,8 +146,8 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
                 opts = getopt32(argv, "s:at", &size_bytes_str);
                 opts *= OPTION_s;
         } else {
-                opt_complementary = "-1:m+:d+:n+:a+";
-                opts = getopt32(argv, "m:d:n:N:s:a:t:",
+                opt_complementary = "-1";
+                opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:",
                                 &mtd_num, &dev_num, &vol_id,
                                 &vol_name, &size_bytes_str, &alignment, &type
                 );