Merge branch 'busybox' into merge

author: Ron Yorston <rmy@pobox.com> 2016-07-07 14:28:08 +0100
committer: Ron Yorston <rmy@pobox.com> 2016-07-07 14:58:55 +0100
commit: 613f46218c53c8cabdbf0435653e74e0e0e91e1c (patch)
tree: ca06a7e7a3e4c861441acb4ea20648d7827fa6ae
parent: a0c61c9492723dd31681f878f9c68c92817a476d (diff)
parent: 237bedd499c58034a1355484d6d4d906f0180308 (diff)
download: busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.gz
busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.bz2
busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.zip
94 files changed, 692 insertions, 459 deletions
diff --git a/Config.in b/Config.in
index a504c745e..f9f6a3735 100644
--- a/Config.in
+++ b/Config.in
@@ -130,9 +130,21 @@ config FEATURE_COMPRESS_USAGE
          and have very little memory, this might not be a win. Otherwise,
          you probably want this.
+config BUSYBOX
+        bool "Include busybox applet"
+        default y
+        help
+          The busybox applet provides general help regarding busybox and
+          allows the included applets to be listed.  It's also required
+          if applet links are to be installed at runtime.
+          If you can live without these features disabling this will save
+          some space.
 config FEATURE_INSTALLER
        bool "Support --install [-s] to install applet links at runtime"
        default y
+        depends on BUSYBOX
        help
          Enable 'busybox --install [-s]' support. This will allow you to use
          busybox at runtime to create hard links or symlinks for all the
diff --git a/Makefile b/Makefile
index 40ed634a6..ea8d16f34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 VERSION = 1
-PATCHLEVEL = 25
+PATCHLEVEL = 26
 SUBLEVEL = 0
 EXTRAVERSION = .git
 NAME = Unnamed
diff --git a/applets/usage_pod.c b/applets/usage_pod.c
index 0b1c4aadb..ccc166aed 100644
--- a/applets/usage_pod.c
+++ b/applets/usage_pod.c
@@ -90,6 +90,8 @@ int main(void)
                                printf("%s\n\n", usage_array[i].aname);
                }
        }
+        printf("=back\n\n");
        return 0;
 }
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index aaaf67e03..3a483219d 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -121,7 +121,7 @@ int FAST_FUNC bbunpack(char **argv,
                if (!(option_mask32 & SEAMLESS_MAGIC)) {
                        init_transformer_state(&xstate);
-                        xstate.check_signature = 1;
+                        xstate.signature_skipped = 0;
                        /*xstate.src_fd = STDIN_FILENO; - already is */
                        xstate.dst_fd = STDOUT_FILENO;
                        status = unpacker(&xstate);
diff --git a/archival/gzip.c b/archival/gzip.c
index f9bb3c742..8f1e4ff29 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -77,13 +77,15 @@ aa:      85.1% -- replaced with aa.gz
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
 //usage:#define gzip_trivial_usage
-//usage:       "[-cfd" IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
+//usage:       "[-cf" IF_GUNZIP("d") IF_FEATURE_GZIP_LEVELS("123456789") "] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin)\n"
 //usage:        IF_FEATURE_GZIP_LEVELS(
 //usage:     "\n        -1..9   Compression level"
 //usage:        )
+//usage:        IF_GUNZIP(
 //usage:     "\n        -d      Decompress"
+//usage:        )
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 94dbd7a95..74d364379 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -1207,7 +1207,7 @@ unpack_gz_stream(transformer_state_t *xstate)
        if (check_signature16(xstate, GZIP_MAGIC))
                return -1;
 #else
-        if (xstate->check_signature) {
+        if (!xstate->signature_skipped) {
                uint16_t magic2;
                if (full_read(xstate->src_fd, &magic2, 2) != 2) {
@@ -1216,7 +1216,7 @@ unpack_gz_stream(transformer_state_t *xstate)
                        return -1;
                }
                if (magic2 == COMPRESS_MAGIC) {
-                        xstate->check_signature = 0;
+                        xstate->signature_skipped = 2;
                        return unpack_Z_stream(xstate);
                }
                if (magic2 != GZIP_MAGIC)
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index 1f408abfd..cd32cc745 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -55,7 +55,7 @@ unpack_xz_stream(transformer_state_t *xstate)
        iobuf.out = membuf + BUFSIZ;
        iobuf.out_size = BUFSIZ;
-        if (!xstate || xstate->check_signature == 0) {
+        if (!xstate || xstate->signature_skipped) {
                /* Preload XZ file signature */
                strcpy((char*)membuf, HEADER_MAGIC);
                iobuf.in_size = HEADER_MAGIC_SIZE;
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index ac2be726f..ea91a883e 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -60,13 +60,21 @@ static unsigned long long getOctal(char *str, int len)
 }
 #define GET_OCTAL(a) getOctal((a), sizeof(a))
+#define TAR_EXTD (ENABLE_FEATURE_TAR_GNU_EXTENSIONS || ENABLE_FEATURE_TAR_SELINUX)
+#if !TAR_EXTD
+#define process_pax_hdr(archive_handle, sz, global) \
+        process_pax_hdr(archive_handle, sz)
+#endif
 /* "global" is 0 or 1 */
 static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int global)
 {
+#if !TAR_EXTD
+        unsigned blk_sz = (sz + 511) & (~511);
+        seek_by_read(archive_handle->src_fd, blk_sz);
+#else
+        unsigned blk_sz = (sz + 511) & (~511);
        char *buf, *p;
-        unsigned blk_sz;
-        blk_sz = (sz + 511) & (~511);
        p = buf = xmalloc(blk_sz + 1);
        xread(archive_handle->src_fd, buf, blk_sz);
        archive_handle->offset += blk_sz;
@@ -104,30 +112,31 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                p[-1] = '\0';
                value = end + 1;
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
                if (!global && is_prefixed_with(value, "path=")) {
                        value += sizeof("path=") - 1;
                        free(archive_handle->tar__longname);
                        archive_handle->tar__longname = xstrdup(value);
                        continue;
                }
-#endif
+# endif
-#if ENABLE_FEATURE_TAR_SELINUX
+# if ENABLE_FEATURE_TAR_SELINUX
                /* Scan for SELinux contexts, via "RHT.security.selinux" keyword.
                 * This is what Red Hat's patched version of tar uses.
                 */
-# define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
+#  define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
                if (is_prefixed_with(value, SELINUX_CONTEXT_KEYWORD"=")) {
                        value += sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1;
                        free(archive_handle->tar__sctx[global]);
                        archive_handle->tar__sctx[global] = xstrdup(value);
                        continue;
                }
-#endif
+# endif
        }
        free(buf);
+#endif
 }
 char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 7b18aeff4..641256787 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -13,16 +13,13 @@ void FAST_FUNC init_transformer_state(transformer_state_t *xstate)
 int FAST_FUNC check_signature16(transformer_state_t *xstate, unsigned magic16)
 {
-        if (xstate->check_signature) {
+        if (!xstate->signature_skipped) {
                uint16_t magic2;
                if (full_read(xstate->src_fd, &magic2, 2) != 2 || magic2 != magic16) {
                        bb_error_msg("invalid magic");
-#if 0 /* possible future extension */
-                        if (xstate->check_signature > 1)
-                                xfunc_die();
-#endif
                        return -1;
                }
+                xstate->signature_skipped = 2;
        }
        return 0;
 }
@@ -103,7 +100,7 @@ void check_errors_in_children(int signo)
 /* transformer(), more than meets the eye */
 #if BB_MMU
 void FAST_FUNC fork_transformer(int fd,
-        int check_signature,
+        int signature_skipped,
        IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_state_t *xstate)
 )
 #else
@@ -124,7 +121,7 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
                        IF_DESKTOP(long long) int r;
                        transformer_state_t xstate;
                        init_transformer_state(&xstate);
-                        xstate.check_signature = check_signature;
+                        xstate.signature_skipped = signature_skipped;
                        xstate.src_fd = fd;
                        xstate.dst_fd = fd_pipe.wr;
                        r = transformer(&xstate);
@@ -194,12 +191,11 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
                uint16_t b16[2];
                uint32_t b32[1];
        } magic;
-        int offset;
        transformer_state_t *xstate;
-        offset = -2;
        xstate = xzalloc(sizeof(*xstate));
        xstate->src_fd = fd;
+        xstate->signature_skipped = 2;
        /* .gz and .bz2 both have 2-byte signature, and their
         * unpack_XXX_stream wants this header skipped. */
@@ -228,7 +224,7 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
        if (ENABLE_FEATURE_SEAMLESS_XZ
         && magic.b16[0] == XZ_MAGIC1
        ) {
-                offset = -6;
+                xstate->signature_skipped = 6;
                xread(fd, magic.b32, sizeof(magic.b32[0]));
                if (magic.b32[0] == XZ_MAGIC2) {
                        xstate->xformer = unpack_xz_stream;
@@ -250,18 +246,8 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
         */
 //      USE_FOR_MMU(xstate->xformer = copy_stream;)
 //      USE_FOR_NOMMU(xstate->xformer_prog = "cat";)
-        /* fall through to seeking bck over bytes we read earlier */
- USE_FOR_NOMMU(found_magic:)
-        /* NOMMU version of fork_transformer execs
-         * an external unzipper that wants
-         * file position at the start of the file.
-         */
-        xlseek(fd, offset, SEEK_CUR);
- USE_FOR_MMU(found_magic:)
-        /* In MMU case, if magic was found, seeking back is not necessary */
+ found_magic:
        return xstate;
 }
@@ -280,6 +266,12 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
 # if BB_MMU
        fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
 # else
+        /* NOMMU version of fork_transformer execs
+         * an external unzipper that wants
+         * file position at the start of the file.
+         */
+        xlseek(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);
@@ -322,14 +314,22 @@ int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
                return -1;
        fd = xstate->src_fd;
-        if (xstate->xformer) {
 # if BB_MMU
-                fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
+        if (xstate->xformer) {
+                fork_transformer_with_no_sig(fd, xstate->xformer);
+        } else {
+                /* the file is not compressed */
+                xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+                xstate->signature_skipped = 0;
+        }
 # else
-                fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
+        /* NOMMU can't avoid the seek :( */
+        xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+        xstate->signature_skipped = 0;
+        if (xstate->xformer) {
+                fork_transformer_with_sig(fd, xstate->xformer, xstate->xformer_prog);
+        } /* else: the file is not compressed */
 # endif
-        }
-        /* else: the file is not compressed */
        free(xstate);
        return fd;
@@ -357,6 +357,9 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
                }
        } else {
                /* File is not compressed */
+//FIXME: avoid seek
+                xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
+                xstate->signature_skipped = 0;
                image = xmalloc_read(xstate->src_fd, maxsz_p);
        }
diff --git a/archival/tar.c b/archival/tar.c
index c88957734..c87d23597 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1009,7 +1009,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
        /* Prepend '-' to the first argument if required */
        opt_complementary = "--:" // first arg is options
                "tt:vv:" // count -t,-v
-                IF_FEATURE_TAR_FROM("X::T::") // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                "\xff::" // --exclude=PATTERN is a list
 #endif
@@ -1061,13 +1060,13 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
 #endif
        opt = getopt32(argv,
                "txC:f:Oopvk"
-                IF_FEATURE_TAR_CREATE(   "ch"  )
+                IF_FEATURE_TAR_CREATE(   "ch"    )
-                IF_FEATURE_SEAMLESS_BZ2( "j"   )
+                IF_FEATURE_SEAMLESS_BZ2( "j"     )
-                IF_FEATURE_SEAMLESS_LZMA("a"   )
+                IF_FEATURE_SEAMLESS_LZMA("a"     )
-                IF_FEATURE_TAR_FROM(     "T:X:")
+                IF_FEATURE_TAR_FROM(     "T:*X:*")
-                IF_FEATURE_SEAMLESS_GZ(  "z"   )
+                IF_FEATURE_SEAMLESS_GZ(  "z"     )
-                IF_FEATURE_SEAMLESS_XZ(  "J"   )
+                IF_FEATURE_SEAMLESS_XZ(  "J"     )
-                IF_FEATURE_SEAMLESS_Z(   "Z"   )
+                IF_FEATURE_SEAMLESS_Z(   "Z"     )
                IF_FEATURE_TAR_NOPRESERVE_TIME("m")
                IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
                , &base_dir // -C dir
@@ -1228,9 +1227,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
        //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
        //      signal(SIGCHLD, check_errors_in_children);
+#if ENABLE_FEATURE_TAR_CREATE
        /* Create an archive */
        if (opt & OPT_CREATE) {
-#if SEAMLESS_COMPRESSION
+# if SEAMLESS_COMPRESSION
                const char *zipMode = NULL;
                if (opt & OPT_COMPRESS)
                        zipMode = "compress";
@@ -1242,7 +1242,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                        zipMode = "lzma";
                if (opt & OPT_XZ)
                        zipMode = "xz";
-#endif
+# endif
                /* NB: writeTarFile() closes tar_handle->src_fd */
                return writeTarFile(tar_handle->src_fd, verboseFlag,
                                (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
@@ -1250,6 +1250,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                                tar_handle->accept,
                                tar_handle->reject, zipMode);
        }
+#endif
        if (opt & OPT_ANY_COMPRESS) {
                USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 418529fbb..5b82c2855 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.25.0.git
+# Busybox version: 1.26.0.git
-# Mon May 16 09:34:15 2016
+# Thu Jul  7 14:45:07 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -25,6 +25,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_BUSYBOX=y
 CONFIG_FEATURE_INSTALLER=y
 # CONFIG_INSTALL_NO_USR is not set
 # CONFIG_LOCALE_SUPPORT is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index aab5463bc..6a89b5b1e 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.25.0.git
+# Busybox version: 1.26.0.git
-# Mon May 16 09:34:15 2016
+# Thu Jul  7 14:45:07 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -25,6 +25,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_BUSYBOX=y
 CONFIG_FEATURE_INSTALLER=y
 # CONFIG_INSTALL_NO_USR is not set
 # CONFIG_LOCALE_SUPPORT is not set
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 247ed0fda..2630c0d59 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -31,6 +31,7 @@
 //usage:     "\n        -f      Overwrite"
 //usage:     "\n        -i      Prompt before overwrite"
 //usage:     "\n        -l,-s   Create (sym)links"
+//usage:     "\n        -u      Copy only newer files"
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
@@ -49,12 +50,10 @@ int cp_main(int argc, char **argv)
        int flags;
        int status;
        enum {
-                OPT_a = 1 << (sizeof(FILEUTILS_CP_OPTSTR)-1),
+                FILEUTILS_CP_OPTNUM = sizeof(FILEUTILS_CP_OPTSTR)-1,
-                OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)),
-                OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1),
-                OPT_v = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
-                OPT_parents = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
+                /*OPT_rmdest  = FILEUTILS_RMDEST = 1 << FILEUTILS_CP_OPTNUM */
+                OPT_parents = 1 << (FILEUTILS_CP_OPTNUM+1),
 #endif
        };
@@ -76,10 +75,12 @@ int cp_main(int argc, char **argv)
                "recursive\0"      No_argument "R"
                "symbolic-link\0"  No_argument "s"
                "verbose\0"        No_argument "v"
-                "parents\0"        No_argument "\xff"
+                "update\0"         No_argument "u"
+                "remove-destination\0" No_argument "\xff"
+                "parents\0"        No_argument "\xfe"
                ;
 #endif
-        flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPv");
+        flags = getopt32(argv, FILEUTILS_CP_OPTSTR);
        /* Options of cp from GNU coreutils 6.10:
         * -a, --archive
         * -f, --force
@@ -94,6 +95,11 @@ int cp_main(int argc, char **argv)
         * -d   same as --no-dereference --preserve=links
         * -p   same as --preserve=mode,ownership,timestamps
         * -c   same as --preserve=context
+         * -u, --update
+         *      copy only when the SOURCE file is newer than the destination
+         *      file or when the destination file is missing
+         * --remove-destination
+         *      remove each existing destination file before attempting to open
         * --parents
         *      use full source file name under DIRECTORY
         * NOT SUPPORTED IN BBOX:
@@ -106,8 +112,6 @@ int cp_main(int argc, char **argv)
         *      preserve attributes (default: mode,ownership,timestamps),
         *      if possible additional attributes: security context,links,all
         * --no-preserve=ATTR_LIST
-         * --remove-destination
-         *      remove  each existing destination file before attempting to open
         * --sparse=WHEN
         *      control creation of sparse files
         * --strip-trailing-slashes
@@ -118,9 +122,6 @@ int cp_main(int argc, char **argv)
         *      copy all SOURCE arguments into DIRECTORY
         * -T, --no-target-directory
         *      treat DEST as a normal file
-         * -u, --update
-         *      copy only when the SOURCE file is newer than the destination
-         *      file or when the destination file is missing
         * -x, --one-file-system
         *      stay on this file system
         * -Z, --context=CONTEXT
@@ -156,11 +157,16 @@ int cp_main(int argc, char **argv)
                        return EXIT_FAILURE;
 #if ENABLE_FEATURE_CP_LONG_OPTIONS
+                //bb_error_msg("flags:%x FILEUTILS_RMDEST:%x OPT_parents:%x",
+                //      flags, FILEUTILS_RMDEST, OPT_parents);
                if (flags & OPT_parents) {
                        if (!(d_flags & 2)) {
                                bb_error_msg_and_die("with --parents, the destination must be a directory");
                        }
                }
+                if (flags & FILEUTILS_RMDEST) {
+                        flags |= FILEUTILS_FORCE;
+                }
 #endif
                /* ...if neither is a directory...  */
diff --git a/coreutils/df.c b/coreutils/df.c
index d79c11a6c..06b292018 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -188,7 +188,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                        if (opt & OPT_INODE) {
                                s.f_blocks = s.f_files;
                                s.f_bavail = s.f_bfree = s.f_ffree;
-                                s.f_bsize = 1;
+                                s.f_frsize = 1;
                                if (df_disp_hr)
                                        df_disp_hr = 1;
@@ -246,26 +246,26 @@ int df_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_HUMAN_READABLE
                        printf(" %9s ",
-                                /* f_blocks x f_bsize / df_disp_hr, show one fractional,
+                                /* f_blocks x f_frsize / df_disp_hr, show one fractional,
                                 * use suffixes if df_disp_hr == 0 */
-                                make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+                                make_human_readable_str(s.f_blocks, s.f_frsize, df_disp_hr));
                        printf(" %9s " + 1,
-                                /* EXPR x f_bsize / df_disp_hr, show one fractional,
+                                /* EXPR x f_frsize / df_disp_hr, show one fractional,
                                 * use suffixes if df_disp_hr == 0 */
                                make_human_readable_str((s.f_blocks - s.f_bfree),
-                                                s.f_bsize, df_disp_hr));
+                                                s.f_frsize, df_disp_hr));
                        printf("%9s %3u%% %s\n",
-                                /* f_bavail x f_bsize / df_disp_hr, show one fractional,
+                                /* f_bavail x f_frsize / df_disp_hr, show one fractional,
                                 * use suffixes if df_disp_hr == 0 */
-                                make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                                make_human_readable_str(s.f_bavail, s.f_frsize, df_disp_hr),
                                blocks_percent_used, mount_point);
 #else
                        printf(" %9lu %9lu %9lu %3u%% %s\n",
-                                kscale(s.f_blocks, s.f_bsize),
+                                kscale(s.f_blocks, s.f_frsize),
-                                kscale(s.f_blocks - s.f_bfree, s.f_bsize),
+                                kscale(s.f_blocks - s.f_bfree, s.f_frsize),
-                                kscale(s.f_bavail, s.f_bsize),
+                                kscale(s.f_bavail, s.f_frsize),
                                blocks_percent_used, mount_point);
 #endif
                }
diff --git a/coreutils/du.c b/coreutils/du.c
index 1240bcbbc..5f104736b 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -226,8 +226,8 @@ 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:d+";
+        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, "aHkLsx" "d:+" "lc" "hm", &G.max_print_depth);
        argv += optind;
        if (opt & OPT_h_for_humans) {
                G.disp_unit = 0;
@@ -239,8 +239,8 @@ int du_main(int argc UNUSED_PARAM, char **argv)
                G.disp_unit = 1024;
        }
 #else
-        opt_complementary = "H-L:L-H:s-d:d-s:d+";
+        opt_complementary = "H-L:L-H:s-d:d-s";
-        opt = getopt32(argv, "aHkLsx" "d:" "lc", &G.max_print_depth);
+        opt = getopt32(argv, "aHkLsx" "d:+" "lc", &G.max_print_depth);
        argv += optind;
 #if !ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
        if (opt & OPT_k_kbytes) {
diff --git a/coreutils/env.c b/coreutils/env.c
index 807ef13e9..cdfc30e14 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -54,11 +54,10 @@ int env_main(int argc UNUSED_PARAM, char **argv)
        unsigned opts;
        llist_t *unset_env = NULL;
-        opt_complementary = "u::";
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
        applet_long_options = env_longopts;
 #endif
-        opts = getopt32(argv, "+iu:", &unset_env);
+        opts = getopt32(argv, "+iu:+", &unset_env);
        argv += optind;
        if (argv[0] && LONE_DASH(argv[0])) {
                opts |= 1;
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index a5b3e99f7..b02fb09bd 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -62,7 +62,7 @@ enum {
 };
 #define OD_GETOPT32() getopt32(argv, \
-        "A:N:abcdfhij:lot:vxsS:w::", \
+        "A:N:abcdfhij:lot:*vxsS:w:+:", \
        /* -w with optional param */ \
        /* -S was -s and also had optional parameter */ \
        /* but in coreutils 6.3 it was renamed and now has */ \
@@ -1219,7 +1219,6 @@ int od_main(int argc UNUSED_PARAM, char **argv)
        address_pad_len_char = '7';
        /* Parse command line */
-        opt_complementary = "w+:t::"; /* -w N, -t is a list */
 #if ENABLE_LONG_OPTS
        applet_long_options = od_longopts;
 #endif
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 9139d9f47..34a41999b 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -73,7 +73,7 @@
 */
 /* These are sort types */
-static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:t:";
+static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:*t:";
 enum {
        FLAG_n  = 1,            /* Numeric sort */
        FLAG_g  = 2,            /* Sort using strtod() */
@@ -358,8 +358,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
        /* 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 */
+        opt_complementary = "o--o:t--t"; /* -t, -o: at most one of each */
-                        "k::"; /* -k takes list */
        opts = getopt32(argv, OPT_STR, &str_ignored, &str_ignored, &str_o, &lst_k, &str_t);
        /* global b strips leading and trailing spaces */
        if (opts & FLAG_b)
diff --git a/coreutils/split.c b/coreutils/split.c
index e67c3de66..19d58a21b 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -81,8 +81,8 @@ int split_main(int argc UNUSED_PARAM, char **argv)
        setup_common_bufsiz();
-        opt_complementary = "?2:a+"; /* max 2 args; -a N */
+        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:+", &count_p, &count_p, &suffix_len);
        if (opt & SPLIT_OPT_l)
                cnt = XATOOFF(count_p);
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 39f87679e..57ad0f3b7 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -121,8 +121,8 @@ int tail_main(int argc, char **argv)
 #endif
        /* -s NUM, -F imlies -f */
-        IF_FEATURE_FANCY_TAIL(opt_complementary = "s+:Ff";)
+        IF_FEATURE_FANCY_TAIL(opt_complementary = "Ff";)
-        opt = getopt32(argv, "fc:n:" IF_FEATURE_FANCY_TAIL("qs:vF"),
+        opt = getopt32(argv, "fc:n:" IF_FEATURE_FANCY_TAIL("qs:+vF"),
                        &str_c, &str_n IF_FEATURE_FANCY_TAIL(,&sleep_period));
 #define FOLLOW (opt & 0x1)
 #define COUNT_BYTES (opt & 0x2)
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index e0133998a..ec7bde418 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -50,8 +50,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
        skip_fields = skip_chars = 0;
        max_chars = INT_MAX;
-        opt_complementary = "f+:s+:w+";
+        opt = getopt32(argv, "cduf:+s:+w:+", &skip_fields, &skip_chars, &max_chars);
-        opt = getopt32(argv, "cduf:s:w:", &skip_fields, &skip_chars, &max_chars);
        argv += optind;
        input_filename = argv[0];
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index c671b9252..0bb666abc 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -181,8 +181,8 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
        applet_long_options = runparts_longopts;
 #endif
        /* We require exactly one argument: the directory name */
-        opt_complementary = "=1:a::";
+        opt_complementary = "=1";
-        getopt32(argv, "a:u:", &arg_list, &umask_p);
+        getopt32(argv, "a:*u:", &arg_list, &umask_p);
        umask(xstrtou_range(umask_p, 8, 0, 07777));
diff --git a/docs/busybox_footer.pod b/docs/busybox_footer.pod
index c346c736b..92748eb72 100644
--- a/docs/busybox_footer.pod
+++ b/docs/busybox_footer.pod
@@ -1,5 +1,3 @@
-=back
 =head1 LIBC NSS
 GNU Libc (glibc) uses the Name Service Switch (NSS) to configure the behavior
diff --git a/editors/awk.c b/editors/awk.c
index 142ab670f..de3362cff 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -72,12 +72,9 @@
 #define OPTSTR_AWK \
-        "F:v:f:" \
+        "F:v:*f:*" \
-        IF_FEATURE_AWK_GNU_EXTENSIONS("e:") \
+        IF_FEATURE_AWK_GNU_EXTENSIONS("e:*") \
        "W:"
-#define OPTCOMPLSTR_AWK \
-        "v::f::" \
-        IF_FEATURE_AWK_GNU_EXTENSIONS("e::")
 enum {
        OPTBIT_F,       /* define field separator */
        OPTBIT_v,       /* define variable */
@@ -3213,7 +3210,6 @@ int awk_main(int argc, char **argv)
                        *s1 = '=';
                }
        }
-        opt_complementary = OPTCOMPLSTR_AWK;
        opt = getopt32(argv, OPTSTR_AWK, &opt_F, &list_v, &list_f, IF_FEATURE_AWK_GNU_EXTENSIONS(&list_e,) NULL);
        argv += optind;
        argc -= optind;
diff --git a/editors/diff.c b/editors/diff.c
index ff269360f..75229ad8c 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -982,11 +982,11 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
        /* exactly 2 params; collect multiple -L <label>; -U N */
-        opt_complementary = "=2:L::U+";
+        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",
                        &L_arg, &s_start, &opt_U_context);
        argv += optind;
        while (L_arg)
diff --git a/editors/sed.c b/editors/sed.c
index b629e060a..2e99dc792 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1508,8 +1508,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
        /* do normal option parsing */
        opt_e = opt_f = NULL;
        opt_i = NULL;
-        opt_complementary = "e::f::" /* can occur multiple times */
+        opt_complementary = "nn"; /* count -n */
-                            "nn"; /* count -n */
        IF_LONG_OPTS(applet_long_options = sed_longopts);
@@ -1518,7 +1517,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
         * 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,
+        opt = getopt32(argv, "i::rEne:*f:*", &opt_i, &opt_e, &opt_f,
                            &G.be_quiet); /* counter for -n */
        //argc -= optind;
        argv += optind;
diff --git a/findutils/grep.c b/findutils/grep.c
index e956abbb8..02ce65159 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -115,8 +115,8 @@
 //usage:#define fgrep_full_usage ""
 #define OPTSTR_GREP \
-        "lnqvscFiHhe:f:Lorm:wx" \
+        "lnqvscFiHhe:*f:*Lorm:+wx" \
-        IF_FEATURE_GREP_CONTEXT("A:B:C:") \
+        IF_FEATURE_GREP_CONTEXT("A:+B:+C:+") \
        IF_FEATURE_GREP_EGREP_ALIAS("E") \
        IF_EXTRA_COMPAT("z") \
        "aI"
@@ -694,6 +694,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_GREP_CONTEXT
        int Copt, opts;
 #endif
+        INIT_G();
        /* For grep, exitcode of 1 is "not found". Other errors are 2: */
        xfunc_error_retval = 2;
@@ -702,7 +703,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 #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:e::f::m+:A+:B+:C+";
+        opt_complementary = "H-h:C-AB";
        opts = getopt32(argv,
                OPTSTR_GREP,
                &pattern_head, &fopt, &max_matches,
@@ -731,7 +732,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:e::f::m+";
+        opt_complementary = "H-h:c-n:q-n:l-n:";
        getopt32(argv, OPTSTR_GREP,
                &pattern_head, &fopt, &max_matches);
 #endif
diff --git a/include/bb_archive.h b/include/bb_archive.h
index 03f174839..9bbf59bb8 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -221,7 +221,7 @@ void dealloc_bunzip(bunzip_data *bd) FAST_FUNC;
 /* Meaning and direction (input/output) of the fields are transformer-specific */
 typedef struct transformer_state_t {
-        smallint check_signature; /* most often referenced member */
+        smallint signature_skipped; /* most often referenced member */
        IF_DESKTOP(long long) int FAST_FUNC (*xformer)(struct transformer_state_t *xstate);
        USE_FOR_NOMMU(const char *xformer_prog;)
@@ -262,11 +262,11 @@ int bbunpack(char **argv,
 void check_errors_in_children(int signo);
 #if BB_MMU
 void fork_transformer(int fd,
-        int check_signature,
+        int signature_skipped,
        IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_state_t *xstate)
 ) FAST_FUNC;
-#define fork_transformer_with_sig(fd, transformer, transform_prog) fork_transformer((fd), 1, (transformer))
+#define fork_transformer_with_sig(fd, transformer, transform_prog) fork_transformer((fd), 0, (transformer))
-#define fork_transformer_with_no_sig(fd, transformer)              fork_transformer((fd), 0, (transformer))
+#define fork_transformer_with_no_sig(fd, transformer)              fork_transformer((fd), 1, (transformer))
 #else
 void fork_transformer(int fd, const char *transform_prog) FAST_FUNC;
 #define fork_transformer_with_sig(fd, transformer, transform_prog) fork_transformer((fd), (transform_prog))
diff --git a/include/libbb.h b/include/libbb.h
index 9402bb04b..6db03d2df 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -362,7 +362,7 @@ extern char *strrstr(const char *haystack, const char *needle) FAST_FUNC;
 //TODO: supply a pointer to char[11] buffer (avoid statics)?
 extern const char *bb_mode_string(mode_t mode) FAST_FUNC;
 extern int is_directory(const char *name, int followLinks) FAST_FUNC;
-enum {  /* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
+enum {  /* cp.c, mv.c, install.c depend on these values. CAREFUL when changing them! */
        FILEUTILS_PRESERVE_STATUS = 1 << 0, /* -p */
        FILEUTILS_DEREFERENCE     = 1 << 1, /* !-d */
        FILEUTILS_RECUR           = 1 << 2, /* -R */
@@ -372,15 +372,25 @@ enum {	/* DO NOT CHANGE THESE VALUES!  cp.c, mv.c, install.c depend on them. */
        FILEUTILS_MAKE_SOFTLINK   = 1 << 6, /* -s */
        FILEUTILS_DEREF_SOFTLINK  = 1 << 7, /* -L */
        FILEUTILS_DEREFERENCE_L0  = 1 << 8, /* -H */
+        /* -a = -pdR (mapped in cp.c) */
+        /* -r = -dR  (mapped in cp.c) */
+        /* -P = -d   (mapped in cp.c) */
+        FILEUTILS_VERBOSE         = (1 << 12) * ENABLE_FEATURE_VERBOSE, /* -v */
+        FILEUTILS_UPDATE          = 1 << 13, /* -u */
 #if ENABLE_SELINUX
-        FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 9, /* -c */
+        FILEUTILS_PRESERVE_SECURITY_CONTEXT = 1 << 14, /* -c */
-        FILEUTILS_SET_SECURITY_CONTEXT = 1 << 10,
 #endif
-        FILEUTILS_IGNORE_CHMOD_ERR = 1 << 11,
+        FILEUTILS_RMDEST          = 1 << (15 - !ENABLE_SELINUX), /* --remove-destination */
-        /* -v */
+        /*
-        FILEUTILS_VERBOSE         = (1 << 12) * ENABLE_FEATURE_VERBOSE,
+         * Hole. cp may have some bits set here,
+         * they should not affect remove_file()/copy_file()
+         */
+#if ENABLE_SELINUX
+        FILEUTILS_SET_SECURITY_CONTEXT = 1 << 30,
+#endif
+        FILEUTILS_IGNORE_CHMOD_ERR = 1 << 31,
 };
-#define FILEUTILS_CP_OPTSTR "pdRfilsLH" IF_SELINUX("c")
+#define FILEUTILS_CP_OPTSTR "pdRfilsLHarPvu" IF_SELINUX("c")
 extern int remove_file(const char *path, int flags) FAST_FUNC;
 /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
 * the source, not copy (unless "source" is a directory).
@@ -1248,8 +1258,6 @@ const struct hwtype *get_hwntype(int type) FAST_FUNC;
 #ifndef BUILD_INDIVIDUAL
 extern int find_applet_by_name(const char *name) FAST_FUNC;
-/* Returns only if applet is not found. */
-extern void run_applet_and_exit(const char *name, char **argv) FAST_FUNC;
 extern void run_applet_no_and_exit(int a, char **argv) NORETURN FAST_FUNC;
 #endif
diff --git a/init/halt.c b/init/halt.c
index 572d751b0..29e60657b 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -113,12 +113,11 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
                continue;
        /* Parse and handle arguments */
-        opt_complementary = "d+"; /* -d N */
        /* We support -w even if !ENABLE_FEATURE_WTMP,
         * in order to not break scripts.
         * -i (shut down network interfaces) is ignored.
         */
-        flags = getopt32(argv, "d:nfwi", &delay);
+        flags = getopt32(argv, "d:+nfwi", &delay);
        sleep(delay);
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 0e14e351e..39d9d907d 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -148,6 +148,7 @@ lib-$(CONFIG_FTPD) += correct_password.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
+lib-$(CONFIG_MKPASSWD) += pw_encrypt.o
 lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index c528c8a2c..28adf2740 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -52,7 +52,6 @@
 #include "usage_compressed.h"
 #if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
 static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #else
@@ -730,7 +729,7 @@ static void install_links(const char *busybox,
        }
 }
 #  endif
-# else
+# elif ENABLE_BUSYBOX
 static void install_links(const char *busybox UNUSED_PARAM,
                int use_symbolic_links UNUSED_PARAM,
                char *custom_install_dir UNUSED_PARAM)
@@ -738,6 +737,9 @@ static void install_links(const char *busybox UNUSED_PARAM,
 }
 # endif
+# if ENABLE_BUSYBOX
+static void run_applet_and_exit(const char *name, char **argv) NORETURN;
 /* If we were called as "busybox..." */
 static int busybox_main(char **argv)
 {
@@ -828,10 +830,10 @@ static int busybox_main(char **argv)
                const char *a = applet_names;
                dup2(1, 2);
                while (*a) {
-# if ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32
+#  if ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32
                        if (argv[1][6]) /* --list-full? */
                                full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
-# endif
+#  endif
                        full_write2_str(a);
                        full_write2_str("\n");
                        i++;
@@ -889,14 +891,10 @@ static int busybox_main(char **argv)
         * "#!/bin/busybox"-style wrappers */
        applet_name = bb_get_last_path_component_nostrip(argv[0]);
        run_applet_and_exit(applet_name, argv);
-        /*bb_error_msg_and_die("applet not found"); - sucks in printf */
-        full_write2_str(applet_name);
-        full_write2_str(": applet not found\n");
-        /* POSIX: "If a command is not found, the exit status shall be 127" */
-        exit(127);
 }
+# endif
+# if NUM_APPLETS > 0
 void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
 {
        int argc = 1;
@@ -914,15 +912,15 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
         * "true" and "false" are also special.
         */
        if (1
-#if defined APPLET_NO_test
+#  if defined APPLET_NO_test
         && applet_no != APPLET_NO_test
-#endif
+#  endif
-#if defined APPLET_NO_true
+#  if defined APPLET_NO_true
         && applet_no != APPLET_NO_true
-#endif
+#  endif
-#if defined APPLET_NO_false
+#  if defined APPLET_NO_false
         && applet_no != APPLET_NO_false
-#endif
+#  endif
        ) {
                if (argc == 2 && strcmp(argv[1], "--help") == 0) {
                        /* Make "foo --help" exit with 0: */
@@ -934,17 +932,28 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
                check_suid(applet_no);
        exit(applet_main[applet_no](argc, argv));
 }
+# endif /* NUM_APPLETS > 0 */
-void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
+static NORETURN void run_applet_and_exit(const char *name, char **argv)
 {
-        int applet;
+# if ENABLE_BUSYBOX
        if (is_prefixed_with(name, "busybox"))
                exit(busybox_main(argv));
+# endif
+# if NUM_APPLETS > 0
        /* find_applet_by_name() search is more expensive, so goes second */
-        applet = find_applet_by_name(name);
+        {
-        if (applet >= 0)
+                int applet = find_applet_by_name(name);
-                run_applet_no_and_exit(applet, argv);
+                if (applet >= 0)
+                        run_applet_no_and_exit(applet, argv);
+        }
+# endif
+        /*bb_error_msg_and_die("applet not found"); - links in printf */
+        full_write2_str(applet_name);
+        full_write2_str(": applet not found\n");
+        /* POSIX: "If a command is not found, the exit status shall be 127" */
+        exit(127);
 }
 #endif /* !defined(SINGLE_APPLET_MAIN) */
@@ -1017,6 +1026,10 @@ int main(int argc UNUSED_PARAM, char **argv)
 #else
        lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
+# if !ENABLE_BUSYBOX
+        if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
+                argv++;
+# endif
        applet_name = argv[0];
        if (applet_name[0] == '-')
                applet_name++;
@@ -1048,11 +1061,5 @@ int main(int argc UNUSED_PARAM, char **argv)
        parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
        run_applet_and_exit(applet_name, argv);
-        /*bb_error_msg_and_die("applet not found"); - sucks in printf */
-        full_write2_str(applet_name);
-        full_write2_str(": applet not found\n");
-        /* POSIX: "If a command is not found, the exit status shall be 127" */
-        exit(127);
 #endif
 }
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index a427c441f..c52297376 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -64,6 +64,11 @@ static int ask_and_unlink(const char *dest, int flags)
                bb_perror_msg("can't create '%s'", dest);
                return -1; /* error */
        }
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+        if (flags & FILEUTILS_RMDEST)
+                if (flags & FILEUTILS_VERBOSE)
+                        printf("removed '%s'\n", dest);
+#endif
        return 1; /* ok (to try again) */
 }
@@ -213,6 +218,22 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                goto preserve_mode_ugid_time;
        }
+        if (dest_exists) {
+                if (flags & FILEUTILS_UPDATE) {
+                        if (source_stat.st_mtime <= dest_stat.st_mtime) {
+                                return 0; /* source file must be newer */
+                        }
+                }
+#if ENABLE_FEATURE_CP_LONG_OPTIONS
+                if (flags & FILEUTILS_RMDEST) {
+                        ovr = ask_and_unlink(dest, flags);
+                        if (ovr <= 0)
+                                return ovr;
+                        dest_exists = 0;
+                }
+#endif
+        }
        if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK)) {
                int (*lf)(const char *oldpath, const char *newpath);
 make_links:
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index ae019b26b..ed9352191 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -17,23 +17,20 @@
 uint32_t
 getopt32(char **argv, const char *applet_opts, ...)
-        The command line options must be declared in const char
+        The command line options are passed as the applet_opts string.
-        *applet_opts as a string of chars, for example:
-        flags = getopt32(argv, "rnug");
        If one of the given options is found, a flag value is added to
-        the return value (an unsigned long).
+        the return value.
        The flag value is determined by the position of the char in
-        applet_opts string.  For example, in the above case:
+        applet_opts string.  For example:
        flags = getopt32(argv, "rnug");
-        "r" will add 1    (bit 0)
+        "r" will set 1    (bit 0)
-        "n" will add 2    (bit 1)
+        "n" will set 2    (bit 1)
-        "u" will add 4    (bit 2)
+        "u" will set 4    (bit 2)
-        "g" will add 8    (bit 3)
+        "g" will set 8    (bit 3)
        and so on.  You can also look at the return value as a bit
        field and each option sets one bit.
@@ -45,7 +42,7 @@ getopt32(char **argv, const char *applet_opts, ...)
        (options and their parameters will be moved into argv[]
        positions prior to argv[optind]).
- ":"    If one of the options requires an argument, then add a ":"
+ "o:"   If one of the options requires an argument, then add a ":"
        after the char in applet_opts and provide a pointer to store
        the argument.  For example:
@@ -58,15 +55,39 @@ getopt32(char **argv, const char *applet_opts, ...)
                        &pointer_to_arg_for_a, &pointer_to_arg_for_b,
                        &pointer_to_arg_for_c, &pointer_to_arg_for_d);
-        The type of the pointer (char* or llist_t*) may be controlled
+        The type of the pointer may be controlled by "o::" or "o+" in
-        by the "::" special separator that is set in the external string
+        the external string opt_complementary (see below for more info).
-        opt_complementary (see below for more info).
- "::"   If option can have an *optional* argument, then add a "::"
+ "o::"  If option can have an *optional* argument, then add a "::"
        after its char in applet_opts and provide a pointer to store
        the argument.  Note that optional arguments _must_
        immediately follow the option: -oparam, not -o param.
+ "o:+"  This means that the parameter for this option is a nonnegative integer.
+        It will be processed with xatoi_positive() - allowed range
+        is 0..INT_MAX.
+        int param;  // "unsigned param;" will also work
+        getopt32(argv, "p:+", &param);
+ "o:*"  This means that the option can occur multiple times. Each occurrence
+        will be saved as a llist_t element instead of char*.
+        For example:
+        The grep applet can have one or more "-e pattern" arguments.
+        In this case you should use getopt32() as follows:
+        llist_t *patterns = NULL;
+        (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).)
+        getopt32(argv, "e:*", &patterns);
+        $ grep -e user -e root /etc/passwd
+        root:x:0:0:root:/root:/bin/bash
+        user:x:500:500::/home/user:/bin/bash
 "+"    If the first character in the applet_opts string is a plus,
        then option processing will stop as soon as a non-option is
        encountered in the argv array.  Useful for applets like env
@@ -82,7 +103,7 @@ const char *applet_long_options
        This struct allows you to define long options:
        static const char applet_longopts[] ALIGN1 =
-                //"name\0" has_arg val
+                //"name\0"  has_arg     val
                "verbose\0" No_argument "v"
                ;
        applet_long_options = applet_longopts;
@@ -90,7 +111,7 @@ const char *applet_long_options
        The last member of struct option (val) typically is set to
        matching short option from applet_opts. If there is no matching
        char in applet_opts, then:
-        - return bit have next position after short options
+        - return bit has next position after short options
        - if has_arg is not "No_argument", use ptr for arg also
        - opt_complementary affects it too
@@ -139,8 +160,8 @@ const char *opt_complementary
        llist_t *my_b = NULL;
        int verbose_level = 0;
-        opt_complementary = "vv:b::b-c:c-b";
+        opt_complementary = "vv:b-c:c-b";
-        f = getopt32(argv, "vb:c", &my_b, &verbose_level);
+        f = getopt32(argv, "vb:*c", &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
@@ -233,7 +254,7 @@ Special characters:
 "x--x" Variation of the above, it means that -x option should occur
        at most once.
- "a+"   A plus after a char in opt_complementary means that the parameter
+ "o+"   A plus after a char in opt_complementary means that the parameter
        for this option is a nonnegative integer. It will be processed
        with xatoi_positive() - allowed range is 0..INT_MAX.
@@ -241,7 +262,7 @@ Special characters:
        opt_complementary = "p+";
        getopt32(argv, "p:", &param);
- "a::"  A double colon after a char in opt_complementary means that the
+ "o::"  A double colon after a char in opt_complementary means that the
        option can occur multiple times. Each occurrence will be saved as
        a llist_t element instead of char*.
@@ -255,12 +276,17 @@ Special characters:
        as required by llist_add_to_end(llist_t **old_head, char *new_item).)
        opt_complementary = "e::";
        getopt32(argv, "e:", &patterns);
        $ grep -e user -e root /etc/passwd
        root:x:0:0:root:/root:/bin/bash
        user:x:500:500::/home/user:/bin/bash
+        "o+" and "o::" can be handled by "o:+" and "o:*" specifiers
+        in option string (and it is preferred), but this does not work
+        for "long options only" cases, such as tar --exclude=PATTERN,
+        wget --header=HDR cases.
 "a?b"  A "?" between an option and a group of options means that
        at least one of them is required to occur if the first option
        occurs in preceding command line arguments.
@@ -359,10 +385,11 @@ getopt32(char **argv, const char *applet_opts, ...)
        va_start(p, applet_opts);
-        c = 0;
        on_off = complementary;
        memset(on_off, 0, sizeof(complementary));
+        applet_opts = strcpy(alloca(strlen(applet_opts) + 1), applet_opts);
        /* skip bbox extension */
        first_char = applet_opts[0];
        if (first_char == '!')
@@ -372,6 +399,7 @@ getopt32(char **argv, const char *applet_opts, ...)
        s = (const unsigned char *)applet_opts;
        if (*s == '+' || *s == '-')
                s++;
+        c = 0;
        while (*s) {
                if (c >= 32)
                        break;
@@ -379,6 +407,13 @@ getopt32(char **argv, const char *applet_opts, ...)
                on_off->switch_on = (1 << c);
                if (*++s == ':') {
                        on_off->optarg = va_arg(p, void **);
+                        if (s[1] == '+' || s[1] == '*') {
+                                /* 'o:+' or 'o:*' */
+                                on_off->param_type = (s[1] == '+') ?
+                                        PARAM_INT : PARAM_LIST;
+                                overlapping_strcpy((char*)s + 1, (char*)s + 2);
+                        }
+                        /* skip possible 'o::' (or 'o:+:' !) */
                        while (*++s == ':')
                                continue;
                }
@@ -431,6 +466,7 @@ getopt32(char **argv, const char *applet_opts, ...)
                applet_long_options = NULL;
        }
 #endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */
        for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
                t_complementary *pair;
                unsigned *pair_switch;
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 1590d9a4c..408439766 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -42,8 +42,8 @@ int parse_main(int argc UNUSED_PARAM, char **argv)
        int mintokens = 0, ntokens = 128;
        unsigned noout;
-        opt_complementary = "-1:n+:m+:f+";
+        opt_complementary = "-1";
-        noout = 1 & getopt32(argv, "xn:m:d:f:", &ntokens, &mintokens, &delims, &flags);
+        noout = 1 & getopt32(argv, "xn:+m:+d:f:+", &ntokens, &mintokens, &delims, &flags);
        //argc -= optind;
        argv += optind;
diff --git a/libbb/time.c b/libbb/time.c
index aa19a47d4..82e6cb172 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -186,6 +186,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                } else {
                        bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                }
+                ptm->tm_sec = 0; /* assume zero if [.SS] is not given */
                if (end == '.') {
                        /* xxx.SS */
                        if (sscanf(strchr(date_str, '.') + 1, "%u%c",
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 23a1884f4..9f5f40686 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -111,8 +111,8 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
        opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
        opt_S = NULL;
        /* at most two non-option arguments; -P NUM */
-        opt_complementary = "?2:P+";
+        opt_complementary = "?2";
-        getopt32(argv, "sP:S:m:a:", &fd, &opt_S, &opt_m, &opt_m);
+        getopt32(argv, "sP:+S:m:a:", &fd, &opt_S, &opt_m, &opt_m);
        argv += optind;
        /* have no idea how to handle -s... */
diff --git a/loginutils/getty.c b/loginutils/getty.c
index b10bdbdbf..162c1697e 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";
+static const char opt_string[] ALIGN1 = "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,7 +179,7 @@ static void parse_args(char **argv)
        char *ts;
        int flags;
-        opt_complementary = "-2:t+"; /* at least 2 args; -t N */
+        opt_complementary = "-2"; /* at least 2 args; -t N */
        flags = getopt32(argv, opt_string,
                &G.initstring, &G.fakehost, &G.issue,
                &G.login, &G.timeout
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index f32469551..6befea933 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -43,8 +43,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
        logmode = LOGMODE_BOTH;
        openlog(applet_name, 0, LOG_AUTH);
-        opt_complementary = "t+"; /* -t N */
+        getopt32(argv, "t:+", &timeout);
-        getopt32(argv, "t:", &timeout);
        argv += optind;
        if (argv[0]) {
diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index 1dadd715f..8e1bc664c 100644
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -184,9 +184,8 @@ int makemime_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
        // parse options
-        opt_complementary = "a::";
        opts = getopt32(argv,
-                "c:e:o:C:N:a:", // "m:j:",
+                "c:e:o:C:N:a:*", // "m:j:",
                &content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL
        );
        //argc -= optind;
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index 62030331e..69eca6164 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -107,9 +107,9 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
        // parse options
-        opt_complementary = "-1:dd:t+:R+:L+:H+";
+        opt_complementary = "-1:dd";
        opts = getopt32(argv,
-                "bdmVcasTkt:" "R:Z:L:H:" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:"),
+                "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:"),
                &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 86b2cfed3..b967dfbc7 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -265,9 +265,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" IF_FEATURE_REFORMIME_COMPAT(":m::");
+        opt_complementary = "x--X:X--x";
        opts = getopt32(argv,
-                "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:h:o:O:"),
+                "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:"),
                &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 5143fac8f..fb4dbb3da 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -247,11 +247,11 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
        // parse options
        // -v is a counter, -H and -S are mutually exclusive, -a is a list
-        opt_complementary = "vv:w+:H--S:S--H:a::";
+        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,
+        opts = getopt32(argv, "tf:o:iw:+H:S:a:*:v", &opt_from, NULL,
                        &timeout, &opt_connect, &opt_connect, &list, &verbose);
        //argc -= optind;
        argv += optind;
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
+        // numeric params
-        opts = getopt32(argv, "vcQsndfFx:y:", &G.x, &G.y);
+        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+";
+                opt_complementary = "-1";
-                opts = getopt32(argv, "md:n:N:s:a:t:O:",
+                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+";
+                opt_complementary = "-1";
-                opts = getopt32(argv, "m:d:n:N:s:a:t:",
+                opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:",
                                &mtd_num, &dev_num, &vol_id,
                                &vol_name, &size_bytes_str, &alignment, &type
                );
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 9c941064b..5936e48cf 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -21,7 +21,6 @@
 extern int init_module(void *module, unsigned long len, const char *options);
 extern int delete_module(const char *module, unsigned flags);
-extern int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret);
 /* linux/include/linux/module.h has limit of 64 chars on module names */
 #undef MODULE_NAME_LEN
 #define MODULE_NAME_LEN 64
@@ -46,6 +45,7 @@ typedef struct module_info {
        char *pathname;
        char *aliases;
        char *deps;
+        smallint open_read_failed;
 } module_info;
 /*
@@ -223,7 +223,8 @@ static int load_module(const char *fname, const char *options)
 #endif
 }
-static void parse_module(module_info *info, const char *pathname)
+/* Returns !0 if open/read was unsuccessful */
+static int parse_module(module_info *info, const char *pathname)
 {
        char *module_image;
        char *ptr;
@@ -232,6 +233,7 @@ static void parse_module(module_info *info, const char *pathname)
        dbg1_error_msg("parse_module('%s')", pathname);
        /* Read (possibly compressed) module */
+        errno = 0;
        len = 64 * 1024 * 1024; /* 64 Mb at most */
        module_image = xmalloc_open_zipped_read_close(pathname, &len);
        /* module_image == NULL is ok here, find_keyword handles it */
@@ -299,9 +301,11 @@ static void parse_module(module_info *info, const char *pathname)
                dbg2_error_msg("dep:'%s'", ptr);
                append(ptr);
        }
+        free(module_image);
        info->deps = copy_stringbuf();
-        free(module_image);
+        info->open_read_failed = (module_image == NULL);
+        return info->open_read_failed;
 }
 static FAST_FUNC int fileAction(const char *pathname,
@@ -332,7 +336,8 @@ static FAST_FUNC int fileAction(const char *pathname,
        dbg1_error_msg("'%s' module name matches", pathname);
        module_found_idx = cur;
-        parse_module(&modinfo[cur], pathname);
+        if (parse_module(&modinfo[cur], pathname) != 0)
+                return TRUE; /* failed to open/read it, no point in trying loading */
        if (!(option_mask32 & OPT_r)) {
                if (load_module(pathname, module_load_options) == 0) {
@@ -609,13 +614,14 @@ static int rmmod(const char *filename)
 #define process_module(a,b) process_module(a)
 #define cmdline_options ""
 #endif
-static void process_module(char *name, const char *cmdline_options)
+static int process_module(char *name, const char *cmdline_options)
 {
        char *s, *deps, *options;
        module_info **infovec;
        module_info *info;
        int infoidx;
        int is_remove = (option_mask32 & OPT_r) != 0;
+        int exitcode = EXIT_SUCCESS;
        dbg1_error_msg("process_module('%s','%s')", name, cmdline_options);
@@ -629,7 +635,7 @@ static void process_module(char *name, const char *cmdline_options)
                 * (compat note: this allows and strips .ko suffix)
                 */
                rmmod(name);
-                return;
+                return EXIT_SUCCESS;
        }
        /*
@@ -640,7 +646,7 @@ static void process_module(char *name, const char *cmdline_options)
         */
        if (!is_remove && already_loaded(name)) {
                dbg1_error_msg("nothing to do for '%s'", name);
-                return;
+                return EXIT_SUCCESS;
        }
        options = NULL;
@@ -742,6 +748,11 @@ static void process_module(char *name, const char *cmdline_options)
                        dbg1_error_msg("'%s': blacklisted", info->pathname);
                        continue;
                }
+                if (info->open_read_failed) {
+                        /* We already tried it, didn't work. Don't try load again */
+                        exitcode = EXIT_FAILURE;
+                        continue;
+                }
                errno = 0;
                if (load_module(info->pathname, options) != 0) {
                        if (EEXIST != errno) {
@@ -753,13 +764,14 @@ static void process_module(char *name, const char *cmdline_options)
                                        info->pathname,
                                        moderror(errno));
                        }
+                        exitcode = EXIT_FAILURE;
                }
        }
 ret:
        free(infovec);
        free(options);
-//TODO: return load attempt result from process_module.
-//If dep didn't load ok, continuing makes little sense.
+        return exitcode;
 }
 #undef cmdline_options
@@ -866,6 +878,7 @@ The following options are useful for people managing distributions:
 int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
+        int exitcode;
        struct utsname uts;
        char applet0 = applet_name[0];
        IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
@@ -971,21 +984,23 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                        bb_error_msg_and_die("can't insert '%s': %s",
                                        *argv, moderror(errno));
                }
-                return 0;
+                return EXIT_SUCCESS;
        }
        /* Try to load modprobe.dep.bb */
-        if ('r' != applet0) /* not rmmod */
+        if ('r' != applet0) { /* not rmmod */
                load_dep_bb();
+        }
        /* Load/remove modules.
         * Only rmmod/modprobe -r loops here, insmod/modprobe has only argv[0] */
+        exitcode = EXIT_SUCCESS;
        do {
-                process_module(*argv, options);
+                exitcode |= process_module(*argv, options);
        } while (*++argv);
        if (ENABLE_FEATURE_CLEAN_UP) {
                IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
        }
-        return EXIT_SUCCESS;
+        return exitcode;
 }
diff --git a/networking/arp.c b/networking/arp.c
index 9381eb53a..69a5816eb 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -178,7 +178,7 @@ static int arp_del(char **args)
        if (flags == 0)
                flags = 3;
-        strncpy(req.arp_dev, device, sizeof(req.arp_dev));
+        strncpy_IFNAMSIZ(req.arp_dev, device);
        err = -1;
@@ -219,7 +219,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa)
        struct ifreq ifr;
        const struct hwtype *xhw;
-        strcpy(ifr.ifr_name, ifname);
+        strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
        ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
                                        "can't get HW-Address for '%s'", ifname);
        if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
@@ -332,7 +332,7 @@ static int arp_set(char **args)
        /* Fill in the remainder of the request. */
        req.arp_flags = flags;
-        strncpy(req.arp_dev, device, sizeof(req.arp_dev));
+        strncpy_IFNAMSIZ(req.arp_dev, device);
        /* Call the kernel. */
        if (option_mask32 & ARP_OPT_v)
diff --git a/networking/arping.c b/networking/arping.c
index 6b0de4de2..46bd65e36 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -231,20 +231,23 @@ static void recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
        if (!(option_mask32 & QUIET)) {
                int s_printed = 0;
-                printf("%scast re%s from %s [%s]",
+                printf("%scast re%s from %s [%02x:%02x:%02x:%02x:%02x:%02x]",
                        FROM->sll_pkttype == PACKET_HOST ? "Uni" : "Broad",
                        ah->ar_op == htons(ARPOP_REPLY) ? "ply" : "quest",
                        inet_ntoa(src_ip),
-                        ether_ntoa((struct ether_addr *) p));
+                        p[0], p[1], p[2], p[3], p[4], p[5]
+                );
                if (dst_ip.s_addr != src.s_addr) {
                        printf("for %s ", inet_ntoa(dst_ip));
                        s_printed = 1;
                }
                if (memcmp(p + ah->ar_hln + 4, me.sll_addr, ah->ar_hln)) {
+                        unsigned char *pp = p + ah->ar_hln + 4;
                        if (!s_printed)
                                printf("for ");
-                        printf("[%s]",
+                        printf("[%02x:%02x:%02x:%02x:%02x:%02x]",
-                                ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
+                                pp[0], pp[1], pp[2], pp[3], pp[4], pp[5]
+                        );
                }
                if (last) {
@@ -292,8 +295,8 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                /* Dad also sets quit_on_reply.
                 * Advert also sets unsolicited.
                 */
-                opt_complementary = "=1:Df:AU:c+";
+                opt_complementary = "=1:Df:AU";
-                opt = getopt32(argv, "DUAqfbc:w:I:s:",
+                opt = getopt32(argv, "DUAqfbc:+w:I:s:",
                                &count, &str_timeout, &device, &source);
                if (opt & 0x80) /* -w: timeout */
                        timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000;
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 360d1e6be..4cbb9b6fe 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1130,11 +1130,11 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
        abs_timeout = 1 * 60 * 60;
        verbose_S = 0;
        G.timeout = 2 * 60;
-        opt_complementary = "t+:T+:vv:SS";
+        opt_complementary = "vv:SS";
 #if BB_MMU
-        opts = getopt32(argv,    "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
+        opts = getopt32(argv,    "vS" IF_FEATURE_FTP_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
 #else
-        opts = getopt32(argv, "l1AvS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
+        opts = getopt32(argv, "l1AvS" IF_FEATURE_FTP_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
        if (opts & (OPT_l|OPT_1)) {
                /* Our secret backdoor to ls */
 /* TODO: pass --group-directories-first? would be nice, but ls doesn't do that yet */
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index f0defb5c8..28c49e218 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -107,9 +107,9 @@ enum {
 #endif
 };
 #if ENABLE_FEATURE_PIDFILE
-# define OPTION_STR "+ansfFi:r:It:u:d:m:pqlx:Mk"
+# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:Mk"
 #else
-# define OPTION_STR "+ansfFi:r:It:u:d:m:pqlx:M"
+# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:M"
 #endif
 enum { // interface status
@@ -560,7 +560,6 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
-        opt_complementary = "t+:u+:d+";
        opts = getopt32(argv, OPTION_STR,
                &G.iface, &G.script_name, &G.poll_time, &G.delay_up,
                &G.delay_down, &G.api_mode, &G.extra_arg);
diff --git a/networking/inetd.c b/networking/inetd.c
index 8d44b5198..f9295e38b 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1153,8 +1153,8 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
        if (real_uid != 0) /* run by non-root user */
                config_filename = NULL;
-        opt_complementary = "R+:q+"; /* -q N, -R N */
+        /* -q N, -R N */
-        opt = getopt32(argv, "R:feq:", &max_concurrency, &global_queuelen);
+        opt = getopt32(argv, "R:+feq:+", &max_concurrency, &global_queuelen);
        argv += optind;
        //argc -= optind;
        if (argv[0])
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 471ae1a12..192e42fe5 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -794,8 +794,8 @@ 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:w+"; /* max 2 params; -v and -l are counters; -w N */
+        opt_complementary = "?2:vv:ll"; /* max 2 params; -v and -l are counters; -w N */
-        getopt32(argv, "np:s:uvw:" IF_NC_SERVER("lk")
+        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));
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 410318979..130cef0af 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -267,7 +267,6 @@ typedef struct {
 typedef struct {
        len_and_sockaddr *p_lsa;
-        char             *p_hostname;
        char             *p_dotted;
        int              p_fd;
        int              datapoint_idx;
@@ -293,6 +292,7 @@ typedef struct {
        datapoint_t      filter_datapoint[NUM_DATAPOINTS];
        /* last sent packet: */
        msg_t            p_xmt_msg;
+        char             p_hostname[1];
 } peer_t;
@@ -765,14 +765,38 @@ reset_peer_stats(peer_t *p, double offset)
 }
 static void
+resolve_peer_hostname(peer_t *p, int loop_on_fail)
+{
+        len_and_sockaddr *lsa;
+ again:
+        lsa = host2sockaddr(p->p_hostname, 123);
+        if (!lsa) {
+                /* error message already emitted by host2sockaddr() */
+                if (!loop_on_fail)
+                        return;
+//FIXME: do this to avoid infinite looping on typo in a hostname?
+//well... in which case, what is a good value for loop_on_fail?
+                //if (--loop_on_fail == 0)
+                //      xfunc_die();
+                sleep(5);
+                goto again;
+        }
+        free(p->p_lsa);
+        free(p->p_dotted);
+        p->p_lsa = lsa;
+        p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
+}
+static void
 add_peers(const char *s)
 {
        llist_t *item;
        peer_t *p;
-        p = xzalloc(sizeof(*p));
+        p = xzalloc(sizeof(*p) + strlen(s));
-        p->p_lsa = xhost2sockaddr(s, 123);
+        strcpy(p->p_hostname, s);
-        p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
+        resolve_peer_hostname(p, /*loop_on_fail=*/ 1);
        /* Names like N.<country2chars>.pool.ntp.org are randomly resolved
         * to a pool of machines. Sometimes different N's resolve to the same IP.
@@ -789,7 +813,6 @@ add_peers(const char *s)
                }
        }
-        p->p_hostname = xstrdup(s);
        p->p_fd = -1;
        p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
        p->next_action_time = G.cur_time; /* = set_next(p, 0); */
@@ -2174,11 +2197,11 @@ static NOINLINE void ntp_init(char **argv)
        /* Parse options */
        peers = NULL;
-        opt_complementary = "dd:p::wn"         /* -d: counter; -p: list; -w implies -n */
+        opt_complementary = "dd:wn"  /* -d: counter; -p: list; -w implies -n */
                IF_FEATURE_NTPD_SERVER(":Il"); /* -I implies -l */
        opts = getopt32(argv,
                        "nqNx" /* compat */
-                        "wp:S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
+                        "wp:*S:"IF_FEATURE_NTPD_SERVER("l") /* NOT compat */
                        IF_FEATURE_NTPD_SERVER("I:") /* compat */
                        "d" /* compat */
                        "46aAbgL", /* compat, ignored */
@@ -2190,6 +2213,31 @@ static NOINLINE void ntp_init(char **argv)
 //      if (opts & OPT_x) /* disable stepping, only slew is allowed */
 //              G.time_was_stepped = 1;
+#if ENABLE_FEATURE_NTPD_SERVER
+        G_listen_fd = -1;
+        if (opts & OPT_l) {
+                G_listen_fd = create_and_bind_dgram_or_die(NULL, 123);
+                if (G.if_name) {
+                        if (setsockopt_bindtodevice(G_listen_fd, G.if_name))
+                                xfunc_die();
+                }
+                socket_want_pktinfo(G_listen_fd);
+                setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
+        }
+#endif
+        /* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
+        if (opts & OPT_N)
+                setpriority(PRIO_PROCESS, 0, -15);
+        /* add_peers() calls can retry DNS resolution (possibly forever).
+         * Daemonize before them, or else boot can stall forever.
+         */
+        if (!(opts & OPT_n)) {
+                bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
+                logmode = LOGMODE_NONE;
+        }
        if (peers) {
                while (peers)
                        add_peers(llist_pop(&peers));
@@ -2218,26 +2266,6 @@ static NOINLINE void ntp_init(char **argv)
                /* -l but no peers: "stratum 1 server" mode */
                G.stratum = 1;
        }
-#if ENABLE_FEATURE_NTPD_SERVER
-        G_listen_fd = -1;
-        if (opts & OPT_l) {
-                G_listen_fd = create_and_bind_dgram_or_die(NULL, 123);
-                if (opts & OPT_I) {
-                        if (setsockopt_bindtodevice(G_listen_fd, G.if_name))
-                                xfunc_die();
-                }
-                socket_want_pktinfo(G_listen_fd);
-                setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
-        }
-#endif
-        if (!(opts & OPT_n)) {
-                bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
-                logmode = LOGMODE_NONE;
-        }
-        /* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
-        if (opts & OPT_N)
-                setpriority(PRIO_PROCESS, 0, -15);
        /* If network is up, syncronization occurs in ~10 seconds.
         * We give "ntpd -q" 10 seconds to get first reply,
         * then another 50 seconds to finish syncing.
@@ -2338,18 +2366,8 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                                                        p->p_dotted, p->reachable_bits, timeout);
                                        /* What if don't see it because it changed its IP? */
-                                        if (p->reachable_bits == 0) {
+                                        if (p->reachable_bits == 0)
-                                                len_and_sockaddr *lsa = host2sockaddr(p->p_hostname, 123);
+                                                resolve_peer_hostname(p, /*loop_on_fail=*/ 0);
-                                                if (lsa) {
-                                                        char *dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
-                                                        //if (strcmp(dotted, p->p_dotted) != 0)
-                                                        //      bb_error_msg("peer IP changed");
-                                                        free(p->p_lsa);
-                                                        free(p->p_dotted);
-                                                        p->p_lsa = lsa;
-                                                        p->p_dotted = dotted;
-                                                }
-                                        }
                                        set_next(p, timeout);
                                }
diff --git a/networking/ping.c b/networking/ping.c
index cfe682646..82d5b7a85 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -186,6 +186,7 @@ create_icmp_socket(void)
 struct globals {
        char *hostname;
        char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
+        uint16_t myid;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
@@ -204,6 +205,7 @@ static void ping4(len_and_sockaddr *lsa)
        pkt = (struct icmp *) G.packet;
        /*memset(pkt, 0, sizeof(G.packet)); already is */
        pkt->icmp_type = ICMP_ECHO;
+        pkt->icmp_id = G.myid;
        pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
        xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len);
@@ -228,6 +230,8 @@ static void ping4(len_and_sockaddr *lsa)
                        struct iphdr *iphdr = (struct iphdr *) G.packet;
                        pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));   /* skip ip hdr */
+                        if (pkt->icmp_id != G.myid)
+                                continue; /* not our ping */
                        if (pkt->icmp_type == ICMP_ECHOREPLY)
                                break;
                }
@@ -246,6 +250,7 @@ static void ping6(len_and_sockaddr *lsa)
        pkt = (struct icmp6_hdr *) G.packet;
        /*memset(pkt, 0, sizeof(G.packet)); already is */
        pkt->icmp6_type = ICMP6_ECHO_REQUEST;
+        pkt->icmp6_id = G.myid;
        sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
        setsockopt_int(pingsock, SOL_RAW, IPV6_CHECKSUM, sockopt);
@@ -269,6 +274,8 @@ static void ping6(len_and_sockaddr *lsa)
                        continue;
                }
                if (c >= ICMP_MINLEN) { /* icmp6_hdr */
+                        if (pkt->icmp6_id != G.myid)
+                                continue; /* not our ping */
                        if (pkt->icmp6_type == ICMP6_ECHO_REPLY)
                                break;
                }
@@ -317,6 +324,7 @@ static int common_ping_main(sa_family_t af, char **argv)
        alarm(5); /* give the host 5000ms to respond */
        create_icmp_socket(lsa);
+        G.myid = (uint16_t) getpid();
 #if ENABLE_PING6
        if (lsa->u.sa.sa_family == AF_INET6)
                ping6(lsa);
@@ -333,7 +341,7 @@ 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"))
+#define OPT_STRING ("qvc:+s:t:+w:+W:+I:np:4" IF_PING6("6"))
 enum {
        OPT_QUIET = 1 << 0,
        OPT_VERBOSE = 1 << 1,
@@ -857,7 +865,7 @@ 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:c+:t+:w+:W+";
+        opt_complementary = "=1:q--v:v--q";
        opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p);
        if (opt & OPT_s)
                datalen = xatou16(str_s); // -s
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 31bc70459..fbd1f1c45 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -232,9 +232,9 @@ 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:b+:c+";
+        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:",
                &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
                &backlog, &str_t, &ssluser, &root, &cert, &key, &verbose
        );
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 13c36aa46..2fbdc3bb3 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -496,12 +496,12 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
        /* -w NUM, and implies -F. -w and -i don't mix */
-        IF_FEATURE_TELNETD_INETD_WAIT(opt_complementary = "wF:w+:i--w:w--i";)
+        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"
                        IF_FEATURE_TELNETD_STANDALONE("p:b:F")
-                        IF_FEATURE_TELNETD_INETD_WAIT("Sw:"),
+                        IF_FEATURE_TELNETD_INETD_WAIT("Sw:+"),
                        &G.issuefile, &G.loginpath
                        IF_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)
                        IF_FEATURE_TELNETD_INETD_WAIT(, &sec_linger)
diff --git a/networking/traceroute.c b/networking/traceroute.c
index eee4f8873..e43a36dc7 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -294,7 +294,7 @@
 #define OPT_STRING \
        "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
-        IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
+        IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:*") \
        "4" IF_TRACEROUTE6("6")
 enum {
        OPT_DONT_FRAGMNT = (1 << 0),    /* F */
@@ -819,7 +819,7 @@ common_traceroute_main(int op, char **argv)
        INIT_G();
        /* minimum 1 arg */
-        opt_complementary = "-1:x-x" IF_FEATURE_TRACEROUTE_SOURCE_ROUTE(":g::");
+        opt_complementary = "-1:x-x";
        op |= getopt32(argv, OPT_STRING
                , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
                , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index c77669a31..6ff040d9e 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -793,7 +793,11 @@ static void perform_renew(void)
 static void perform_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cur_ipv6)
 {
        /* send release packet */
-        if (state == BOUND || state == RENEWING || state == REBINDING) {
+        if (state == BOUND
+         || state == RENEWING
+         || state == REBINDING
+         || state == RENEW_REQUESTED
+        ) {
                bb_error_msg("unicasting a release");
                send_d6_release(server_ipv6, our_cur_ipv6); /* unicast */
                d6_run_script(NULL, "deconfig");
@@ -940,9 +944,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
        /* Parse command line */
        /* O,x: list; -T,-t,-A take numeric param */
-        opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ;
+        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 = getopt32(argv, "i:np:qRr:s:T:+t:+SA:+O:*ox:*f"
                USE_FOR_MMU("b")
                ///IF_FEATURE_UDHCPC_ARPING("a")
                IF_FEATURE_UDHCP_PORT("P:")
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index fc7b6216d..8a16e987d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1118,7 +1118,11 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip)
        struct in_addr temp_addr;
        /* send release packet */
-        if (state == BOUND || state == RENEWING || state == REBINDING) {
+        if (state == BOUND
+         || state == RENEWING
+         || state == REBINDING
+         || state == RENEW_REQUESTED
+        ) {
                temp_addr.s_addr = server_addr;
                strcpy(buffer, inet_ntoa(temp_addr));
                temp_addr.s_addr = requested_ip;
@@ -1279,9 +1283,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
        /* Parse command line */
        /* O,x: list; -T,-t,-A take numeric param */
-        opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ;
+        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 = getopt32(argv, "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:")
diff --git a/networking/wget.c b/networking/wget.c
index c725edb5b..c886dd391 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1274,9 +1274,8 @@ IF_DESKTOP(	"no-parent\0"        No_argument       "\xf0")
        applet_long_options = wget_longopts;
 #endif
        opt_complementary = "-1" /* at least one URL */
-                IF_FEATURE_WGET_TIMEOUT(":T+") /* -T NUM */
                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::"); /* --header is a list */
-        getopt32(argv, "csqO:P:Y:U:T:"
+        getopt32(argv, "csqO:P:Y:U:T:+"
                /*ignored:*/ "t:"
                /*ignored:*/ "n::"
                /* wget has exactly four -n<letter> opts, all of which we can ignore:
diff --git a/networking/whois.c b/networking/whois.c
index bf330334a..c9dfcf5ee 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -21,43 +21,158 @@
 //kbuild:lib-$(CONFIG_WHOIS) += whois.o
 //usage:#define whois_trivial_usage
-//usage:       "[-h SERVER] [-p PORT] NAME..."
+//usage:       "[-i] [-h SERVER] [-p PORT] NAME..."
 //usage:#define whois_full_usage "\n\n"
 //usage:       "Query WHOIS info about NAME\n"
+//usage:     "\n        -i      Show redirect results too"
 //usage:     "\n        -h,-p   Server to query"
 #include "libbb.h"
-static void pipe_out(int fd)
+enum {
+        OPT_i = (1 << 0),
+};
+static char *query(const char *host, int port, const char *domain)
 {
+        int fd;
        FILE *fp;
-        char buf[1024];
+        bool success;
+        char *redir = NULL;
+        const char *pfx = "";
+        char linebuf[1024];
+        char *buf = NULL;
+        unsigned bufpos = 0;
+ again:
+        printf("[Querying %s:%d '%s%s']\n", host, port, pfx, domain);
+        fd = create_and_connect_stream_or_die(host, port);
+        success = 0;
+        fdprintf(fd, "%s%s\r\n", pfx, domain);
        fp = xfdopen_for_read(fd);
-        while (fgets(buf, sizeof(buf), fp)) {
-                char *p = strpbrk(buf, "\r\n");
-                if (p)
-                        *p = '\0';
-                puts(buf);
-        }
+        while (fgets(linebuf, sizeof(linebuf), fp)) {
+                unsigned len = strcspn(linebuf, "\r\n");
+                linebuf[len++] = '\n';
+                buf = xrealloc(buf, bufpos + len + 1);
+                memcpy(buf + bufpos, linebuf, len);
+                bufpos += len;
+                buf[bufpos] = '\0';
+                if (!redir || !success) {
+                        trim(linebuf);
+                        str_tolower(linebuf);
+                        if (!success) {
+                                success = is_prefixed_with(linebuf, "domain:")
+                                       || is_prefixed_with(linebuf, "domain name:");
+                        }
+                        else if (!redir) {
+                                char *p = is_prefixed_with(linebuf, "whois server:");
+                                if (!p)
+                                        p = is_prefixed_with(linebuf, "whois:");
+                                if (p)
+                                        redir = xstrdup(skip_whitespace(p));
+                        }
+                }
+        }
        fclose(fp); /* closes fd too */
+        if (!success && !pfx[0]) {
+                /*
+                 * Looking at /etc/jwhois.conf, some whois servers use
+                 * "domain = DOMAIN", "DOMAIN ID <DOMAIN>"
+                 * and "domain=DOMAIN_WITHOUT_LAST_COMPONENT"
+                 * formats, but those are rare.
+                 * (There are a few even more contrived ones.)
+                 * We are trying only "domain DOMAIN", the typical one.
+                 */
+                pfx = "domain ";
+                bufpos = 0;
+                goto again;
+        }
+        /* Success */
+        if (redir && strcmp(redir, host) == 0) {
+                /* Redirect to self does not count */
+                free(redir);
+                redir = NULL;
+        }
+        if (!redir || (option_mask32 & OPT_i)) {
+                /* Output saved text */
+                printf("[%s]\n%s", host, buf ? buf : "");
+        }
+        free(buf);
+        return redir;
+}
+static void recursive_query(const char *host, int port, const char *domain)
+{
+        char *free_me = NULL;
+        char *redir;
+ again:
+        redir = query(host, port, domain);
+        free(free_me);
+        if (redir) {
+                printf("[Redirected to %s]\n", redir);
+                host = free_me = redir;
+                port = 43;
+                goto again;
+        }
 }
+/* One of "big" whois implementations has these options:
+ *
+ * $ whois --help
+ * jwhois version 4.0, Copyright (C) 1999-2007  Free Software Foundation, Inc.
+ * -v, --verbose              verbose debug output
+ * -c FILE, --config=FILE     use FILE as configuration file
+ * -h HOST, --host=HOST       explicitly query HOST
+ * -n, --no-redirect          disable content redirection
+ * -s, --no-whoisservers      disable whois-servers.net service support
+ * -a, --raw                  disable reformatting of the query
+ * -i, --display-redirections display all redirects instead of hiding them
+ * -p PORT, --port=PORT       use port number PORT (in conjunction with HOST)
+ * -r, --rwhois               force an rwhois query to be made
+ * --rwhois-display=DISPLAY   sets the display option in rwhois queries
+ * --rwhois-limit=LIMIT       sets the maximum number of matches to return
+ *
+ * Example of its output:
+ * $ whois cnn.com
+ * [Querying whois.verisign-grs.com]
+ * [Redirected to whois.corporatedomains.com]
+ * [Querying whois.corporatedomains.com]
+ * [whois.corporatedomains.com]
+ * ...text of the reply...
+ *
+ * With -i, reply from each server is printed, after all redirects are done:
+ * [Querying whois.verisign-grs.com]
+ * [Redirected to whois.corporatedomains.com]
+ * [Querying whois.corporatedomains.com]
+ * [whois.verisign-grs.com]
+ * ...text of the reply...
+ * [whois.corporatedomains.com]
+ * ...text of the reply...
+ *
+ * With -a, no "DOMAIN" -> "domain DOMAIN" transformation is attempted.
+ * With -n, the first reply is shown, redirects are not followed:
+ * [Querying whois.verisign-grs.com]
+ * [whois.verisign-grs.com]
+ * ...text of the reply...
+ */
 int whois_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int whois_main(int argc UNUSED_PARAM, char **argv)
 {
        int port = 43;
-        const char *host = "whois-servers.net";
+        const char *host = "whois.iana.org";
-        opt_complementary = "-1:p+";
-        getopt32(argv, "h:p:", &host, &port);
+        opt_complementary = "-1";
+        getopt32(argv, "ih:p:+", &host, &port);
        argv += optind;
        do {
-                int fd = create_and_connect_stream_or_die(host, port);
+                recursive_query(host, port, *argv);
-                fdprintf(fd, "%s\r\n", *argv);
-                pipe_out(fd);
        }
        while (*++argv);
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 1c7c7c48b..1c594cf96 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -106,8 +106,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
        /* Parse remaining options */
        ppid2match = -1;
        sid2match = -1;
-        opt_complementary = "s+:P+"; /* numeric opts */
+        opt = getopt32(argv, "vlfxons:+P:+", &sid2match, &ppid2match);
-        opt = getopt32(argv, "vlfxons:P:", &sid2match, &ppid2match);
        argv += optind;
        if (pkill && OPT_LIST) { /* -l: print the whole signal list */
diff --git a/procps/pidof.c b/procps/pidof.c
index 6d7b59109..6d265667f 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -51,13 +51,12 @@ int pidof_main(int argc UNUSED_PARAM, char **argv)
        unsigned opt;
 #if ENABLE_FEATURE_PIDOF_OMIT
        llist_t *omits = NULL; /* list of pids to omit */
-        opt_complementary = "o::";
 #endif
        /* do unconditional option parsing */
        opt = getopt32(argv, ""
                        IF_FEATURE_PIDOF_SINGLE ("s")
-                        IF_FEATURE_PIDOF_OMIT("o:", &omits));
+                        IF_FEATURE_PIDOF_OMIT("o:*", &omits));
 #if ENABLE_FEATURE_PIDOF_OMIT
        /* fill omit list.  */
diff --git a/procps/ps.c b/procps/ps.c
index 39cccec82..c9d33daf4 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -609,8 +609,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
         * procps v3.2.7 supports -T and shows tids as SPID column,
         * it also supports -L where it shows tids as LWP column.
         */
-        opt_complementary = "o::";
+        opt = getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o);
-        opt = getopt32(argv, "Zo:aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o);
        if (opt_o) {
                do {
                        parse_o(llist_pop(&opt_o));
diff --git a/procps/watch.c b/procps/watch.c
index 97aa04767..20859c3cd 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -51,9 +51,9 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
        xopen("/dev/null", O_RDONLY);
 #endif
-        opt_complementary = "-1:n+"; // at least one param; -n NUM
+        opt_complementary = "-1"; // at least one param; -n NUM
        // "+": stop at first non-option (procps 3.x only)
-        opt = getopt32(argv, "+dtn:", &period);
+        opt = getopt32(argv, "+dtn:+", &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 7fe5151db..3769af25e 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -300,8 +300,8 @@ 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:a+:c+:d+:f+:l+:m+:o+:p+:r+:s+:t+";
+                opt_complementary = "-1";
-                opt = getopt32(argv, "+a:c:d:f:l:m:o:p:r:s:t:u:U:e:"
+                opt = getopt32(argv, "+a:+c:+d:+f:+l:+m:+o:+p:+r:+s:+t:+u:U:e:"
                        IF_CHPST("/:n:vP012"),
                        &limita, &limitc, &limitd, &limitf, &limitl,
                        &limitm, &limito, &limitp, &limitr, &limits, &limitt,
diff --git a/runit/sv.c b/runit/sv.c
index 2a256a6b4..37df9a929 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -474,8 +474,8 @@ int sv_main(int argc UNUSED_PARAM, char **argv)
        x = getenv("SVWAIT");
        if (x) waitsec = xatou(x);
-        opt_complementary = "w+:vv"; /* -w N, -v is a counter */
+        opt_complementary = "vv"; /* -w N, -v is a counter */
-        getopt32(argv, "w:v", &waitsec, &verbose);
+        getopt32(argv, "w:+v", &waitsec, &verbose);
        argv += optind;
        action = *argv++;
        if (!action || !*argv) bb_show_usage();
diff --git a/scripts/generate_BUFSIZ.sh b/scripts/generate_BUFSIZ.sh
index 844261906..718788e0b 100755
--- a/scripts/generate_BUFSIZ.sh
+++ b/scripts/generate_BUFSIZ.sh
@@ -36,11 +36,10 @@ generate_std_and_exit() {
 }
 generate_big_and_exit() {
-        $debug && echo "Configuring: bb_common_bufsiz1[] in _end[], COMMON_BUFSIZE = $1"
+        $debug && echo "Configuring: bb_common_bufsiz1[] in bss, COMMON_BUFSIZE = $1"
        {
        echo "enum { COMMON_BUFSIZE = $1 };"
-        echo "extern char _end[]; /* linker-provided label */"
+        echo "extern char bb_common_bufsiz1[];"
-        echo "#define bb_common_bufsiz1 _end"
        echo "#define setup_common_bufsiz() ((void)0)"
        } | regenerate "$common_bufsiz_h"
        echo "$2" >"$common_bufsiz_h.method"
@@ -51,20 +50,10 @@ generate_1k_and_exit() {
        generate_big_and_exit 1024 "1k"
 }
-generate_malloc_and_exit() {
-        $debug && echo "Configuring: bb_common_bufsiz1[] is malloced"
-        {
-        echo "enum { COMMON_BUFSIZE = 1024 };"
-        echo "extern char *const bb_common_bufsiz1;"
-        echo "void setup_common_bufsiz(void);"
-        } | regenerate "$common_bufsiz_h"
-        echo "malloc" >"$common_bufsiz_h.method"
-        $exitcmd
-}
 round_down_COMMON_BUFSIZE() {
-        COMMON_BUFSIZE=$(( ($1-32) & 0xfffffe0 ))
+        COMMON_BUFSIZE=1024
+        test "$1" -le 32 && return
+        COMMON_BUFSIZE=$(( ($1-32) & 0x0ffffff0 ))
        COMMON_BUFSIZE=$(( COMMON_BUFSIZE < 1024 ? 1024 : COMMON_BUFSIZE ))
 }
@@ -104,77 +93,44 @@ if $postcompile; then
        test x"$PAGE_SIZE" = x"" && exit 1
        $debug && echo "PAGE_SIZE:0x$PAGE_SIZE $((0x$PAGE_SIZE))"
        PAGE_SIZE=$((0x$PAGE_SIZE))
-        test $PAGE_SIZE -lt 512 && exit 1
+        test $PAGE_SIZE -lt 1024 && exit 1
        # How much space between _end[] and next page?
        PAGE_MASK=$((PAGE_SIZE-1))
        TAIL_SIZE=$(( (-END) & PAGE_MASK ))
        $debug && echo "TAIL_SIZE:$TAIL_SIZE bytes"
-        if test x"$method" = x"1k" || test x"$method" = x"big"; then
+        if test x"$method" = x"1k"; then
-                if test $TAIL_SIZE -lt 1024; then
+                {
-                        # _end[] has no enough space for bb_common_bufsiz1[]
+                echo $TAIL_SIZE
-                        echo "Warning! Space in _end[] is too small ($TAIL_SIZE bytes)!"
+                md5sum <.config | cut -d' ' -f1
-                        echo "Rerun make to build a binary which doesn't use it!"
+                stat -c "%Y" .config
-                        rm -- "$common_bufsiz_h.1k.OK" 2>/dev/null
+                } >"$common_bufsiz_h.1k.OK"
-                        { md5sum <.config | cut -d' ' -f1; stat -c "%Y" .config; } >"$common_bufsiz_h.1k.FAIL"
+                round_down_COMMON_BUFSIZE $((1024 + TAIL_SIZE))
-                        rm busybox_unstripped busybox 2>/dev/null
+                # emit message only if COMMON_BUFSIZE is indeed larger
-# Note: here we can do either a "malloc" or "std" build.
+                test $COMMON_BUFSIZE -gt 1024 \
-# "malloc" gives a bit bigger code:
+                        && echo "Rerun make to use larger COMMON_BUFSIZE ($COMMON_BUFSIZE)"
-#     text  bss filename
+                test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
-#   804355 5385 busybox.std
+                generate_big_and_exit $COMMON_BUFSIZE "big"
-#   804618 4361 busybox.malloc
-# but may have a smaller .bss (not guaranteed!). Use "pmap -x" to verify.
-                        exitcmd="exit 1"
-                        generate_malloc_and_exit
-                else
-                        PREV_SIZE=1024
-                        test x"$method" = x"big" && PREV_SIZE=`cat -- "$common_bufsiz_h.1k.OK"`
-                        round_down_COMMON_BUFSIZE $PREV_SIZE
-                        PREV_BUFSIZE=$COMMON_BUFSIZE
-                        rm -- "$common_bufsiz_h.1k.FAIL" 2>/dev/null
-                        echo $TAIL_SIZE >"$common_bufsiz_h.1k.OK"
-                        round_down_COMMON_BUFSIZE $TAIL_SIZE
-                        # emit message only if COMMON_BUFSIZE is indeed larger
-                        test $COMMON_BUFSIZE -gt $PREV_BUFSIZE \
-                                && echo "Rerun make to use larger COMMON_BUFSIZE ($COMMON_BUFSIZE)"
-#TODO: test $PREV_BUFSIZE -lt $TAIL_SIZE && PANIC!!!
-#Code size with COMMON_BUFSIZE > 1024 may be bigger than code with COMMON_BUFSIZE = 1024!
-#(currently we just hope "-32 and round down to 32" saves us)
-                        test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
-                        generate_big_and_exit $COMMON_BUFSIZE "big"
-                fi
        fi
 fi
 # Based on past success/fail of 1k build, decide next build type
 if test -f "$common_bufsiz_h.1k.OK"; then
-        # Previous build succeeded fitting 1k into _end[].
+        # previous 1k build succeeded
-        # Try bigger COMMON_BUFSIZE if possible.
+        oldcfg=`tail -n2 -- "$common_bufsiz_h.1k.OK"`
-        TAIL_SIZE=`cat -- "$common_bufsiz_h.1k.OK"`
-        round_down_COMMON_BUFSIZE $TAIL_SIZE
-        test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
-        generate_big_and_exit $COMMON_BUFSIZE "big"
-fi
-if test -f "$common_bufsiz_h.1k.FAIL"; then
-        # Previous build FAILED to fit 1k into _end[].
-        # Was it with same .config?
-        oldcfg=`cat -- "$common_bufsiz_h.1k.FAIL"`
        curcfg=`md5sum <.config | cut -d' ' -f1; stat -c "%Y" .config`
-        # If yes, then build a "malloced" version
+        # config did not change
        if test x"$oldcfg" = x"$curcfg"; then
-                echo "Will not try 1k build, it failed before. Touch .config to override"
+                # Try bigger COMMON_BUFSIZE if possible
-# Note: here we can do either a "malloc" or "std" build.
+                TAIL_SIZE=`head -n1 -- "$common_bufsiz_h.1k.OK"`
-                generate_malloc_and_exit
+                round_down_COMMON_BUFSIZE $((1024 + TAIL_SIZE))
+                test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
+                generate_big_and_exit $COMMON_BUFSIZE "big"
        fi
-        # else: try 1k version
+        # config did change
-        echo "New .config, will try 1k build"
+        rm -rf -- "$common_bufsiz_h.1k.OK"
-        rm -- "$common_bufsiz_h.1k.FAIL"
-        generate_1k_and_exit
 fi
 # There was no 1k build yet. Try it.
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
index d39cf189a..29d9cf6cc 100644
--- a/scripts/kconfig/zconf.hash.c_shipped
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -32,14 +32,7 @@
 struct kconf_id;
 /* maximum key range = 45, duplicates = 0 */
-#ifdef __GNUC__
+unsigned int
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
 kconf_id_hash (register const char *str, register unsigned int len)
 {
  static unsigned char asso_values[] =
@@ -119,7 +112,7 @@ struct kconf_id_strings_t
    char kconf_id_strings_str41[sizeof("choice")];
    char kconf_id_strings_str46[sizeof("prompt")];
  };
-static struct kconf_id_strings_t kconf_id_strings_contents =
+struct kconf_id_strings_t kconf_id_strings_contents =
  {
    "if",
    "int",
@@ -153,9 +146,6 @@ static struct kconf_id_strings_t kconf_id_strings_contents =
    "prompt"
  };
 #define kconf_id_strings ((const char *) &kconf_id_strings_contents)
-#ifdef __GNUC__
-__inline
-#endif
 struct kconf_id *
 kconf_id_lookup (register const char *str, register unsigned int len)
 {
diff --git a/scripts/randomtest b/scripts/randomtest
index e2513d058..287f1c771 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -52,9 +52,18 @@ echo '# CONFIG_RFKILL is not set' >>.config
 if test x"$LIBC" = x"glibc"; then
        cat .config \
        | grep -v CONFIG_STATIC \
+        \
+        | grep -v CONFIG_FEATURE_2_4_MODULES \
+        | grep -v CONFIG_FEATURE_USE_BSS_TAIL \
+        | grep -v CONFIG_DEBUG_SANITIZE \
        >.config.new
        mv .config.new .config
        echo '# CONFIG_STATIC is not set' >>.config
+        # newer glibc (at least 2.23) no longer supply query_module() ABI.
+        # People who target 2.4 kernels would likely use older glibc (and older bbox).
+        echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
+        echo '# CONFIG_FEATURE_USE_BSS_TAIL is not set' >>.config
+        echo '# CONFIG_DEBUG_SANITIZE is not set' >>.config
 fi
 # If uclibc, build static, and remove some things
@@ -68,6 +77,11 @@ if test x"$LIBC" = x"uclibc"; then
        | grep -v CONFIG_FEATURE_2_4_MODULES \
        | grep -v CONFIG_FEATURE_SYNC_FANCY \
        | grep -v CONFIG_FEATURE_TOUCH_NODEREF \
+        | grep -v CONFIG_NANDWRITE \
+        | grep -v CONFIG_NANDDUMP \
+        | grep -v CONFIG_BLKDISCARD \
+        | grep -v CONFIG_NSENTER \
+        | grep -v CONFIG_UNSHARE \
        >.config.new
        mv .config.new .config
        echo 'CONFIG_STATIC=y' >>.config
@@ -76,6 +90,12 @@ if test x"$LIBC" = x"uclibc"; then
        echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
        echo '# CONFIG_FEATURE_SYNC_FANCY is not set' >>.config
        echo '# CONFIG_FEATURE_TOUCH_NODEREF is not set' >>.config
+        # My uclibc installation does not support some needed APIs...
+        echo '# CONFIG_NANDWRITE is not set' >>.config
+        echo '# CONFIG_NANDDUMP is not set' >>.config
+        echo '# CONFIG_BLKDISCARD is not set' >>.config
+        echo '# CONFIG_NSENTER is not set' >>.config
+        echo '# CONFIG_UNSHARE is not set' >>.config
 fi
 # If STATIC, remove some things.
@@ -95,6 +115,8 @@ fi
 # Build!
 nice -n 10 make $MAKEOPTS 2>&1 | tee make.log
+grep 'Rerun make' make.log \
+&& nice -n 10 make $MAKEOPTS 2>&1 | tee -a make.log
 # Return exitcode 1 if busybox executable does not exist
 test -x busybox
diff --git a/scripts/trylink b/scripts/trylink
index 129570a60..145df9959 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -293,7 +293,7 @@ if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
    echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
    gcc -DNAME_MAIN -E -include include/autoconf.h include/applets.h \
    | grep -v "^#" \
-    | grep -v "^$" \
+    | grep -v "^ *$" \
    > applet_lst.tmp
    while read name main junk; do
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 51a7e63bd..c9597d54e 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -577,13 +577,13 @@ int setfiles_main(int argc UNUSED_PARAM, char **argv)
        set_matchpathcon_flags(matchpathcon_flags);
-        opt_complementary = "e::vv:v--p:p--v:v--q:q--v";
+        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",
+                flags = getopt32(argv, "de:*f:ilnpqrsvo:FWR",
                        &exclude_dir, &input_filename, &out_filename, &verbose);
        } else { /* setfiles */
-                flags = getopt32(argv, "de:f:ilnpqr:svo:FW"
+                flags = getopt32(argv, "de:*f:ilnpqr:svo:FW"
                                IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
                        &exclude_dir, &input_filename, &rootpath, &out_filename,
                                IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index a119bdeae..ae0840bff 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -342,7 +342,7 @@ enum {
 #define OPTION_STR "m:nO:l:S" \
        IF_FEATURE_ROTATE_LOGFILE("s:" ) \
        IF_FEATURE_ROTATE_LOGFILE("b:" ) \
-        IF_FEATURE_REMOTE_LOG(    "R:" ) \
+        IF_FEATURE_REMOTE_LOG(    "R:*") \
        IF_FEATURE_REMOTE_LOG(    "L"  ) \
        IF_FEATURE_IPC_SYSLOG(    "C::") \
        IF_FEATURE_SYSLOGD_DUP(   "D"  ) \
@@ -1108,8 +1108,8 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
-        /* No non-option params, -R can occur multiple times */
+        /* No non-option params */
-        opt_complementary = "=0" IF_FEATURE_REMOTE_LOG(":R::");
+        opt_complementary = "=0";
        opts = getopt32(argv, OPTION_STR, OPTION_PARAM);
 #if ENABLE_FEATURE_REMOTE_LOG
        while (remoteAddrList) {
diff --git a/testsuite/ar.tests b/testsuite/ar.tests
index 0a8eb9b32..ad7b8fe5f 100755
--- a/testsuite/ar.tests
+++ b/testsuite/ar.tests
@@ -15,7 +15,7 @@ testing "ar creates archives" \
       "$(md5sum <README)\n" \
       "" \
       ""
-rm test.a
+rm test.a 2>/dev/null
 testing "ar replaces things in archives" \
       "echo 'blah!' >file1 && echo 'blast!' >file2 && ar cr test.a README file1 file2 && mv file2 file1 && ar cr test.a file1 && ar p test.a file1" \
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 04fea3ea2..545cad5c0 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -6,6 +6,16 @@
 . ./testing.sh
+ln -s `which busybox` unknown
+testing "busybox as unknown name" "./unknown 2>&1" \
+        "unknown: applet not found\n" "" ""
+rm unknown
+# We need busybox --help to be enabled for the rest of tests
+test x"$CONFIG_BUSYBOX" = x"y" \
+|| { echo "SKIPPED: busybox --help"; exit 0; }
 HELPDUMP=`true | busybox 2>&1 | cat`
 # We need to test under calling the binary under other names.
@@ -38,10 +48,4 @@ do
 done
 rm busybox-suffix
-ln -s `which busybox` unknown
-testing "busybox as unknown name" "./unknown 2>&1" \
-        "unknown: applet not found\n" "" ""
-rm unknown
 exit $FAILCOUNT
diff --git a/testsuite/du/du-m-works b/testsuite/du/du-m-works
index 9fa7437ac..d9693c7bf 100644
--- a/testsuite/du/du-m-works
+++ b/testsuite/du/du-m-works
@@ -1,4 +1,4 @@
 # FEATURE: CONFIG_FEATURE_HUMAN_READABLE
 dd if=/dev/zero of=file bs=1M count=1 2>/dev/null
-test x"`busybox du -m .`" = x"1 ."
+test x"`busybox du -m file`" = x"1      file"
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 890a73dd5..c44b7ad07 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -24,7 +24,7 @@ tar: short read
 "" ""
 SKIP=
-optional FEATURE_SEAMLESS_GZ
+optional FEATURE_SEAMLESS_GZ GUNZIP
 # In NOMMU case, "invalid magic" message comes from gunzip child process.
 # Otherwise, it comes from tar.
 # Need to fix output up to avoid false positive.
@@ -204,7 +204,7 @@ SKIP=
 # Had a bug where on extract autodetect first "switched off" -z
 # and then failed to recognize .tgz extension
-optional FEATURE_TAR_CREATE FEATURE_SEAMLESS_GZ
+optional FEATURE_TAR_CREATE FEATURE_SEAMLESS_GZ GUNZIP
 testing "tar extract tgz" "\
 dd count=1 bs=1M if=/dev/zero of=F0 2>/dev/null
 tar -czf F0.tgz F0
@@ -266,7 +266,7 @@ SKIP=
 # The correct implementation unlinks target before
 # creating the second file.
 # We test that /tmp/passwd remains empty:
-optional UUDECODE FEATURE_SEAMLESS_BZ2
+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 \$?
 " "\
@@ -282,7 +282,7 @@ l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
 "
 SKIP=
 # And same with -k
-optional UUDECODE FEATURE_SEAMLESS_BZ2
+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 \$?
 " "\
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index e543446c1..50e8a0fce 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -34,8 +34,7 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
                OPT_r = 1 << 3
        };
-        opt_complementary = "s+:n+"; /* numeric */
+        opts = getopt32(argv, "cs:+n:+r", &len, &level);
-        opts = getopt32(argv, "cs:n:r", &len, &level);
        if (opts & OPT_n) {
                if (klogctl(8, NULL, (long) level))
                        bb_perror_msg_and_die("klogctl");
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 09e96b763..b75ec1921 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -164,6 +164,7 @@ static const struct cmdoptions_t {
        const unsigned char code;
 } g_cmdoptions[] = {
        /*"12345678" + NUL */
+//TODO: convert to index_in_strings()
        { "fb"      , 1, CMD_FB       },
        { "db"      , 1, CMD_DB       },
        { "a"       , 0, CMD_ALL      },
@@ -416,7 +417,7 @@ int fbset_main(int argc, char **argv)
        unsigned options = 0;
        const char *fbdev = DEFAULTFBDEV;
-        const char *modefile = DEFAULTFBMODE;
+        IF_FEATURE_FBSET_READMODE(const char *modefile = DEFAULTFBMODE;)
        char *thisarg;
        char *mode = mode; /* for compiler */
@@ -444,7 +445,7 @@ int fbset_main(int argc, char **argv)
                                fbdev = argv[1];
                                break;
                        case CMD_DB:
-                                modefile = argv[1];
+                                IF_FEATURE_FBSET_READMODE(modefile = argv[1];)
                                break;
                        case CMD_ALL:
                                options |= OPT_ALL;
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index f49ce95a4..6391f9bd9 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -2919,8 +2919,7 @@ int fdisk_main(int argc UNUSED_PARAM, char **argv)
        close_dev_fd(); /* needed: fd 3 must not stay closed */
-        opt_complementary = "b+:C+:H+:S+"; /* numeric params */
+        opt = getopt32(argv, "b:+C:+H:+lS:+u" IF_FEATURE_FDISK_BLKSIZE("s"),
-        opt = getopt32(argv, "b:C:H:lS:u" IF_FEATURE_FDISK_BLKSIZE("s"),
                                &sector_size, &user_cylinders, &user_heads, &user_sectors);
        argv += optind;
        if (opt & OPT_b) {
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index af04cfcc8..89f1f323c 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -366,10 +366,11 @@ bsd_select(void)
                        }
                                printf("Reading disklabel of %s at sector %u\n",
                                        partname(disk_device, t+1, 0), ss + BSD_LABELSECTOR);
-                        if (xbsd_readlabel(xbsd_part) == 0)
+                        if (xbsd_readlabel(xbsd_part) == 0) {
                                if (xbsd_create_disklabel() == 0)
                                        return;
                                break;
+                        }
                }
        }
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index 23ebc56ef..30def09c6 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -504,17 +504,19 @@ verify_sgi(int verbose)
        if (sgi_get_sysid(Index[0]) == SGI_ENTIRE_DISK) {
                if ((Index[0] != 10) && verbose)
                        printf("IRIX likes when Partition 11 covers the entire disk\n");
-                if ((sgi_get_start_sector(Index[0]) != 0) && verbose)
+                if ((sgi_get_start_sector(Index[0]) != 0) && verbose) {
                        printf("The entire disk partition should start "
                                "at block 0,\n"
                                "not at diskblock %u\n",
                                sgi_get_start_sector(Index[0]));
-                if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
+                }
+                if (SGI_DEBUG) {     /* I do not understand how some disks fulfil it */
                        if ((sgi_get_num_sectors(Index[0]) != lastblock) && verbose)
                                printf("The entire disk partition is only %u diskblock large,\n"
                                        "but the disk is %u diskblocks long\n",
                                        sgi_get_num_sectors(Index[0]), lastblock);
                        lastblock = sgi_get_num_sectors(Index[0]);
+                }
        } else {
                if (verbose)
                        printf("One Partition (#11) should cover the entire disk\n");
@@ -669,16 +671,17 @@ sgi_set_volhdr(void)
        int n;
        for (n = 8; n < g_partitions; n++) {
-        if (!sgi_get_num_sectors(n)) {
+                if (!sgi_get_num_sectors(n)) {
-                /*
+                        /*
-                 * 5 cylinders is an arbitrary value I like
+                         * 5 cylinders is an arbitrary value I like
-                 * IRIX 5.3 stored files in the volume header
+                         * IRIX 5.3 stored files in the volume header
-                 * (like sash, symmon, fx, ide) with ca. 3200
+                         * (like sash, symmon, fx, ide) with ca. 3200
-                 * sectors.
+                         * sectors.
-                 */
+                         */
-                if (g_heads * g_sectors * 5 < sgi_get_lastblock())
+                        if (g_heads * g_sectors * 5 < sgi_get_lastblock()) {
-                        sgi_set_partition(n, 0, g_heads * g_sectors * 5, SGI_VOLHDR);
+                                sgi_set_partition(n, 0, g_heads * g_sectors * 5, SGI_VOLHDR);
-                        break;
+                                break;
+                        }
                }
        }
 }
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index b9dadf13c..18d490987 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -397,8 +397,7 @@ int getopt_main(int argc, char **argv)
        opt = getopt32(argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg);
 #else
        applet_long_options = getopt_longopts;
-        opt_complementary = "l::";
+        opt = getopt32(argv, "+o:n:qQs:Tual:*",
-        opt = getopt32(argv, "+o:n:qQs:Tual:",
                                        &optstr, &name, &s_arg, &l_arg);
        /* Effectuate the read options for the applet itself */
        while (l_arg) {
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index f91a0b4bf..413e7aa15 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -244,8 +244,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
        // using global "option_mask32" instead of local "opts":
        // we are register starved here
-        opt_complementary = "-1:b+:i+:I+:m+";
+        /*opts =*/ getopt32(argv, "cl:b:+f:i:+I:+J:G:N:m:+o:g:L:M:O:r:E:T:U:jnqvFS",
-        /*opts =*/ getopt32(argv, "cl:b:f:i:I:J:G:N:m:o:g:L:M:O:r:E:T:U:jnqvFS",
                /*lbfi:*/ NULL, &bs, NULL, &bpi,
                /*IJGN:*/ &user_inodesize, NULL, NULL, NULL,
                /*mogL:*/ &reserved_percent, NULL, NULL, &label,
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 88d797584..aaabf8453 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -604,8 +604,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
                bb_error_msg_and_die("bad inode size");
 #endif
-        opt_complementary = "n+"; /* -n N */
+        opt = getopt32(argv, "ci:l:n:+v", &str_i, &listfile, &G.namelen);
-        opt = getopt32(argv, "ci:l:n:v", &str_i, &listfile, &G.namelen);
        argv += optind;
        //if (opt & 1) -c
        if (opt & 2) G.req_nr_inodes = xatoul(str_i); // -i
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index 56c8f0ab5..0a31ee44f 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -169,8 +169,8 @@ 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:b+";
+        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",
                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &label);
        argv += optind; // argv[0] -- device
diff --git a/util-linux/mount.c b/util-linux/mount.c
index c76f6ef61..13590ceb4 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -268,7 +268,7 @@ enum {
 };
-#define OPTION_STR "o:t:rwanfvsiO:" IF_FEATURE_MOUNT_OTHERTAB("T:")
+#define OPTION_STR "o:*t:rwanfvsiO:" IF_FEATURE_MOUNT_OTHERTAB("T:")
 enum {
        OPT_o = (1 << 0),
        OPT_t = (1 << 1),
@@ -2058,7 +2058,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
                del_loop(mp->mnt_fsname);
                if (ENABLE_FEATURE_CLEAN_UP) {
                        free(loopFile);
-                        free(mp->mnt_fsname);
+                        /* No, "rc != 0" needs it: free(mp->mnt_fsname); */
                }
        }
@@ -2167,7 +2167,7 @@ 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 = "?2o::" IF_FEATURE_MOUNT_VERBOSE("vv");
+        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));
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index a64540464..345b676ba 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -99,8 +99,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
        proFile = defaultpro;
        mapFile = defaultmap;
-        opt_complementary = "M+"; /* -M N */
+        opt = getopt32(argv, "M:+m:p:nabsirv", &multiplier, &mapFile, &proFile);
-        opt = getopt32(argv, "M:m:p:nabsirv", &multiplier, &mapFile, &proFile);
        if (opt & (OPT_M|OPT_r)) { /* mult or reset, or both */
                int fd, to_write;
author	Ron Yorston <rmy@pobox.com>	2016-07-07 14:28:08 +0100
committer	Ron Yorston <rmy@pobox.com>	2016-07-07 14:58:55 +0100
commit	613f46218c53c8cabdbf0435653e74e0e0e91e1c (patch)
tree	ca06a7e7a3e4c861441acb4ea20648d7827fa6ae
parent	a0c61c9492723dd31681f878f9c68c92817a476d (diff)
parent	237bedd499c58034a1355484d6d4d906f0180308 (diff)
download	busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.gz busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.bz2 busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.zip