101 files changed, 1041 insertions, 549 deletions
diff --git a/archival/Config.src b/archival/Config.src
index 76635ba78..a9afaea5b 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -31,7 +31,7 @@ config FEATURE_SEAMLESS_GZ
 config FEATURE_SEAMLESS_Z
        bool "tar, rpm, modprobe etc understand .Z data"
-        default n
+        default n  # it is ancient
        help
          Make tar, rpm, modprobe etc understand .Z data.
diff --git a/archival/ar.c b/archival/ar.c
index 89e6a1207..a850868f6 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -22,23 +22,13 @@
 //config:       default n  # needs to be improved to be able to replace binutils ar
 //config:       help
 //config:         ar is an archival utility program used to create, modify, and
-//config:         extract contents from archives. An archive is a single file holding
+//config:         extract contents from archives. In practice, it is used exclusively
-//config:         a collection of other files in a structure that makes it possible to
+//config:         for object module archives used by compilers.
-//config:         retrieve the original individual files (called archive members).
-//config:         The original files' contents, mode (permissions), timestamp, owner,
-//config:         and group are preserved in the archive, and can be restored on
-//config:         extraction.
 //config:
-//config:         The stored filename is limited to 15 characters. (for more information
-//config:         see long filename support).
-//config:         ar has 60 bytes of overheads for every stored file.
-//config:
-//config:         This implementation of ar can extract archives, it cannot create or
-//config:         modify them.
 //config:         On an x86 system, the ar applet adds about 1K.
 //config:
 //config:         Unless you have a specific application which requires ar, you should
-//config:         probably say N here.
+//config:         probably say N here: most compilers come with their own ar utility.
 //config:
 //config:config FEATURE_AR_LONG_FILENAMES
 //config:       bool "Support for long filenames (not needed for debs)"
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index a859ef201..aaaf67e03 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -222,7 +222,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //config:config UNCOMPRESS
 //config:       bool "uncompress"
-//config:       default n
+//config:       default n  # ancient
 //config:       help
 //config:         uncompress is used to decompress archives created by compress.
 //config:         Not much used anymore, replaced by gzip/gunzip.
@@ -292,6 +292,13 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //config:         gunzip is used to decompress archives created by gzip.
 //config:         You can use the `-t' option to test the integrity of
 //config:         an archive, without decompressing it.
+//config:
+//config:config FEATURE_GUNZIP_LONG_OPTIONS
+//config:       bool "Enable long options"
+//config:       default y
+//config:       depends on GUNZIP && LONG_OPTS
+//config:       help
+//config:         Enable use of long options.
 //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP))
 //applet:IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
@@ -323,6 +330,17 @@ char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UN
        }
        return filename;
 }
+#if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
+static const char gunzip_longopts[] ALIGN1 =
+        "stdout\0"              No_argument       "c"
+        "to-stdout\0"           No_argument       "c"
+        "force\0"               No_argument       "f"
+        "test\0"                No_argument       "t"
+        "no-name\0"             No_argument       "n"
+        ;
+#endif
 /*
 * Linux kernel build uses gzip -d -n. We accept and ignore it.
 * Man page says:
@@ -339,6 +357,9 @@ char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UN
 int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int gunzip_main(int argc UNUSED_PARAM, char **argv)
 {
+#if ENABLE_FEATURE_GUNZIP_LONG_OPTIONS
+        applet_long_options = gunzip_longopts;
+#endif
        getopt32(argv, "cfvqdtn");
        argv += optind;
diff --git a/archival/gzip.c b/archival/gzip.c
index c9171304a..f9bb3c742 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2160,6 +2160,7 @@ static const char gzip_longopts[] ALIGN1 =
        "quiet\0"               No_argument       "q"
        "fast\0"                No_argument       "1"
        "best\0"                No_argument       "9"
+        "no-name\0"             No_argument       "n"
        ;
 #endif
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 45776dcbe..bd034afdc 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -11,6 +11,12 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
        file_header_t *file_header = archive_handle->file_header;
        int dst_fd;
        int res;
+        char *hard_link;
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+        char *dst_name;
+#else
+# define dst_name (file_header->name)
+#endif
 #if ENABLE_FEATURE_TAR_SELINUX
        char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE];
@@ -23,11 +29,49 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
        }
 #endif
+        /* Hard links are encoded as regular files of size 0
+         * with a nonempty link field */
+        hard_link = NULL;
+        if (S_ISREG(file_header->mode) && file_header->size == 0)
+                hard_link = file_header->link_target;
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+        dst_name = file_header->name;
+        if (archive_handle->tar__strip_components) {
+                unsigned n = archive_handle->tar__strip_components;
+                do {
+                        dst_name = strchr(dst_name, '/');
+                        if (!dst_name || dst_name[1] == '\0') {
+                                data_skip(archive_handle);
+                                goto ret;
+                        }
+                        dst_name++;
+                        /*
+                         * Link target is shortened only for hardlinks:
+                         * softlinks restored unchanged.
+                         */
+                        if (hard_link) {
+// GNU tar 1.26 does not check that we reached end of link name:
+// if "dir/hardlink" is hardlinked to "file",
+// tar xvf a.tar --strip-components=1 says:
+//  tar: hardlink: Cannot hard link to '': No such file or directory
+// and continues processing. We silently skip such entries.
+                                hard_link = strchr(hard_link, '/');
+                                if (!hard_link || hard_link[1] == '\0') {
+                                        data_skip(archive_handle);
+                                        goto ret;
+                                }
+                                hard_link++;
+                        }
+                } while (--n != 0);
+        }
+#endif
        if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) {
-                char *slash = strrchr(file_header->name, '/');
+                char *slash = strrchr(dst_name, '/');
                if (slash) {
                        *slash = '\0';
-                        bb_make_directory(file_header->name, -1, FILEUTILS_RECUR);
+                        bb_make_directory(dst_name, -1, FILEUTILS_RECUR);
                        *slash = '/';
                }
        }
@@ -35,12 +79,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
        if (archive_handle->ah_flags & ARCHIVE_UNLINK_OLD) {
                /* Remove the entry if it exists */
                if (!S_ISDIR(file_header->mode)) {
-                        /* Is it hardlink?
+                        if (hard_link) {
-                         * We encode hard links as regular files of size 0 with a symlink */
-                        if (S_ISREG(file_header->mode)
-                         && file_header->link_target
-                         && file_header->size == 0
-                        ) {
                                /* Ugly special case:
                                 * tar cf t.tar hardlink1 hardlink2 hardlink1
                                 * results in this tarball structure:
@@ -48,22 +87,22 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                                 * hardlink2 -> hardlink1
                                 * hardlink1 -> hardlink1 <== !!!
                                 */
-                                if (strcmp(file_header->link_target, file_header->name) == 0)
+                                if (strcmp(hard_link, dst_name) == 0)
                                        goto ret;
                        }
                        /* Proceed with deleting */
-                        if (unlink(file_header->name) == -1
+                        if (unlink(dst_name) == -1
                         && errno != ENOENT
                        ) {
                                bb_perror_msg_and_die("can't remove old file %s",
-                                                file_header->name);
+                                                dst_name);
                        }
                }
        }
        else if (archive_handle->ah_flags & ARCHIVE_EXTRACT_NEWER) {
                /* Remove the existing entry if its older than the extracted entry */
                struct stat existing_sb;
-                if (lstat(file_header->name, &existing_sb) == -1) {
+                if (lstat(dst_name, &existing_sb) == -1) {
                        if (errno != ENOENT) {
                                bb_perror_msg_and_die("can't stat old file");
                        }
@@ -73,30 +112,25 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                         && !S_ISDIR(file_header->mode)
                        ) {
                                bb_error_msg("%s not created: newer or "
-                                        "same age file exists", file_header->name);
+                                        "same age file exists", dst_name);
                        }
                        data_skip(archive_handle);
                        goto ret;
                }
-                else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
+                else if ((unlink(dst_name) == -1) && (errno != EISDIR)) {
                        bb_perror_msg_and_die("can't remove old file %s",
-                                        file_header->name);
+                                        dst_name);
                }
        }
-        /* Handle hard links separately
+        /* Handle hard links separately */
-         * We encode hard links as regular files of size 0 with a symlink */
+        if (hard_link) {
-        if (S_ISREG(file_header->mode)
+                res = link(hard_link, dst_name);
-         && file_header->link_target
+                if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
-         && file_header->size == 0
-        ) {
-                /* hard link */
-                res = link(file_header->link_target, file_header->name);
-                if ((res == -1) && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
                        bb_perror_msg("can't create %slink "
                                        "from %s to %s", "hard",
-                                        file_header->name,
+                                        dst_name,
-                                        file_header->link_target);
+                                        hard_link);
                }
                /* Hardlinks have no separate mode/ownership, skip chown/chmod */
                goto ret;
@@ -106,17 +140,17 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
        switch (file_header->mode & S_IFMT) {
        case S_IFREG: {
                /* Regular file */
-                char *dst_name;
+                char *dst_nameN;
                int flags = O_WRONLY | O_CREAT | O_EXCL;
                if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
                        flags = O_WRONLY | O_CREAT | O_TRUNC;
-                dst_name = file_header->name;
+                dst_nameN = dst_name;
 #ifdef ARCHIVE_REPLACE_VIA_RENAME
                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
                        /* rpm-style temp file name */
-                        dst_name = xasprintf("%s;%x", dst_name, (int)getpid());
+                        dst_nameN = xasprintf("%s;%x", dst_name, (int)getpid());
 #endif
-                dst_fd = xopen3(dst_name,
+                dst_fd = xopen3(dst_nameN,
                        flags,
                        file_header->mode
                        );
@@ -124,32 +158,32 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                close(dst_fd);
 #ifdef ARCHIVE_REPLACE_VIA_RENAME
                if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
-                        xrename(dst_name, file_header->name);
+                        xrename(dst_nameN, dst_name);
-                        free(dst_name);
+                        free(dst_nameN);
                }
 #endif
                break;
        }
        case S_IFDIR:
-                res = mkdir(file_header->name, file_header->mode);
+                res = mkdir(dst_name, file_header->mode);
                if ((res == -1)
                 && (errno != EISDIR) /* btw, Linux doesn't return this */
                 && (errno != EEXIST)
                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                ) {
-                        bb_perror_msg("can't make dir %s", file_header->name);
+                        bb_perror_msg("can't make dir %s", dst_name);
                }
                break;
        case S_IFLNK:
                /* Symlink */
 //TODO: what if file_header->link_target == NULL (say, corrupted tarball?)
-                res = symlink(file_header->link_target, file_header->name);
+                res = symlink(file_header->link_target, dst_name);
-                if ((res == -1)
+                if (res != 0
                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                ) {
                        bb_perror_msg("can't create %slink "
                                "from %s to %s", "sym",
-                                file_header->name,
+                                dst_name,
                                file_header->link_target);
                }
                break;
@@ -157,11 +191,11 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
        case S_IFBLK:
        case S_IFCHR:
        case S_IFIFO:
-                res = mknod(file_header->name, file_header->mode, file_header->device);
+                res = mknod(dst_name, file_header->mode, file_header->device);
                if ((res == -1)
                 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                ) {
-                        bb_perror_msg("can't create node %s", file_header->name);
+                        bb_perror_msg("can't create node %s", dst_name);
                }
                break;
        default:
@@ -186,20 +220,20 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                        }
 #endif
                        /* GNU tar 1.15.1 uses chown, not lchown */
-                        chown(file_header->name, uid, gid);
+                        chown(dst_name, uid, gid);
                }
                /* uclibc has no lchmod, glibc is even stranger -
                 * it has lchmod which seems to do nothing!
                 * so we use chmod... */
                if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_PERM)) {
-                        chmod(file_header->name, file_header->mode);
+                        chmod(dst_name, file_header->mode);
                }
                if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) {
                        struct timeval t[2];
                        t[1].tv_sec = t[0].tv_sec = file_header->mtime;
                        t[1].tv_usec = t[0].tv_usec = 0;
-                        utimes(file_header->name, t);
+                        utimes(dst_name, t);
                }
        }
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index b6ae7f738..eb64645ae 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -308,11 +308,11 @@ static int huft_build(const unsigned *b, const unsigned n,
        unsigned i;             /* counter, current code */
        unsigned j;             /* counter */
        int k;                  /* number of bits in current code */
-        unsigned *p;            /* pointer into c[], b[], or v[] */
+        const unsigned *p;      /* pointer into c[], b[], or v[] */
        huft_t *q;              /* points to current table */
        huft_t r;               /* table entry for structure assignment */
        huft_t *u[BMAX];        /* table stack */
-        unsigned v[N_MAX];      /* values in order of bit length */
+        unsigned v[N_MAX + 1];  /* values in order of bit length. last v[] is never used */
        int ws[BMAX + 1];       /* bits decoded stack */
        int w;                  /* bits decoded */
        unsigned x[BMAX + 1];   /* bit offsets, then code stack */
@@ -327,7 +327,7 @@ static int huft_build(const unsigned *b, const unsigned n,
        /* Generate counts for each bit length */
        memset(c, 0, sizeof(c));
-        p = (unsigned *) b; /* cast allows us to reuse p for pointing to b */
+        p = b;
        i = n;
        do {
                c[*p]++; /* assume all entries <= BMAX */
@@ -367,8 +367,12 @@ static int huft_build(const unsigned *b, const unsigned n,
                *xp++ = j;
        }
-        /* Make a table of values in order of bit lengths */
+        /* Make a table of values in order of bit lengths.
-        p = (unsigned *) b;
+         * To detect bad input, unused v[i]'s are set to invalid value UINT_MAX.
+         * In particular, last v[i] is never filled and must not be accessed.
+         */
+        memset(v, 0xff, sizeof(v));
+        p = b;
        i = 0;
        do {
                j = *p++;
@@ -435,7 +439,9 @@ static int huft_build(const unsigned *b, const unsigned n,
                        /* set up table entry in r */
                        r.b = (unsigned char) (k - w);
-                        if (p >= v + n) {
+                        if (/*p >= v + n || -- redundant, caught by the second check: */
+                            *p == UINT_MAX /* do we access uninited v[i]? (see memset(v))*/
+                        ) {
                                r.e = 99; /* out of values--invalid code */
                        } else if (*p < s) {
                                r.e = (unsigned char) (*p < 256 ? 16 : 15);     /* 256 is EOB code */
@@ -520,8 +526,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
                e = t->e;
                if (e > 16)
                        do {
-                                if (e == 99)
+                                if (e == 99) {
-                                        abort_unzip(PASS_STATE_ONLY);;
+                                        abort_unzip(PASS_STATE_ONLY);
+                                }
                                bb >>= t->b;
                                k -= t->b;
                                e -= 16;
@@ -557,8 +564,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
                        e = t->e;
                        if (e > 16)
                                do {
-                                        if (e == 99)
+                                        if (e == 99) {
                                                abort_unzip(PASS_STATE_ONLY);
+                                        }
                                        bb >>= t->b;
                                        k -= t->b;
                                        e -= 16;
@@ -824,8 +832,9 @@ static int inflate_block(STATE_PARAM smallint *e)
                b_dynamic >>= 4;
                k_dynamic -= 4;
-                if (nl > 286 || nd > 30)
+                if (nl > 286 || nd > 30) {
                        abort_unzip(PASS_STATE_ONLY);   /* bad lengths */
+                }
                /* read in bit-length-code lengths */
                for (j = 0; j < nb; j++) {
@@ -906,12 +915,14 @@ static int inflate_block(STATE_PARAM smallint *e)
                bl = lbits;
                i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl);
-                if (i != 0)
+                if (i != 0) {
                        abort_unzip(PASS_STATE_ONLY);
+                }
                bd = dbits;
                i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd);
-                if (i != 0)
+                if (i != 0) {
                        abort_unzip(PASS_STATE_ONLY);
+                }
                /* set up data for inflate_codes() */
                inflate_codes_setup(PASS_STATE bl, bd);
@@ -999,6 +1010,7 @@ inflate_unzip_internal(STATE_PARAM transformer_state_t *xstate)
        error_msg = "corrupted data";
        if (setjmp(error_jmp)) {
                /* Error from deep inside zip machinery */
+                bb_error_msg(error_msg);
                n = -1;
                goto ret;
        }
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index fb68673b9..ac2be726f 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -418,6 +418,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
        /* Everything up to and including last ".." component is stripped */
        overlapping_strcpy(file_header->name, strip_unsafe_prefix(file_header->name));
+//TODO: do the same for file_header->link_target?
        /* Strip trailing '/' in directories */
        /* Must be done after mode is set as '/' is used to check if it's a directory */
diff --git a/archival/lzop.c b/archival/lzop.c
index 73d11a705..a5fc01941 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -640,7 +640,7 @@ static int lzo_get_method(header_t *h)
 /**********************************************************************/
 // compress a file
 /**********************************************************************/
-static NOINLINE smallint lzo_compress(const header_t *h)
+static NOINLINE int lzo_compress(const header_t *h)
 {
        unsigned block_size = LZO_BLOCK_SIZE;
        int r = 0; /* LZO_E_OK */
@@ -650,7 +650,6 @@ static NOINLINE smallint lzo_compress(const header_t *h)
        uint32_t d_adler32 = ADLER32_INIT_VALUE;
        uint32_t d_crc32 = CRC32_INIT_VALUE;
        int l;
-        smallint ok = 1;
        uint8_t *wrk_mem = NULL;
        if (h->method == M_LZO1X_1)
@@ -732,7 +731,7 @@ static NOINLINE smallint lzo_compress(const header_t *h)
        free(wrk_mem);
        free(b1);
        free(b2);
-        return ok;
+        return 1;
 }
 static FAST_FUNC void lzo_check(
@@ -753,7 +752,7 @@ static FAST_FUNC void lzo_check(
 /**********************************************************************/
 // decompress a file
 /**********************************************************************/
-static NOINLINE smallint lzo_decompress(const header_t *h)
+static NOINLINE int lzo_decompress(const header_t *h)
 {
        unsigned block_size = LZO_BLOCK_SIZE;
        int r;
@@ -761,7 +760,6 @@ static NOINLINE smallint lzo_decompress(const header_t *h)
        uint32_t c_adler32 = ADLER32_INIT_VALUE;
        uint32_t d_adler32 = ADLER32_INIT_VALUE;
        uint32_t c_crc32 = CRC32_INIT_VALUE, d_crc32 = CRC32_INIT_VALUE;
-        smallint ok = 1;
        uint8_t *b1;
        uint32_t mcs_block_size = MAX_COMPRESSED_SIZE(block_size);
        uint8_t *b2 = NULL;
@@ -865,7 +863,7 @@ static NOINLINE smallint lzo_decompress(const header_t *h)
        }
        free(b2);
-        return ok;
+        return 1;
 }
 /**********************************************************************/
@@ -1050,7 +1048,7 @@ static void lzo_set_method(header_t *h)
        h->level = level;
 }
-static smallint do_lzo_compress(void)
+static int do_lzo_compress(void)
 {
        header_t header;
@@ -1078,7 +1076,7 @@ static smallint do_lzo_compress(void)
 /**********************************************************************/
 // decompress
 /**********************************************************************/
-static smallint do_lzo_decompress(void)
+static int do_lzo_decompress(void)
 {
        header_t header;
diff --git a/archival/tar.c b/archival/tar.c
index 0dd675f64..adb0b934f 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -152,9 +152,12 @@
 # define FNM_LEADING_DIR 0
 #endif
+#if 0
-//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+# define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
-#define DBG(...) ((void)0)
+#else
+# define DBG(...) ((void)0)
+#endif
+#define DBG_OPTION_PARSING 0
 #define block_buf bb_common_bufsiz1
@@ -884,6 +887,7 @@ enum {
        IF_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,)
        IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,)
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS
+        OPTBIT_STRIP_COMPONENTS,
        OPTBIT_NORECURSION,
        IF_FEATURE_TAR_TO_COMMAND(OPTBIT_2COMMAND   ,)
        OPTBIT_NUMERIC_OWNER,
@@ -908,12 +912,13 @@ enum {
        OPT_GZIP         = IF_FEATURE_SEAMLESS_GZ(  (1 << OPTBIT_GZIP        )) + 0, // z
        OPT_XZ           = IF_FEATURE_SEAMLESS_XZ(  (1 << OPTBIT_XZ          )) + 0, // J
        OPT_COMPRESS     = IF_FEATURE_SEAMLESS_Z(   (1 << OPTBIT_COMPRESS    )) + 0, // Z
-        OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m
+        OPT_NOPRESERVE_TIME  = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m
-        OPT_NORECURSION     = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NORECURSION    )) + 0, // no-recursion
+        OPT_STRIP_COMPONENTS = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_STRIP_COMPONENTS)) + 0, // strip-components
-        OPT_2COMMAND        = IF_FEATURE_TAR_TO_COMMAND(  (1 << OPTBIT_2COMMAND       )) + 0, // to-command
+        OPT_NORECURSION      = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NORECURSION    )) + 0, // no-recursion
-        OPT_NUMERIC_OWNER   = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NUMERIC_OWNER  )) + 0, // numeric-owner
+        OPT_2COMMAND         = IF_FEATURE_TAR_TO_COMMAND(  (1 << OPTBIT_2COMMAND       )) + 0, // to-command
-        OPT_NOPRESERVE_PERM = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions
+        OPT_NUMERIC_OWNER    = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NUMERIC_OWNER  )) + 0, // numeric-owner
-        OPT_OVERWRITE       = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_OVERWRITE      )) + 0, // overwrite
+        OPT_NOPRESERVE_PERM  = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions
+        OPT_OVERWRITE        = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_OVERWRITE      )) + 0, // overwrite
        OPT_ANY_COMPRESS = (OPT_BZIP2 | OPT_LZMA | OPT_GZIP | OPT_XZ | OPT_COMPRESS),
 };
@@ -957,6 +962,7 @@ static const char tar_longopts[] ALIGN1 =
 # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
        "touch\0"               No_argument       "m"
 # endif
+        "strip-components\0"    Required_argument "\xf9"
        "no-recursion\0"        No_argument       "\xfa"
 # if ENABLE_FEATURE_TAR_TO_COMMAND
        "to-command\0"          Required_argument "\xfb"
@@ -1002,15 +1008,28 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                "tt:vv:" // count -t,-v
                IF_FEATURE_TAR_FROM("X::T::") // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
-                "\xff::" // cumulative lists for --exclude
+                "\xff::" // --exclude=PATTERN is a list
 #endif
                IF_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
                IF_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
-                IF_NOT_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive
+                IF_NOT_FEATURE_TAR_CREATE("t--x:x--t") // mutually exclusive
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+                ":\xf9+" // --strip-components=NUM
+#endif
+        ;
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS
        applet_long_options = tar_longopts;
 #endif
 #if ENABLE_DESKTOP
+        /* Lie to buildroot when it starts asking stupid questions. */
+        if (argv[1] && strcmp(argv[1], "--version") == 0) {
+                // Output of 'tar --version' examples:
+                // tar (GNU tar) 1.15.1
+                // tar (GNU tar) 1.25
+                // bsdtar 2.8.3 - libarchive 2.8.3
+                puts("tar (busybox) " BB_VER);
+                return 0;
+        }
        if (argv[1] && argv[1][0] != '-') {
                /* Compat:
                 * 1st argument without dash handles options with parameters
@@ -1047,10 +1066,14 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                IF_FEATURE_SEAMLESS_XZ(  "J"   )
                IF_FEATURE_SEAMLESS_Z(   "Z"   )
                IF_FEATURE_TAR_NOPRESERVE_TIME("m")
+                IF_FEATURE_TAR_LONG_OPTIONS("\xf9:") // --strip-components
                , &base_dir // -C dir
                , &tar_filename // -f filename
                IF_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
                IF_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+                , &tar_handle->tar__strip_components // --strip-components
+#endif
                IF_FEATURE_TAR_TO_COMMAND(, &(tar_handle->tar__to_command)) // --to-command
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                , &excludes // --exclude
@@ -1058,11 +1081,49 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                , &verboseFlag // combined count for -t and -v
                , &verboseFlag // combined count for -t and -v
                );
-        //bb_error_msg("opt:%08x", opt);
+#if DBG_OPTION_PARSING
+        bb_error_msg("opt: 0x%08x", opt);
+# define showopt(o) bb_error_msg("opt & %s(%x): %x", #o, o, opt & o);
+        showopt(OPT_TEST            );
+        showopt(OPT_EXTRACT         );
+        showopt(OPT_BASEDIR         );
+        showopt(OPT_TARNAME         );
+        showopt(OPT_2STDOUT         );
+        showopt(OPT_NOPRESERVE_OWNER);
+        showopt(OPT_P               );
+        showopt(OPT_VERBOSE         );
+        showopt(OPT_KEEP_OLD        );
+        showopt(OPT_CREATE          );
+        showopt(OPT_DEREFERENCE     );
+        showopt(OPT_BZIP2           );
+        showopt(OPT_LZMA            );
+        showopt(OPT_INCLUDE_FROM    );
+        showopt(OPT_EXCLUDE_FROM    );
+        showopt(OPT_GZIP            );
+        showopt(OPT_XZ              );
+        showopt(OPT_COMPRESS        );
+        showopt(OPT_NOPRESERVE_TIME );
+        showopt(OPT_STRIP_COMPONENTS);
+        showopt(OPT_NORECURSION     );
+        showopt(OPT_2COMMAND        );
+        showopt(OPT_NUMERIC_OWNER   );
+        showopt(OPT_NOPRESERVE_PERM );
+        showopt(OPT_OVERWRITE       );
+        showopt(OPT_ANY_COMPRESS    );
+        bb_error_msg("base_dir:'%s'", base_dir);
+        bb_error_msg("tar_filename:'%s'", tar_filename);
+        bb_error_msg("verboseFlag:%d", verboseFlag);
+        bb_error_msg("tar_handle->tar__to_command:'%s'", tar_handle->tar__to_command);
+        bb_error_msg("tar_handle->tar__strip_components:%u", tar_handle->tar__strip_components);
+        return 0;
+# undef showopt
+#endif
        argv += optind;
-        if (verboseFlag) tar_handle->action_header = header_verbose_list;
+        if (verboseFlag)
-        if (verboseFlag == 1) tar_handle->action_header = header_list;
+                tar_handle->action_header = header_verbose_list;
+        if (verboseFlag == 1)
+                tar_handle->action_header = header_list;
        if (opt & OPT_EXTRACT)
                tar_handle->action_data = data_extract_all;
diff --git a/configs/android2_defconfig b/configs/android2_defconfig
index 4dfbdb526..1095094fe 100644
--- a/configs/android2_defconfig
+++ b/configs/android2_defconfig
@@ -89,7 +89,6 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
-# CONFIG_FEATURE_SYSTEMD is not set
 # CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
diff --git a/configs/android_defconfig b/configs/android_defconfig
index e35830e7f..082994b6c 100644
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -107,7 +107,6 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
-# CONFIG_FEATURE_SYSTEMD is not set
 # CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index 66c85268f..63fafb468 100644
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -96,7 +96,6 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
-# CONFIG_FEATURE_SYSTEMD is not set
 # CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig
index aa346e34c..2c02be743 100644
--- a/configs/cygwin_defconfig
+++ b/configs/cygwin_defconfig
@@ -89,7 +89,6 @@ CONFIG_PREFIX="./_install"
 #
 # Busybox Library Tuning
 #
-# CONFIG_FEATURE_SYSTEMD is not set
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
diff --git a/coreutils/Config.src b/coreutils/Config.src
index 21b97d382..619c2efe8 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -543,21 +543,6 @@ config FEATURE_SPLIT_FANCY
          Supports additional suffixes 'b' for 512 bytes,
          'g' for 1GiB for the -b option.
-config STAT
-        bool "stat"
-        default y
-        help
-          display file or filesystem status.
-config FEATURE_STAT_FORMAT
-        bool "Enable custom formats (-c)"
-        default y
-        depends on STAT
-        help
-          Without this, stat will not support the '-c format' option where
-          users can pass a custom format string for output. This adds about
-          7k to a nonstatic build on amd64.
 config STTY
        bool "stty"
        default y
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 14c8beaff..c48498858 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -1105,7 +1105,7 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_AUTOWIDTH
        /* obtain the terminal width */
-        get_terminal_width_height(STDIN_FILENO, &G_terminal_width, NULL);
+        G_terminal_width = get_terminal_width(STDIN_FILENO);
        /* go one less... */
        G_terminal_width--;
 #endif
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 36f02543b..07d903388 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -106,7 +106,9 @@ static struct sort_key {
 static char *get_key(char *str, struct sort_key *key, int flags)
 {
-        int start = 0, end = 0, len, j;
+        int start = start; /* for compiler */
+        int end;
+        int len, j;
        unsigned i;
        /* Special case whole string, so we don't have to make a copy */
@@ -123,12 +125,15 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                        end = len;
                /* Loop through fields */
                else {
+                        unsigned char ch = 0;
                        end = 0;
                        for (i = 1; i < key->range[2*j] + j; i++) {
                                if (key_separator) {
                                        /* Skip body of key and separator */
-                                        while (str[end]) {
+                                        while ((ch = str[end]) != '\0') {
-                                                if (str[end++] == key_separator)
+                                                        end++;
+                                                if (ch == key_separator)
                                                        break;
                                        }
                                } else {
@@ -136,7 +141,7 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                                        while (isspace(str[end]))
                                                end++;
                                        /* Skip body of key */
-                                        while (str[end]) {
+                                        while (str[end] != '\0') {
                                                if (isspace(str[end]))
                                                        break;
                                                end++;
@@ -144,23 +149,29 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                                }
                        }
                        /* Remove last delim: "abc:def:" => "abc:def" */
-                        if (key_separator && j && end != 0)
+                        if (j && ch) {
+                                //if (str[end-1] != key_separator)
+                                //  bb_error_msg(_and_die("BUG! "
+                                //  "str[start:%d,end:%d]:'%.*s'",
+                                //  start, end, (int)(end-start), &str[start]);
                                end--;
+                        }
                }
                if (!j) start = end;
        }
        /* Strip leading whitespace if necessary */
-//XXX: skip_whitespace()
        if (flags & FLAG_b)
+                /* not using skip_whitespace() for speed */
                while (isspace(str[start])) start++;
        /* Strip trailing whitespace if necessary */
        if (flags & FLAG_bb)
                while (end > start && isspace(str[end-1])) end--;
-        /* Handle offsets on start and end */
+        /* -kSTART,N.ENDCHAR: honor ENDCHAR (1-based) */
        if (key->range[3]) {
-                end += key->range[3] - 1;
+                end = key->range[3];
                if (end > len) end = len;
        }
+        /* -kN.STARTCHAR[,...]: honor STARTCHAR (1-based) */
        if (key->range[1]) {
                start += key->range[1] - 1;
                if (start > len) start = len;
@@ -281,7 +292,7 @@ static int compare_keys(const void *xarg, const void *yarg)
                        else if (!yy)
                                retval = 1;
                        else
-                                retval = (dx == thyme.tm_mon) ? 0 : dx - thyme.tm_mon;
+                                retval = dx - thyme.tm_mon;
                        break;
                }
                /* Full floating point version of -n */
@@ -307,8 +318,8 @@ static int compare_keys(const void *xarg, const void *yarg)
        /* Perform fallback sort if necessary */
        if (!retval && !(option_mask32 & FLAG_s)) {
-                retval = strcmp(*(char **)xarg, *(char **)yarg);
                flags = option_mask32;
+                retval = strcmp(*(char **)xarg, *(char **)yarg);
        }
        if (flags & FLAG_r)
@@ -336,7 +347,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
        char *line, **lines;
        char *str_ignored, *str_o, *str_t;
        llist_t *lst_k = NULL;
-        int i, flag;
+        int i;
        int linecount;
        unsigned opts;
@@ -359,7 +370,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
        /* note: below this point we use option_mask32, not opts,
         * since that reduces register pressure and makes code smaller */
-        /* parse sort key */
+        /* Parse sort key */
        while (lst_k) {
                enum {
                        FLAG_allowed_for_k =
@@ -386,17 +397,18 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
                                key->range[2*i+1] = str2u(&str_k);
                        }
                        while (*str_k) {
-                                const char *temp2;
+                                int flag;
+                                const char *idx;
                                if (*str_k == ',' && !i++) {
                                        str_k++;
                                        break;
                                } /* no else needed: fall through to syntax error
                                        because comma isn't in OPT_STR */
-                                temp2 = strchr(OPT_STR, *str_k);
+                                idx = strchr(OPT_STR, *str_k);
-                                if (!temp2)
+                                if (!idx)
                                        bb_error_msg_and_die("unknown key option");
-                                flag = 1 << (temp2 - OPT_STR);
+                                flag = 1 << (idx - OPT_STR);
                                if (flag & ~FLAG_allowed_for_k)
                                        bb_error_msg_and_die("unknown sort type");
                                /* b after ',' means strip _trailing_ space */
@@ -430,10 +442,10 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
        } while (*++argv);
 #if ENABLE_FEATURE_SORT_BIG
-        /* if no key, perform alphabetic sort */
+        /* If no key, perform alphabetic sort */
        if (!key_list)
                add_key()->range[0] = 1;
-        /* handle -c */
+        /* Handle -c */
        if (option_mask32 & FLAG_c) {
                int j = (option_mask32 & FLAG_u) ? -1 : 0;
                for (i = 1; i < linecount; i++) {
@@ -447,20 +459,21 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 #endif
        /* Perform the actual sort */
        qsort(lines, linecount, sizeof(lines[0]), compare_keys);
-        /* handle -u */
+        /* Handle -u */
        if (option_mask32 & FLAG_u) {
-                flag = 0;
+                int j = 0;
                /* coreutils 6.3 drop lines for which only key is the same */
                /* -- disabling last-resort compare... */
                option_mask32 |= FLAG_s;
                for (i = 1; i < linecount; i++) {
-                        if (compare_keys(&lines[flag], &lines[i]) == 0)
+                        if (compare_keys(&lines[j], &lines[i]) == 0)
                                free(lines[i]);
                        else
-                                lines[++flag] = lines[i];
+                                lines[++j] = lines[i];
                }
                if (linecount)
-                        linecount = flag+1;
+                        linecount = j+1;
        }
        /* Print it */
@@ -469,9 +482,11 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
        if (option_mask32 & FLAG_o)
                xmove_fd(xopen(str_o, O_WRONLY|O_CREAT|O_TRUNC), STDOUT_FILENO);
 #endif
-        flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
+        {
-        for (i = 0; i < linecount; i++)
+                int ch = (option_mask32 & FLAG_z) ? '\0' : '\n';
-                printf("%s%c", lines[i], flag);
+                for (i = 0; i < linecount; i++)
+                        printf("%s%c", lines[i], ch);
+        }
        fflush_stdout_and_exit(EXIT_SUCCESS);
 }
diff --git a/coreutils/stat.c b/coreutils/stat.c
index f7fd227bb..1a490fef7 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -12,54 +12,83 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
+//config:config STAT
+//config:       bool "stat"
+//config:       default y
+//config:       help
+//config:         display file or filesystem status.
+//config:
+//config:config FEATURE_STAT_FORMAT
+//config:       bool "Enable custom formats (-c)"
+//config:       default y
+//config:       depends on STAT
+//config:       help
+//config:         Without this, stat will not support the '-c format' option where
+//config:         users can pass a custom format string for output. This adds about
+//config:         7k to a nonstatic build on amd64.
+//config:
+//config:config FEATURE_STAT_FILESYSTEM
+//config:       bool "Enable display of filesystem status (-f)"
+//config:       default y
+//config:       depends on STAT
+//config:       select PLATFORM_LINUX # statfs()
+//config:       help
+//config:         Without this, stat will not support the '-f' option to display
+//config:         information about filesystem status.
 //usage:#define stat_trivial_usage
 //usage:       "[OPTIONS] FILE..."
 //usage:#define stat_full_usage "\n\n"
-//usage:       "Display file (default) or filesystem status\n"
+//usage:       "Display file"
+//usage:            IF_FEATURE_STAT_FILESYSTEM(" (default) or filesystem")
+//usage:            " status\n"
 //usage:        IF_FEATURE_STAT_FORMAT(
-//usage:     "\n        -c fmt  Use the specified format"
+//usage:     "\n        -c FMT  Use the specified format"
 //usage:        )
+//usage:        IF_FEATURE_STAT_FILESYSTEM(
 //usage:     "\n        -f      Display filesystem status"
+//usage:        )
 //usage:     "\n        -L      Follow links"
-//usage:     "\n        -t      Display info in terse form"
+//usage:     "\n        -t      Terse display"
 //usage:        IF_SELINUX(
 //usage:     "\n        -Z      Print security context"
 //usage:        )
 //usage:        IF_FEATURE_STAT_FORMAT(
-//usage:       "\n\nValid format sequences for files:\n"
+//usage:       "\n\nFMT sequences"IF_FEATURE_STAT_FILESYSTEM(" for files")":\n"
 //usage:       " %a     Access rights in octal\n"
 //usage:       " %A     Access rights in human readable form\n"
 //usage:       " %b     Number of blocks allocated (see %B)\n"
-//usage:       " %B     The size in bytes of each block reported by %b\n"
+//usage:       " %B     Size in bytes of each block reported by %b\n"
 //usage:       " %d     Device number in decimal\n"
 //usage:       " %D     Device number in hex\n"
 //usage:       " %f     Raw mode in hex\n"
 //usage:       " %F     File type\n"
-//usage:       " %g     Group ID of owner\n"
+//usage:       " %g     Group ID\n"
-//usage:       " %G     Group name of owner\n"
+//usage:       " %G     Group name\n"
 //usage:       " %h     Number of hard links\n"
 //usage:       " %i     Inode number\n"
 //usage:       " %n     File name\n"
 //usage:       " %N     File name, with -> TARGET if symlink\n"
 //usage:       " %o     I/O block size\n"
-//usage:       " %s     Total size, in bytes\n"
+//usage:       " %s     Total size in bytes\n"
 //usage:       " %t     Major device type in hex\n"
 //usage:       " %T     Minor device type in hex\n"
-//usage:       " %u     User ID of owner\n"
+//usage:       " %u     User ID\n"
-//usage:       " %U     User name of owner\n"
+//usage:       " %U     User name\n"
 //usage:       " %x     Time of last access\n"
 //usage:       " %X     Time of last access as seconds since Epoch\n"
 //usage:       " %y     Time of last modification\n"
 //usage:       " %Y     Time of last modification as seconds since Epoch\n"
 //usage:       " %z     Time of last change\n"
 //usage:       " %Z     Time of last change as seconds since Epoch\n"
-//usage:       "\nValid format sequences for file systems:\n"
+//usage:        IF_FEATURE_STAT_FILESYSTEM(
+//usage:       "\nFMT sequences for file systems:\n"
 //usage:       " %a     Free blocks available to non-superuser\n"
-//usage:       " %b     Total data blocks in file system\n"
+//usage:       " %b     Total data blocks\n"
-//usage:       " %c     Total file nodes in file system\n"
+//usage:       " %c     Total file nodes\n"
-//usage:       " %d     Free file nodes in file system\n"
+//usage:       " %d     Free file nodes\n"
-//usage:       " %f     Free blocks in file system\n"
+//usage:       " %f     Free blocks\n"
 //usage:        IF_SELINUX(
 //usage:       " %C     Security context in selinux\n"
 //usage:        )
@@ -71,13 +100,16 @@
 //usage:       " %t     Type in hex\n"
 //usage:       " %T     Type in human readable form"
 //usage:        )
+//usage:        )
 #include "libbb.h"
-#define OPT_FILESYS     (1 << 0)
+enum {
-#define OPT_TERSE       (1 << 1)
+        OPT_TERSE       = (1 << 0),
-#define OPT_DEREFERENCE (1 << 2)
+        OPT_DEREFERENCE = (1 << 1),
-#define OPT_SELINUX     (1 << 3)
+        OPT_FILESYS     = (1 << 2) * ENABLE_FEATURE_STAT_FILESYSTEM,
+        OPT_SELINUX     = (1 << (2+ENABLE_FEATURE_STAT_FILESYSTEM)) * ENABLE_SELINUX,
+};
 #if ENABLE_FEATURE_STAT_FORMAT
 typedef bool (*statfunc_ptr)(const char *, const char *);
@@ -132,6 +164,7 @@ static const char *human_time(time_t t)
 #undef buf
 }
+#if ENABLE_FEATURE_STAT_FILESYSTEM
 /* Return the type of the specified file system.
 * Some systems have statfvs.f_basetype[FSTYPSZ]. (AIX, HP-UX, and Solaris)
 * Others have statfs.f_fstypename[MFSNAMELEN]. (NetBSD 1.5.2)
@@ -202,6 +235,7 @@ static unsigned long long get_f_fsid(const struct statfs *statfsbuf)
        while (--sz > 0);
        return r;
 }
+#endif  /* FEATURE_STAT_FILESYSTEM */
 #if ENABLE_FEATURE_STAT_FORMAT
 static void strcatc(char *str, char c)
@@ -217,6 +251,7 @@ static void printfs(char *pformat, const char *msg)
        printf(pformat, msg);
 }
+#if ENABLE_FEATURE_STAT_FILESYSTEM
 /* print statfs info */
 static void FAST_FUNC print_statfs(char *pformat, const char m,
                const char *const filename, const void *data
@@ -263,6 +298,7 @@ static void FAST_FUNC print_statfs(char *pformat, const char m,
                printf(pformat, m);
        }
 }
+#endif
 /* print stat info */
 static void FAST_FUNC print_stat(char *pformat, const char m,
@@ -423,6 +459,7 @@ static void print_it(const char *masterformat,
 }
 #endif  /* FEATURE_STAT_FORMAT */
+#if ENABLE_FEATURE_STAT_FILESYSTEM
 /* Stat the file system and print what we find.  */
 #if !ENABLE_FEATURE_STAT_FORMAT
 #define do_statfs(filename, format) do_statfs(filename)
@@ -538,6 +575,7 @@ static bool do_statfs(const char *filename, const char *format)
 #endif  /* FEATURE_STAT_FORMAT */
        return 1;
 }
+#endif  /* FEATURE_STAT_FILESYSTEM */
 /* stat the file and print what we find */
 #if !ENABLE_FEATURE_STAT_FORMAT
@@ -721,12 +759,15 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
        statfunc_ptr statfunc = do_stat;
        opt_complementary = "-1"; /* min one arg */
-        opts = getopt32(argv, "ftL"
+        opts = getopt32(argv, "tL"
+                IF_FEATURE_STAT_FILESYSTEM("f")
                IF_SELINUX("Z")
                IF_FEATURE_STAT_FORMAT("c:", &format)
        );
+#if ENABLE_FEATURE_STAT_FILESYSTEM
        if (opts & OPT_FILESYS) /* -f */
                statfunc = do_statfs;
+#endif
 #if ENABLE_SELINUX
        if (opts & OPT_SELINUX) {
                selinux_or_die();
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 378a848e7..b63b0b91a 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1403,7 +1403,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
                perror_on_device_and_die("%s");
        if (stty_state & (STTY_verbose_output | STTY_recoverable_output | STTY_noargs)) {
-                get_terminal_width_height(STDOUT_FILENO, &G.max_col, NULL);
+                G.max_col = get_terminal_width(STDOUT_FILENO);
                output_func(&mode, display_all);
                return EXIT_SUCCESS;
        }
diff --git a/coreutils/tr.c b/coreutils/tr.c
index e67948a36..2f49d5a86 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -91,7 +91,6 @@ static void map(char *pvector,
 *   Character classes, e.g. [:upper:] ==> A...Z
 *   Equiv classess, e.g. [=A=] ==> A   (hmmmmmmm?)
 * not supported:
- *   \ooo-\ooo - octal ranges
 *   [x*N] - repeat char x N times
 *   [x*] - repeat char x until it fills STRING2:
 * # echo qwe123 | /usr/bin/tr 123456789 '[d]'
@@ -99,7 +98,7 @@ static void map(char *pvector,
 * # echo qwe123 | /usr/bin/tr 123456789 '[d*]'
 * qweddd
 */
-static unsigned expand(const char *arg, char **buffer_p)
+static unsigned expand(char *arg, char **buffer_p)
 {
        char *buffer = *buffer_p;
        unsigned pos = 0;
@@ -113,9 +112,17 @@ static unsigned expand(const char *arg, char **buffer_p)
                        *buffer_p = buffer = xrealloc(buffer, size);
                }
                if (*arg == '\\') {
+                        const char *z;
                        arg++;
-                        buffer[pos++] = bb_process_escape_sequence(&arg);
+                        z = arg;
-                        continue;
+                        ac = bb_process_escape_sequence(&z);
+                        arg = (char *)z;
+                        arg--;
+                        *arg = ac;
+                        /*
+                         * fall through, there may be a range.
+                         * If not, current char will be treated anyway.
+                         */
                }
                if (arg[1] == '-') { /* "0-9..." */
                        ac = arg[2];
@@ -124,9 +131,15 @@ static unsigned expand(const char *arg, char **buffer_p)
                                continue; /* next iter will copy '-' and stop */
                        }
                        i = (unsigned char) *arg;
+                        arg += 3; /* skip 0-9 or 0-\ */
+                        if (ac == '\\') {
+                                const char *z;
+                                z = arg;
+                                ac = bb_process_escape_sequence(&z);
+                                arg = (char *)z;
+                        }
                        while (i <= ac) /* ok: i is unsigned _int_ */
                                buffer[pos++] = i++;
-                        arg += 3; /* skip 0-9 */
                        continue;
                }
                if ((ENABLE_FEATURE_TR_CLASSES || ENABLE_FEATURE_TR_EQUIV)
diff --git a/examples/var_service/README b/examples/var_service/README
index 9ad1b2581..d096ad0b9 100644
--- a/examples/var_service/README
+++ b/examples/var_service/README
@@ -36,10 +36,10 @@ service accordingly. In effect, it allows you to unplug/plug-to-different-networ
 and have your IP properly re-negotiated at once.
 var_service/dhcp_if_pinger -
-Uses var_service/dhcp_if's data (/var/service/dhcp_if/dhcp_if.out file)
+Uses var_service/dhcp_if's data to determine router IP. Pings it.
-to determine router IP. Pings it. If ping fails, restarts /var/service/dhcp_if
+If ping fails, restarts /var/service/dhcp_if service.
-service. Basically, an example of watchdog service for networks
+Basically, an example of watchdog service for networks which are not reliable
-which are not reliable and need babysitting.
+and need babysitting.
 var_service/fw -
 A *one-shot* service which reconfigures network based on current known state
diff --git a/examples/var_service/dhcp_if/convert2ntpconf b/examples/var_service/dhcp_if/convert2ntpconf
index debf1ebfe..e9d829308 100755
--- a/examples/var_service/dhcp_if/convert2ntpconf
+++ b/examples/var_service/dhcp_if/convert2ntpconf
@@ -29,6 +29,6 @@ test "$ip" || exit 1
 {
 for n in $ntpsrv; do
        echo "let cfg=cfg+1"
-        echo "ntpip[\$cfg]='$n'";
+        echo "ntpip[\$cfg]='$n'"
 done
 } >"$1"
diff --git a/examples/var_service/dhcp_if/dhcp_handler b/examples/var_service/dhcp_if/dhcp_handler
index 927e02a17..3d2a5cb79 100755
--- a/examples/var_service/dhcp_if/dhcp_handler
+++ b/examples/var_service/dhcp_if/dhcp_handler
@@ -36,7 +36,7 @@ service=${PWD##*/}
 file_ipconf="$service.ipconf"
 file_ntpconf="$service.ntpconf"
 dir_ipconf="/var/run/service/fw"
-dir_ntpconf="/var/run/service/ntp"
+dir_ntpconf="/var/run/service/ntpd"
 exec >/dev/null
 #exec >>"$0.out"  #debug
@@ -47,7 +47,7 @@ echo "`date`: Params: $*"
 if test x"$1" != x"bound" && test x"$1" != x"renew" ; then
        # Reconfigure network with this interface disabled
        echo "Deconfiguring"
-        rm "$service.out"
+        rm "env.out"
        rm "$file_ipconf"
        rm "$file_ntpconf"
        rm "$dir_ipconf/$file_ipconf"
@@ -57,7 +57,8 @@ if test x"$1" != x"bound" && test x"$1" != x"renew" ; then
 fi
 # Bound: we've got the lease
-#env >"$service.out"  # debug
+# Record information for e.g. dhcp_$IF_pinger service
+env >"env.out"
 ./convert2ipconf "$file_ipconf"
 # Reconfigure routing and firewall if needed
@@ -69,7 +70,7 @@ if test $? != 0; then
        sv u /var/service/fw
 fi
-if test -d /var/service/ntp; then
+if test -d /var/service/ntpd; then
        ./convert2ntpconf "$file_ntpconf"
        # Reconfigure ntp server addresses if needed
        diff --brief "$file_ntpconf" "$dir_ntpconf/$file_ntpconf" >/dev/null 2>&1
@@ -77,7 +78,7 @@ if test -d /var/service/ntp; then
                echo "Reconfiguring ntp"
                mkdir -p "$dir_ntpconf" 2>/dev/null
                cp "$file_ntpconf" "$dir_ntpconf/$file_ntpconf"
-                sv t /var/service/ntp
+                sv t /var/service/ntpd
-                sv u /var/service/ntp
+                sv u /var/service/ntpd
        fi
 fi
diff --git a/examples/var_service/dhcp_if/finish b/examples/var_service/dhcp_if/finish
new file mode 100755
index 000000000..5e7667a2d
--- /dev/null
+++ b/examples/var_service/dhcp_if/finish
@@ -0,0 +1,17 @@
+#!/bin/sh
+# executed when service is taken down ("sv d .")
+service=${PWD##*/}
+file_ipconf="$service.ipconf"
+file_ntpconf="$service.ntpconf"
+dir_ipconf="/var/run/service/fw"
+dir_ntpconf="/var/run/service/ntpd"
+# Reconfigure network with this interface disabled
+echo "Finish: deconfiguring"
+rm "env.out"
+rm "$file_ipconf"
+rm "$file_ntpconf"
+rm "$dir_ipconf/$file_ipconf"
+rm "$dir_ntpconf/$file_ntpconf"
+sv u /var/service/fw
diff --git a/examples/var_service/dhcp_if/log/run b/examples/var_service/dhcp_if/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/dhcp_if/log/run
+++ b/examples/var_service/dhcp_if/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/dhcp_if_pinger/run b/examples/var_service/dhcp_if_pinger/run
index 1868510d1..e0e87a16a 100755
--- a/examples/var_service/dhcp_if_pinger/run
+++ b/examples/var_service/dhcp_if_pinger/run
@@ -21,9 +21,9 @@ if test -f "$0.log"; then
        mv "$0.log.new" "$0.log"
 fi
-test -f "/var/service/dhcp_$if/dhcp_$if.out" || exec env - sleep "$ping_time"
+test -f "/var/service/dhcp_$if/env.out" || exec env - sleep "$ping_time"
-. "/var/service/dhcp_$if/dhcp_$if.out"
+. "/var/service/dhcp_$if/env.out"
 test x"$router" != x"" || exec env - sleep "$ping_time"
 #msg "Pinging $router"
diff --git a/examples/var_service/ftpd/log/run b/examples/var_service/ftpd/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/ftpd/log/run
+++ b/examples/var_service/ftpd/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/fw/run b/examples/var_service/fw/run
index 396b678ab..81c7f2e7c 100755
--- a/examples/var_service/fw/run
+++ b/examples/var_service/fw/run
@@ -62,7 +62,7 @@ umask 077
 # Make sure rundir/ exists
 mkdir -p "$rundir" 2>/dev/null
-chown -R "$user:" "$rundir"
+chown -R "$user": "$rundir"
 chmod -R a=rX "$rundir"
 rm -rf rundir 2>/dev/null
 ln -s "$rundir" rundir
diff --git a/examples/var_service/httpd/log/run b/examples/var_service/httpd/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/httpd/log/run
+++ b/examples/var_service/httpd/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/ifplugd_if/log/run b/examples/var_service/ifplugd_if/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/ifplugd_if/log/run
+++ b/examples/var_service/ifplugd_if/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/ifplugd_if/run b/examples/var_service/ifplugd_if/run
index 2781cf9f9..c4f766e88 100755
--- a/examples/var_service/ifplugd_if/run
+++ b/examples/var_service/ifplugd_if/run
@@ -8,6 +8,9 @@ pwd="$PWD"
 if="${PWD##*/ifplugd_}"
+echo "* Upping iface $if"
+ip link set dev "$if" up
 echo "* Starting ifplugd on $if [$$]"
 exec \
 env - PATH="$PATH" \
diff --git a/examples/var_service/inetd/log/run b/examples/var_service/inetd/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/inetd/log/run
+++ b/examples/var_service/inetd/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/ntpd/log/run b/examples/var_service/ntpd/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/ntpd/log/run
+++ b/examples/var_service/ntpd/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/ntpd/run b/examples/var_service/ntpd/run
index 581d231a3..6f2a68188 100755
--- a/examples/var_service/ntpd/run
+++ b/examples/var_service/ntpd/run
@@ -15,7 +15,7 @@ default_p_opt="-p 0.$pool -p 1.$pool -p 2.$pool -p 3.$pool"
 # Make sure rundir/ exists
 mkdir -p "$rundir" 2>/dev/null
-chown -R "$user:" "$rundir"
+chown -R "$user": "$rundir"
 chmod -R a=rX "$rundir"
 rm -rf rundir 2>/dev/null
 ln -s "$rundir" rundir
diff --git a/examples/var_service/tftpd/log/run b/examples/var_service/tftpd/log/run
index 560d1b19f..69d74b73f 100755
--- a/examples/var_service/tftpd/log/run
+++ b/examples/var_service/tftpd/log/run
@@ -6,7 +6,7 @@ logdir="/var/log/service/`(cd ..;basename $PWD)`"
 mkdir -p "$logdir" 2>/dev/null
 chown -R "$user": "$logdir"
 chmod -R go-rwxst,u+rwX "$logdir"
-rm logdir
+rm -rf logdir
 ln -s "$logdir" logdir
 # make this dir accessible to logger
diff --git a/examples/var_service/zcip_if/README b/examples/var_service/zcip_if/README
new file mode 100644
index 000000000..4ddccb22d
--- /dev/null
+++ b/examples/var_service/zcip_if/README
@@ -0,0 +1,5 @@
+The real README file is one directory up.
+This directory's run script can have useful comments.
+If it doesn't but you feel it should, please send a patch
+to busybox's mailing list.
diff --git a/examples/var_service/zcip_if/convert2ipconf b/examples/var_service/zcip_if/convert2ipconf
new file mode 100755
index 000000000..c858723fb
--- /dev/null
+++ b/examples/var_service/zcip_if/convert2ipconf
@@ -0,0 +1,24 @@
+#!/bin/sh
+# convert:
+#interface=eth1
+#ip=169.254.x.y
+# into:
+#let cfg=cfg+1
+#if[$cfg]=...; ip[$cfg]=...; ipmask[$cfg]=.../...; gw[$cfg]=...; net[$cfg]=... dns[$cfg]=...
+exec >/dev/null
+#exec >"$0.out"  # debug
+exec 2>&1
+test "$interface" || exit 1
+test "$ip" || exit 1
+{
+echo "let cfg=cfg+1"
+test "$interface"       && echo "if[\$cfg]='$interface'"
+test "$ip"              && echo "ip[\$cfg]='$ip'"
+test "$ip"              && echo "ipmask[\$cfg]='$ip/16'"
+} >"$1"
diff --git a/examples/var_service/zcip_if/finish b/examples/var_service/zcip_if/finish
new file mode 100755
index 000000000..95995cf5f
--- /dev/null
+++ b/examples/var_service/zcip_if/finish
@@ -0,0 +1,13 @@
+#!/bin/sh
+# executed when service is taken down ("sv d .")
+service=${PWD##*/}
+file_ipconf="$service.ipconf"
+dir_ipconf="/var/run/service/fw"
+# Reconfigure network with this interface disabled
+echo "Finish: deconfiguring"
+rm "env.out"
+rm "$file_ipconf"
+rm "$dir_ipconf/$file_ipconf"
+sv u /var/service/fw
diff --git a/examples/var_service/zcip_if/log/run b/examples/var_service/zcip_if/log/run
new file mode 100755
index 000000000..69d74b73f
--- /dev/null
+++ b/examples/var_service/zcip_if/log/run
@@ -0,0 +1,21 @@
+#!/bin/sh
+user=logger
+logdir="/var/log/service/`(cd ..;basename $PWD)`"
+mkdir -p "$logdir" 2>/dev/null
+chown -R "$user": "$logdir"
+chmod -R go-rwxst,u+rwX "$logdir"
+rm -rf logdir
+ln -s "$logdir" logdir
+# make this dir accessible to logger
+chmod a+rX .
+exec >/dev/null
+exec 2>&1
+exec \
+env - PATH="$PATH" \
+softlimit \
+setuidgid "$user" \
+svlogd -tt "$logdir"
diff --git a/examples/var_service/zcip_if/p_log b/examples/var_service/zcip_if/p_log
new file mode 100755
index 000000000..a2521be05
--- /dev/null
+++ b/examples/var_service/zcip_if/p_log
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd log/logdir || exit 1
+cat @* current | $PAGER
diff --git a/examples/var_service/zcip_if/run b/examples/var_service/zcip_if/run
new file mode 100755
index 000000000..94a875465
--- /dev/null
+++ b/examples/var_service/zcip_if/run
@@ -0,0 +1,20 @@
+#!/bin/sh
+exec 2>&1
+exec </dev/null
+pwd="$PWD"
+if="${PWD##*/zcip_}"
+echo "* Upping iface $if"
+ip link set dev "$if" up
+echo "* Starting zcip"
+exec \
+env - PATH="$PATH" \
+softlimit \
+setuidgid root \
+zcip -fvv \
+    "$if" \
+    "$pwd/zcip_handler"
diff --git a/examples/var_service/zcip_if/w_log b/examples/var_service/zcip_if/w_log
new file mode 100755
index 000000000..aa36ef13b
--- /dev/null
+++ b/examples/var_service/zcip_if/w_log
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd log/logdir || exit 1
+watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))'
diff --git a/examples/var_service/zcip_if/zcip_handler b/examples/var_service/zcip_if/zcip_handler
new file mode 100755
index 000000000..3c6ca788b
--- /dev/null
+++ b/examples/var_service/zcip_if/zcip_handler
@@ -0,0 +1,47 @@
+#!/bin/sh
+# executed by zcip
+# parameters: $1 and environment
+# $1 is:
+#
+# init: zcip starts. Environment:
+# interface=eth0
+#
+# config: Address is obtained.
+# interface=eth0
+# ip=169.254.a.b
+#
+# deconfig: Conflict or link went down.
+# interface=eth0
+service=${PWD##*/}
+file_ipconf="$service.ipconf"
+dir_ipconf="/var/run/service/fw"
+exec >/dev/null
+#exec >>"$0.out"  #debug
+exec 2>&1
+echo "`date`: Params: $*"
+if test x"$1" != x"config"; then
+        # Reconfigure network with this interface disabled
+        echo "Deconfiguring"
+        rm "$file_ipconf"
+        rm "$dir_ipconf/$file_ipconf"
+        sv u /var/service/fw
+        exit
+fi
+# "config": we've got the address
+# Record information for e.g. dhcp_$IF_pinger service
+env >"env.out"
+./convert2ipconf "$file_ipconf"
+# Reconfigure routing and firewall if needed
+diff --brief "$file_ipconf" "$dir_ipconf/$file_ipconf" >/dev/null 2>&1
+if test $? != 0; then
+        echo "Reconfiguring fw"
+        mkdir -p "$dir_ipconf" 2>/dev/null
+        cp "$file_ipconf" "$dir_ipconf/$file_ipconf"
+        sv u /var/service/fw
+fi
diff --git a/findutils/xargs.c b/findutils/xargs.c
index dba74ea61..8b7ab7b6a 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -590,6 +590,9 @@ int xargs_main(int argc, char **argv)
                G.argv = argv;
                argc = 0;
                read_args = process_stdin_with_replace;
+                /* Make -I imply -r. GNU findutils seems to do the same: */
+                /* (otherwise "echo -n | xargs -I% echo %" would SEGV) */
+                opt |= OPT_NO_EMPTY;
        } else
 #endif
        {
diff --git a/include/applets.src.h b/include/applets.src.h
index 5b597202e..6e1b02fc3 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -192,8 +192,6 @@ IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killal
 IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP))
 //IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length))
 IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP))
-IF_SETARCH(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
-IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))
 IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, BB_SUID_DROP, ln))
 IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
@@ -274,7 +272,6 @@ IF_SELINUXENABLED(APPLET(selinuxenabled, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_SEQ(APPLET_NOFORK(seq, seq, BB_DIR_USR_BIN, BB_SUID_DROP, seq))
 IF_SESTATUS(APPLET(sestatus, BB_DIR_USR_SBIN, BB_SUID_DROP))
-IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP))
 IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))
 IF_SETENFORCE(APPLET(setenforce, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP))
diff --git a/include/bb_archive.h b/include/bb_archive.h
index e2c8aede4..03f174839 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -87,6 +87,9 @@ typedef struct archive_handle_t {
        off_t offset;
        /* Archiver specific. Can make it a union if it ever gets big */
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+        unsigned tar__strip_components;
+#endif
 #define PAX_NEXT_FILE 0
 #define PAX_GLOBAL    1
 #if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB
diff --git a/include/libbb.h b/include/libbb.h
index de00abe7f..7959884e3 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1347,11 +1347,6 @@ extern void selinux_preserve_fcontext(int fdesc) FAST_FUNC;
 extern void selinux_or_die(void) FAST_FUNC;
-/* systemd support */
-#define SD_LISTEN_FDS_START 3
-int sd_listen_fds(void);
 /* setup_environment:
 * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die
 * if clear_env = 1: cd(pw->pw_dir), clear environment, then set
@@ -1418,6 +1413,7 @@ extern void print_login_prompt(void) FAST_FUNC;
 char *xmalloc_ttyname(int fd) FAST_FUNC RETURNS_MALLOC;
 /* NB: typically you want to pass fd 0, not 1. Think 'applet | grep something' */
 int get_terminal_width_height(int fd, unsigned *width, unsigned *height) FAST_FUNC;
+int get_terminal_width(int fd) FAST_FUNC;
 int tcsetattr_stdin_TCSANOW(const struct termios *tp) FAST_FUNC;
diff --git a/libbb/Config.src b/libbb/Config.src
index 19021fed1..6ba256290 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -16,7 +16,7 @@ config PASSWORD_MINLEN
 config MD5_SMALL
        int "MD5: Trade bytes for speed (0:fast, 3:slow)"
-        default 1
+        default 1  # all "fast or small" options default to small
        range 0 3
        help
          Trade binary size versus speed for the md5sum algorithm.
@@ -30,7 +30,7 @@ config MD5_SMALL
 config SHA3_SMALL
        int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
-        default 1
+        default 1  # all "fast or small" options default to small
        range 0 1
        help
          Trade binary size versus speed for the sha3sum algorithm.
@@ -40,7 +40,7 @@ config SHA3_SMALL
 config FEATURE_FAST_TOP
        bool "Faster /proc scanning code (+100 bytes)"
-        default y
+        default n  # all "fast or small" options default to small
        help
          This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
          but code size is slightly bigger.
@@ -114,7 +114,7 @@ config FEATURE_EDITING_SAVE_ON_EXIT
 config FEATURE_REVERSE_SEARCH
        bool "Reverse history search"
        default y
-        depends on FEATURE_EDITING_SAVEHISTORY
+        depends on FEATURE_EDITING
        help
          Enable readline-like Ctrl-R combination for reverse history search.
          Increases code by about 0.5k.
@@ -208,7 +208,7 @@ config FEATURE_SKIP_ROOTFS
 config MONOTONIC_SYSCALL
        bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
-        default n
+        default y
        select PLATFORM_LINUX
        help
          Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 7da7cad1c..1d6a4b274 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -628,7 +628,7 @@ static int busybox_main(char **argv)
                output_width = 80;
                if (ENABLE_FEATURE_AUTOWIDTH) {
                        /* Obtain the terminal width */
-                        get_terminal_width_height(0, &output_width, NULL);
+                        output_width = get_terminal_width(2);
                }
                dup2(1, 2);
@@ -659,10 +659,10 @@ static int busybox_main(char **argv)
                        )
                        IF_FEATURE_SH_STANDALONE(
                        "\tBusyBox is a multi-call binary that combines many common Unix\n"
-                        "\tutilities into a single executable.  The shell in this version\n"
+                        "\tutilities into a single executable.  The shell in this build\n"
-                        "\thas been configured to prefer built-in utilities to external\n"
+                        "\tis configured to run built-in utilities without $PATH search.\n"
-                        "\tbinaries.  This avoids having to install a link to busybox for\n"
+                        "\tYou don't need to install a link to busybox for each utility.\n"
-                        "\teach function to be invoked.\n"
+                        "\tTo run external program, use full path (/sbin/ip instead of ip).\n"
                        )
                        "\n"
 #if ENABLE_GLOBBING
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 738ed022b..9b6c62299 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -20,16 +20,16 @@
 int FAST_FUNC get_linux_version_code(void)
 {
        struct utsname name;
-        char *s, *t;
+        char *t;
        int i, r;
        uname(&name); /* never fails */
-        s = name.release;
+        t = name.release;
        r = 0;
        for (i = 0; i < 3; i++) {
-                t = strtok(s, ".");
+                t = strtok(t, ".");
                r = r * 256 + (t ? atoi(t) : 0);
-                s = NULL;
+                t = NULL;
        }
        return r;
 }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 5cb40a508..04361b509 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -829,10 +829,12 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
        if (type == FIND_EXE_ONLY) {
                const char *p = applet_names;
-                for (i=0; i < NUM_APPLETS; i++) {
+                i = 0;
+                while (i < NUM_APPLETS) {
                        if (strncmp(pfind, p, pf_len) == 0)
                                add_match(xstrdup(p));
                        p += strlen(p) + 1;
+                        i++;
                }
        }
 #endif
diff --git a/libbb/procps.c b/libbb/procps.c
index 5a4ea59d0..452b50b82 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -589,12 +589,14 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
                                buf[sz] = ' ';
                        sz--;
                }
+                if (base[0] == '-') /* "-sh" (login shell)? */
+                        base++;
                /* If comm differs from argv0, prepend "{comm} ".
                 * It allows to see thread names set by prctl(PR_SET_NAME).
                 */
-                if (base[0] == '-') /* "-sh" (login shell)? */
+                if (!comm)
-                        base++;
+                        return;
                comm_len = strlen(comm);
                /* Why compare up to comm_len, not COMM_LEN-1?
                 * Well, some processes rewrite argv, and use _spaces_ there
@@ -613,7 +615,7 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
                        buf[col - 1] = '\0';
                }
        } else {
-                snprintf(buf, col, "[%s]", comm);
+                snprintf(buf, col, "[%s]", comm ? comm : "?");
        }
 }
diff --git a/libbb/progress.c b/libbb/progress.c
index 372feb0c2..3c2f01667 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -45,13 +45,6 @@ enum {
        STALLTIME = 5
 };
-static unsigned int get_tty2_width(void)
-{
-        unsigned width;
-        get_terminal_width_height(2, &width, NULL);
-        return width;
-}
 void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
 {
 #if ENABLE_UNICODE_SUPPORT
@@ -80,7 +73,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
 {
        uoff_t beg_and_transferred;
        unsigned since_last_update, elapsed;
-        int barlength;
+        int notty;
        int kiloscale;
        //transferred = 1234; /* use for stall detection testing */
@@ -137,18 +130,21 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                }
        }
+        notty = !isatty(STDERR_FILENO);
        if (ENABLE_UNICODE_SUPPORT)
-                fprintf(stderr, "\r%s", p->curfile);
+                fprintf(stderr, "\r%s" + notty, p->curfile);
        else
-                fprintf(stderr, "\r%-20.20s", p->curfile);
+                fprintf(stderr, "\r%-20.20s" + notty, p->curfile);
        beg_and_transferred = beg_size + transferred;
        if (totalsize != 0) {
+                int barlength;
                unsigned ratio = 100 * beg_and_transferred / totalsize;
                fprintf(stderr, "%4u%%", ratio);
-                barlength = get_tty2_width() - 49;
+                barlength = get_terminal_width(2) - 49;
                if (barlength > 0) {
                        /* god bless gcc for variable arrays :) */
                        char buf[barlength + 1];
@@ -204,4 +200,6 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
                hours = eta / 3600;
                fprintf(stderr, "%3u:%02u:%02u ETA", hours, secs / 60, secs % 60);
        }
+        if (notty)
+                fputc('\n', stderr);
 }
diff --git a/libbb/systemd_support.c b/libbb/systemd_support.c
deleted file mode 100644
index 542a3efff..000000000
--- a/libbb/systemd_support.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 Davide Cavalca <davide@geexbox.org>
- *
- * Based on http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c
- * Copyright 2010 Lennart Poettering
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#include "libbb.h"
-//config:config FEATURE_SYSTEMD
-//config:       bool "Enable systemd support"
-//config:       default y
-//config:       help
-//config:         If you plan to use busybox daemons on a system where daemons
-//config:         are controlled by systemd, enable this option.
-//config:         If you don't use systemd, it is still safe to enable it,
-//config:         but the downside is increased code size.
-//kbuild:lib-$(CONFIG_FEATURE_SYSTEMD) += systemd_support.o
-int sd_listen_fds(void)
-{
-        const char *e;
-        int n;
-        int fd;
-        e = getenv("LISTEN_PID");
-        if (!e)
-                return 0;
-        n = xatoi_positive(e);
-        /* Is this for us? */
-        if (getpid() != (pid_t) n)
-                return 0;
-        e = getenv("LISTEN_FDS");
-        if (!e)
-                return 0;
-        n = xatoi_positive(e);
-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++)
-                close_on_exec_on(fd);
-        return n;
-}
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 0c9969640..206edb4a0 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -270,6 +270,12 @@ int FAST_FUNC get_terminal_width_height(int fd, unsigned *width, unsigned *heigh
                *width = wh_helper(win.ws_col, 80, "COLUMNS", &err);
        return err;
 }
+int FAST_FUNC get_terminal_width(int fd)
+{
+        unsigned width;
+        get_terminal_width_height(fd, &width, NULL);
+        return width;
+}
 int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 {
diff --git a/loginutils/login.c b/loginutils/login.c
index f1f04da19..67fe82e86 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -58,7 +58,7 @@
 //usage:#define login_full_usage "\n\n"
 //usage:       "Begin a new session on the system\n"
 //usage:     "\n        -f      Don't authenticate (user already authenticated)"
-//usage:     "\n        -h      Name of the remote host"
+//usage:     "\n        -h HOST Host user came from (for network logins)"
 //usage:     "\n        -p      Preserve environment"
 #include "libbb.h"
diff --git a/miscutils/Config.src b/miscutils/Config.src
index d69abf1a2..06f1c52ba 100644
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -308,23 +308,13 @@ config LAST
        help
          'last' displays a list of the last users that logged into the system.
-choice
-        prompt "Choose last implementation"
-        depends on LAST
-        default FEATURE_LAST_FANCY
-config FEATURE_LAST_SMALL
-        bool "small"
-        help
-          This is a small version of last with just the basic set of
-          features.
 config FEATURE_LAST_FANCY
-        bool "huge"
+        bool "Turn on output of extra information"
+        default y
+        depends on LAST
        help
          'last' displays detailed information about the last users that
          logged into the system (mimics sysvinit last). +900 bytes.
-endchoice
 config HDPARM
        bool "hdparm"
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 77033c258..9557c41db 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -150,7 +150,7 @@ static void fb_open(const char *strfb_device)
        // map the device in memory
        G.addr = mmap(NULL,
-                        G.scr_var.yres * G.scr_fix.line_length,
+                        (G.scr_var.yres_virtual ?: G.scr_var.yres) * G.scr_fix.line_length,
                        PROT_WRITE, MAP_SHARED, fbfd, 0);
        if (G.addr == MAP_FAILED)
                bb_perror_msg_and_die("mmap");
diff --git a/modutils/Config.src b/modutils/Config.src
index 449ac65af..0b11832bc 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -38,9 +38,6 @@ config MODPROBE_SMALL
          - rmmod is an alias to modprobe -r
          - depmod generates modules.dep.bb
-          As of 2008-07, this code is experimental. It is 14kb smaller
-          than "non-small" modutils.
 config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
        bool "Accept module options on modprobe command line"
        default y
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 8e74b6438..aa641ad54 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -5,11 +5,6 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
-//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
 //config:config MODINFO
 //config:       bool "modinfo"
 //config:       default y
@@ -17,26 +12,46 @@
 //config:       help
 //config:         Show information about a Linux Kernel module
+//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
 #include <fnmatch.h>
 #include <sys/utsname.h> /* uname() */
 #include "libbb.h"
 #include "modutils.h"
+static const char *const shortcuts[] = {
-enum {
+        "filename",     // -n
-        OPT_TAGS = (1 << 12) - 1, /* shortcut count */
+        "author",       // -a
-        OPT_F = (1 << 12), /* field name */
+        "description",  // -d
-        OPT_0 = (1 << 13), /* \0 as separator */
+        "license",      // -l
+        "parm",         // -p
+        "version",      // the rest has no shortcut options
+        "alias",
+        "srcversion",
+        "depends",
+        "uts_release",
+        "intree",
+        "vermagic",
+        "firmware",
 };
-struct modinfo_env {
+enum {
-        char *field;
+        OPT_0 = (1 << 0), /* \0 as separator */
-        int tags;
+        OPT_F = (1 << 1), /* field name */
+        /* first bits are for -nadlp options, the rest are for
+         * fields not selectable with "shortcut" options
+         */
+        OPT_n = (1 << 2),
+        OPT_TAGS = ((1 << ARRAY_SIZE(shortcuts)) - 1) << 2,
 };
-static void display(const char *data, const char *pattern, int flag)
+static void display(const char *data, const char *pattern)
 {
-        if (flag) {
+        int flag = option_mask32 >> 1; /* shift out -0 bit */
+        if (flag & (flag-1)) {
+                /* more than one field to show: print "FIELD:" pfx */
                int n = printf("%s:", pattern);
                while (n++ < 16)
                        bb_putchar(' ');
@@ -45,55 +60,45 @@ static void display(const char *data, const char *pattern, int flag)
 }
 static void modinfo(const char *path, const char *version,
-                        const struct modinfo_env *env)
+                        const char *field)
 {
-        static const char *const shortcuts[] = {
-                "filename",
-                "license",
-                "author",
-                "description",
-                "version",
-                "alias",
-                "srcversion",
-                "depends",
-                "uts_release",
-                "vermagic",
-                "parm",
-                "firmware",
-        };
        size_t len;
        int j;
        char *ptr, *the_module;
-        const char *field = env->field;
+        char *allocated;
-        int tags = env->tags;
+        int tags = option_mask32;
-        if (tags & 1) { /* filename */
-                display(path, shortcuts[0], 1 != tags);
-        }
+        allocated = NULL;
        len = MAXINT(ssize_t);
        the_module = xmalloc_open_zipped_read_close(path, &len);
        if (!the_module) {
                if (path[0] == '/')
                        return;
                /* Newer depmod puts relative paths in modules.dep */
-                path = xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, version, path);
+                path = allocated = xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, version, path);
                the_module = xmalloc_open_zipped_read_close(path, &len);
-                free((char*)path);
+                if (!the_module) {
-                if (!the_module)
+                        bb_error_msg("module '%s' not found", path);
-                        return;
+                        goto ret;
+                }
        }
-        if (field)
+        for (j = 1; (1<<j) & (OPT_TAGS|OPT_F); j++) {
-                tags |= OPT_F;
-        for (j = 1; (1<<j) & (OPT_TAGS + OPT_F); j++) {
                const char *pattern;
                if (!((1<<j) & tags))
                        continue;
                pattern = field;
                if ((1<<j) & OPT_TAGS)
-                        pattern = shortcuts[j];
+                        pattern = shortcuts[j-2];
+                if (strcmp(pattern, shortcuts[0]) == 0) {
+                        /* "-n" or "-F filename" */
+                        display(path, shortcuts[0]);
+                        continue;
+                }
                ptr = the_module;
                while (1) {
                        char *after_pattern;
@@ -106,7 +111,7 @@ static void modinfo(const char *path, const char *version,
                                /* field prefixes are 0x80 or 0x00 */
                                if ((ptr[-1] & 0x7F) == 0x00) {
                                        ptr = after_pattern + 1;
-                                        display(ptr, pattern, (1<<j) != tags);
+                                        display(ptr, pattern);
                                        ptr += strlen(ptr);
                                }
                        }
@@ -114,15 +119,18 @@ static void modinfo(const char *path, const char *version,
                }
        }
        free(the_module);
+ ret:
+        free(allocated);
 }
 //usage:#define modinfo_trivial_usage
-//usage:       "[-adlp0] [-F keyword] MODULE"
+//usage:       "[-adlpn0] [-F keyword] MODULE"
 //usage:#define modinfo_full_usage "\n\n"
 //usage:       "        -a              Shortcut for '-F author'"
 //usage:     "\n        -d              Shortcut for '-F description'"
 //usage:     "\n        -l              Shortcut for '-F license'"
 //usage:     "\n        -p              Shortcut for '-F parm'"
+////usage:     "\n      -n              Shortcut for '-F filename'"
 //usage:     "\n        -F keyword      Keyword to look for"
 //usage:     "\n        -0              Separate output with NULs"
 //usage:#define modinfo_example_usage
@@ -131,7 +139,7 @@ static void modinfo(const char *path, const char *version,
 int modinfo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modinfo_main(int argc UNUSED_PARAM, char **argv)
 {
-        struct modinfo_env env;
+        const char *field;
        char name[MODULE_NAME_LEN];
        struct utsname uts;
        parser_t *parser;
@@ -139,10 +147,12 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
        unsigned opts;
        unsigned i;
-        env.field = NULL;
+        field = NULL;
        opt_complementary = "-1"; /* minimum one param */
-        opts = getopt32(argv, "nladvAsDumpF:0", &env.field);
+        opts = getopt32(argv, "0F:nadlp", &field);
-        env.tags = opts & OPT_TAGS ? opts & OPT_TAGS : OPT_TAGS;
+        /* If no field selected, show all */
+        if (!(opts & (OPT_TAGS|OPT_F)))
+                option_mask32 |= OPT_TAGS;
        argv += optind;
        uname(&uts);
@@ -159,7 +169,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
                filename2modname(bb_basename(tokens[0]), name);
                for (i = 0; argv[i]; i++) {
                        if (fnmatch(argv[i], name, 0) == 0) {
-                                modinfo(tokens[0], uts.release, &env);
+                                modinfo(tokens[0], uts.release, field);
                                argv[i] = (char *) "";
                        }
                }
@@ -169,7 +179,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
        for (i = 0; argv[i]; i++) {
                if (argv[i][0]) {
-                        modinfo(argv[i], uts.release, &env);
+                        modinfo(argv[i], uts.release, field);
                }
        }
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 314a7a1cb..05bf02cf8 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -461,9 +461,8 @@ static int do_modprobe(struct module_entry *m)
                                rc = bb_delete_module(m2->modname, O_EXCL);
                                if (rc) {
                                        if (first) {
-                                                bb_error_msg("can't unload module %s: %s",
+                                                bb_perror_msg("can't unload module '%s'",
-                                                        humanly_readable_name(m2),
+                                                        humanly_readable_name(m2));
-                                                        moderror(rc));
                                                break;
                                        }
                                } else {
@@ -622,7 +621,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         * autoclean will be removed".
                         */
                        if (bb_delete_module(NULL, O_NONBLOCK | O_EXCL) != 0)
-                                bb_perror_msg_and_die("rmmod");
+                                bb_perror_nomsg_and_die();
                }
                return EXIT_SUCCESS;
        }
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 84300d931..ef4134af5 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -190,6 +190,11 @@ int FAST_FUNC bb_delete_module(const char *module, unsigned int flags)
        return errno;
 }
+/* Note: not suitable for delete_module() errnos.
+ * For them, probably only EWOULDBLOCK needs explaining:
+ * "Other modules depend on us". So far we don't do such
+ * translation and don't use moderror() for removal errors.
+ */
 const char* FAST_FUNC moderror(int err)
 {
        switch (err) {
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index f13ff9eb6..5c353ef95 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -28,7 +28,7 @@
 int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rmmod_main(int argc UNUSED_PARAM, char **argv)
 {
-        int n;
+        int n, err;
        unsigned flags = O_NONBLOCK | O_EXCL;
        /* Parse command line. */
@@ -40,7 +40,8 @@ int rmmod_main(int argc UNUSED_PARAM, char **argv)
                flags |= O_TRUNC;
        if (n & 4) {
                /* Unload _all_ unused modules via NULL delete_module() call */
-                if (bb_delete_module(NULL, flags) != 0 && errno != EFAULT)
+                err = bb_delete_module(NULL, flags);
+                if (err && err != EFAULT)
                        bb_perror_msg_and_die("rmmod");
                return EXIT_SUCCESS;
        }
@@ -58,9 +59,10 @@ int rmmod_main(int argc UNUSED_PARAM, char **argv)
                        safe_strncpy(modname, bname, MODULE_NAME_LEN);
                else
                        filename2modname(bname, modname);
-                if (bb_delete_module(modname, flags))
+                err = bb_delete_module(modname, flags);
-                        bb_error_msg_and_die("can't unload '%s': %s",
+                if (err)
-                                        modname, moderror(errno));
+                        bb_perror_msg_and_die("can't unload module '%s'",
+                                        modname);
        }
        return EXIT_SUCCESS;
diff --git a/networking/Config.src b/networking/Config.src
index 8c7417f86..27c604a31 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -497,7 +497,7 @@ config FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
 config FEATURE_INETD_RPC
        bool "Support RPC services"
-        default y
+        default n  # very rarely used, and needs Sun RPC support in libc
        depends on INETD
        select FEATURE_HAVE_RPC
        help
diff --git a/networking/httpd.c b/networking/httpd.c
index 00169c36d..ed15fd883 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -967,19 +967,30 @@ static void send_headers(int responseNum)
        }
 #endif
        if (responseNum == HTTP_MOVED_TEMPORARILY) {
-                len += sprintf(iobuf + len, "Location: %s/%s%s\r\n",
+                /* Responding to "GET /dir" with
+                 * "HTTP/1.0 302 Found" "Location: /dir/"
+                 * - IOW, asking them to repeat with a slash.
+                 * Here, overflow IS possible, can't use sprintf:
+                 * mkdir test
+                 * python -c 'print("get /test?" + ("x" * 8192))' | busybox httpd -i -h .
+                 */
+                len += snprintf(iobuf + len, IOBUF_SIZE-3 - len,
+                                "Location: %s/%s%s\r\n",
                                found_moved_temporarily,
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
+                if (len > IOBUF_SIZE-3)
+                        len = IOBUF_SIZE-3;
        }
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
        if (error_page && access(error_page, R_OK) == 0) {
-                strcat(iobuf, "\r\n");
+                iobuf[len++] = '\r';
-                len += 2;
+                iobuf[len++] = '\n';
+                if (DEBUG) {
-                if (DEBUG)
+                        iobuf[len] = '\0';
                        fprintf(stderr, "headers: '%s'\n", iobuf);
+                }
                full_write(STDOUT_FILENO, iobuf, len);
                if (DEBUG)
                        fprintf(stderr, "writing error page: '%s'\n", error_page);
@@ -1021,8 +1032,10 @@ static void send_headers(int responseNum)
                                responseNum, responseString,
                                responseNum, responseString, infoString);
        }
-        if (DEBUG)
+        if (DEBUG) {
+                iobuf[len] = '\0';
                fprintf(stderr, "headers: '%s'\n", iobuf);
+        }
        if (full_write(STDOUT_FILENO, iobuf, len) != len) {
                if (verbose > 1)
                        bb_perror_msg("error");
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 7c45e8927..d477ff6d1 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -394,8 +394,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 # if ENABLE_FEATURE_IFUPDOWN_IP
        result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
        result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
-        /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
+        /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
-        result += execute("[[ip route add ::/0 via %gateway%]][[ metric %metric%]]", ifd, exec);
+        result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ metric %metric%]]", ifd, exec);
 # else
        result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
        result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
@@ -421,7 +421,8 @@ static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
                        "%endpoint%[[ local %local%]][[ ttl %ttl%]]", ifd, exec);
        result += execute("ip link set %iface% up", ifd, exec);
        result += execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec);
-        result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
+        /* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
+        result += execute("[[ip route add ::/0 via %gateway% dev %iface%]]", ifd, exec);
        return ((result == 4) ? 4 : 0);
 }
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index e2b85fc7b..af9eb46f7 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -136,7 +136,6 @@ unsigned FAST_FUNC ll_index_to_flags(int idx)
 int FAST_FUNC xll_name_to_index(const char *name)
 {
        int ret = 0;
-        int sock_fd;
 /* caching is not warranted - no users which repeatedly call it */
 #ifdef UNUSED
@@ -164,30 +163,8 @@ int FAST_FUNC xll_name_to_index(const char *name)
                        }
                }
        }
-        /* We have not found the interface in our cache, but the kernel
-         * may still know about it. One reason is that we may be using
-         * module on-demand loading, which means that the kernel will
-         * load the module and make the interface exist only when
-         * we explicitely request it (check for dev_load() in net/core/dev.c).
-         * I can think of other similar scenario, but they are less common...
-         * Jean II */
 #endif
+        ret = if_nametoindex(name);
-        sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-        if (sock_fd >= 0) {
-                struct ifreq ifr;
-                int tmp;
-                strncpy_IFNAMSIZ(ifr.ifr_name, name);
-                ifr.ifr_ifindex = -1;
-                tmp = ioctl(sock_fd, SIOCGIFINDEX, &ifr);
-                close(sock_fd);
-                if (tmp >= 0)
-                        /* In theory, we should redump the interface list
-                         * to update our cache, this is left as an exercise
-                         * to the reader... Jean II */
-                        ret = ifr.ifr_ifindex;
-        }
 /* out:*/
        if (ret <= 0)
                bb_error_msg_and_die("can't find device '%s'", name);
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 64cd73ec7..987cc9aff 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -4,18 +4,20 @@
 */
 //usage:#define dumpleases_trivial_usage
-//usage:       "[-r|-a] [-f LEASEFILE]"
+//usage:       "[-r|-a] [-d] [-f LEASEFILE]"
 //usage:#define dumpleases_full_usage "\n\n"
 //usage:       "Display DHCP leases granted by udhcpd\n"
 //usage:        IF_LONG_OPTS(
 //usage:     "\n        -f,--file=FILE  Lease file"
 //usage:     "\n        -r,--remaining  Show remaining time"
 //usage:     "\n        -a,--absolute   Show expiration time"
+//usage:     "\n        -d,--decimal    Show time in seconds"
 //usage:        )
 //usage:        IF_NOT_LONG_OPTS(
 //usage:     "\n        -f FILE Lease file"
 //usage:     "\n        -r      Show remaining time"
 //usage:     "\n        -a      Show expiration time"
+//usage:     "\n        -d      Show time in seconds"
 //usage:        )
 #include "common.h"
@@ -28,21 +30,22 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
        int fd;
        int i;
        unsigned opt;
-        int64_t written_at, curr, expires_abs;
+        int64_t written_at, curr;
        const char *file = LEASES_FILE;
        struct dyn_lease lease;
-        struct in_addr addr;
        enum {
                OPT_a = 0x1, // -a
                OPT_r = 0x2, // -r
                OPT_f = 0x4, // -f
+                OPT_d = 0x8, // -d
        };
 #if ENABLE_LONG_OPTS
        static const char dumpleases_longopts[] ALIGN1 =
                "absolute\0"  No_argument       "a"
                "remaining\0" No_argument       "r"
                "file\0"      Required_argument "f"
+                "decimal\0"   No_argument       "d"
                ;
        applet_long_options = dumpleases_longopts;
@@ -50,13 +53,16 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
        init_unicode();
        opt_complementary = "=0:a--r:r--a";
-        opt = getopt32(argv, "arf:", &file);
+        opt = getopt32(argv, "arf:d", &file);
        fd = xopen(file, O_RDONLY);
-        printf("Mac Address       IP Address      Host Name           Expires %s\n", (opt & OPT_a) ? "at" : "in");
-        /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
        /*     "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
+        /*     "00:00:00:00:00:00 255.255.255.255 ABCDEFGHIJKLMNOPQRS Wed Jun 30 21:49:08 1993" */
+        printf("Mac %-14s"       "IP %-13s"      "Host %-15s"        "Expires %s\n",
+                "Address", "Address", "Name",
+                (opt & OPT_a) ? "at" : "in"
+        );
        xread(fd, &written_at, sizeof(written_at));
        written_at = SWAP_BE64(written_at);
@@ -65,6 +71,9 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                written_at = curr; /* lease file from future! :) */
        while (full_read(fd, &lease, sizeof(lease)) == sizeof(lease)) {
+                struct in_addr addr;
+                int64_t expires_abs;
                const char *fmt = ":%02x" + 1;
                for (i = 0; i < 6; i++) {
                        printf(fmt, lease.lease_mac[i]);
@@ -87,6 +96,13 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                        puts("expired");
                        continue;
                }
+                if (opt & OPT_d) {
+                        /* -d: decimal time */
+                        if (!(opt & OPT_a))
+                                expires_abs -= curr;
+                        printf("%llu\n", (unsigned long long) expires_abs);
+                        continue;
+                }
                if (!(opt & OPT_a)) { /* no -a */
                        unsigned d, h, m;
                        unsigned expires = expires_abs - curr;
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index 745340ad3..844bb60b1 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -65,10 +65,15 @@ struct dyn_lease* FAST_FUNC add_lease(
                        if (hostname_len > sizeof(oldest->hostname))
                                hostname_len = sizeof(oldest->hostname);
                        p = safe_strncpy(oldest->hostname, hostname, hostname_len);
-                        /* sanitization (s/non-ASCII/^/g) */
+                        /*
+                         * Sanitization (s/bad_char/./g).
+                         * The intent is not to allow only "DNS-valid" hostnames,
+                         * but merely make dumpleases output safe for shells to use.
+                         * We accept "0-9A-Za-z._-", all other chars turn to dots.
+                         */
                        while (*p) {
-                                if (*p < ' ' || *p > 126)
+                                if (!isalnum(*p) && *p != '-' && *p != '_')
-                                        *p = '^';
+                                        *p = '.';
                                p++;
                        }
                }
diff --git a/networking/wget.c b/networking/wget.c
index 0082ced39..edf8fd8af 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -102,7 +102,8 @@
 //usage:       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n"
 //usage:       "        [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n"
 /* Since we ignore these opts, we don't show them in --help */
-/* //usage:    "        [--no-check-certificate] [--no-cache]" */
+/* //usage:    "        [--no-check-certificate] [--no-cache] [--passive-ftp] [-t TRIES]" */
+/* //usage:    "        [-nv] [-nc] [-nH] [-np]" */
 //usage:       "        [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
 //usage:        )
 //usage:        IF_NOT_FEATURE_WGET_LONG_OPTIONS(
@@ -1225,19 +1226,22 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
                "directory-prefix\0" Required_argument "P"
                "proxy\0"            Required_argument "Y"
                "user-agent\0"       Required_argument "U"
-#if ENABLE_FEATURE_WGET_TIMEOUT
+IF_FEATURE_WGET_TIMEOUT(
-                "timeout\0"          Required_argument "T"
+                "timeout\0"          Required_argument "T")
-#endif
                /* Ignored: */
-                // "tries\0"            Required_argument "t"
+IF_DESKTOP(     "tries\0"            Required_argument "t")
+                "header\0"           Required_argument "\xff"
+                "post-data\0"        Required_argument "\xfe"
                /* Ignored (we always use PASV): */
-                "passive-ftp\0"      No_argument       "\xff"
+IF_DESKTOP(     "passive-ftp\0"      No_argument       "\xf0")
-                "header\0"           Required_argument "\xfe"
-                "post-data\0"        Required_argument "\xfd"
                /* Ignored (we don't do ssl) */
-                "no-check-certificate\0" No_argument   "\xfc"
+IF_DESKTOP(     "no-check-certificate\0" No_argument   "\xf0")
                /* Ignored (we don't support caching) */
-                "no-cache\0"         No_argument       "\xfb"
+IF_DESKTOP(     "no-cache\0"         No_argument       "\xf0")
+IF_DESKTOP(     "no-verbose\0"       No_argument       "\xf0")
+IF_DESKTOP(     "no-clobber\0"       No_argument       "\xf0")
+IF_DESKTOP(     "no-host-directories\0" No_argument    "\xf0")
+IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
                ;
 #endif
@@ -1257,14 +1261,25 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_WGET_LONG_OPTIONS
        applet_long_options = wget_longopts;
 #endif
-        opt_complementary = "-1"
+        opt_complementary = "-1" /* at least one URL */
-                        IF_FEATURE_WGET_TIMEOUT(":T+")
+                IF_FEATURE_WGET_TIMEOUT(":T+") /* -T NUM */
-                        IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
+                IF_FEATURE_WGET_LONG_OPTIONS(":\xff::"); /* --header is a list */
-        getopt32(argv, "csqO:P:Y:U:T:" /*ignored:*/ "t:",
+        getopt32(argv, "csqO:P:Y:U:T:"
-                &G.fname_out, &G.dir_prefix,
+                /*ignored:*/ "t:"
+                /*ignored:*/ "n::"
+                /* wget has exactly four -n<letter> opts, all of which we can ignore:
+                 * -nv --no-verbose: be moderately quiet (-q is full quiet)
+                 * -nc --no-clobber: abort if exists, neither download to FILE.n nor overwrite FILE
+                 * -nH --no-host-directories: wget -r http://host/ won't create host/
+                 * -np --no-parent
+                 * "n::" above says that we accept -n[ARG].
+                 * Specifying "n:" would be a bug: "-n ARG" would eat ARG!
+                 */
+                , &G.fname_out, &G.dir_prefix,
                &G.proxy_flag, &G.user_agent,
                IF_FEATURE_WGET_TIMEOUT(&G.timeout_seconds) IF_NOT_FEATURE_WGET_TIMEOUT(NULL),
-                NULL /* -t RETRIES */
+                NULL, /* -t RETRIES */
+                NULL  /* -n[ARG] */
                IF_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
                IF_FEATURE_WGET_LONG_OPTIONS(, &G.post_data)
        );
diff --git a/networking/zcip.c b/networking/zcip.c
index d15c67d55..1d6910555 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -345,7 +345,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
        state = PROBE;
        while (1) {
                struct pollfd fds[1];
-                unsigned deadline_us;
+                unsigned deadline_us = deadline_us;
                struct arp_packet p;
                int ip_conflict;
                int n;
@@ -361,8 +361,10 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
                        // make the kernel filter out all packets except
                        // ones we'd care about.
                }
-                // Set deadline_us to the point in time when we timeout
+                if (timeout_ms >= 0) {
-                deadline_us = MONOTONIC_US() + timeout_ms * 1000;
+                        // Set deadline_us to the point in time when we timeout
+                        deadline_us = MONOTONIC_US() + timeout_ms * 1000;
+                }
                VDBG("...wait %d %s nsent=%u\n",
                                timeout_ms, argv_intf, nsent);
diff --git a/procps/pmap.c b/procps/pmap.c
index fd995a54d..aa221cfb8 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -20,7 +20,7 @@
 //usage:#define pmap_trivial_usage
 //usage:       "[-xq] PID"
 //usage:#define pmap_full_usage "\n\n"
-//usage:       "Display detailed process memory usage"
+//usage:       "Display process memory usage"
 //usage:     "\n"
 //usage:     "\n        -x      Show details"
 //usage:     "\n        -q      Quiet"
@@ -66,7 +66,7 @@ static int procps_get_maps(pid_t pid, unsigned opt)
        int ret;
        char buf[256];
-        read_cmdline(buf, sizeof(buf), pid, "no such process");
+        read_cmdline(buf, sizeof(buf), pid, NULL);
        printf("%u: %s\n", (int)pid, buf);
        if (!(opt & OPT_q) && (opt & OPT_x))
diff --git a/procps/ps.c b/procps/ps.c
index 07ff7568f..8c373376d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -638,7 +638,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
         * and such large widths */
        terminal_width = MAX_WIDTH;
        if (isatty(1)) {
-                get_terminal_width_height(0, &terminal_width, NULL);
+                terminal_width = get_terminal_width(0);
                if (--terminal_width > MAX_WIDTH)
                        terminal_width = MAX_WIDTH;
        }
@@ -688,7 +688,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
        if (w_count) {
                terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
        } else {
-                get_terminal_width_height(0, &terminal_width, NULL);
+                terminal_width = get_terminal_width(0);
                /* Go one less... */
                if (--terminal_width > MAX_WIDTH)
                        terminal_width = MAX_WIDTH;
diff --git a/procps/pstree.c b/procps/pstree.c
index ed1a41289..c5fb83688 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -381,7 +381,7 @@ int pstree_main(int argc UNUSED_PARAM, char **argv)
        INIT_G();
-        get_terminal_width_height(0, &G.output_width, NULL);
+        G.output_width = get_terminal_width(0);
        opt_complementary = "?1";
        getopt32(argv, "p");
diff --git a/procps/watch.c b/procps/watch.c
index 0397f21bf..97aa04767 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -72,7 +72,7 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
                        // STDERR_FILENO is procps3 compat:
                        // "watch ls 2>/dev/null" does not detect tty size
-                        get_terminal_width_height(STDERR_FILENO, &new_width, NULL);
+                        new_width = get_terminal_width(STDERR_FILENO);
                        if (new_width != width) {
                                width = new_width;
                                free(header);
diff --git a/qemu_multiarch_testing/README b/qemu_multiarch_testing/README
index 9757ff0e4..ecb63f9ef 100644
--- a/qemu_multiarch_testing/README
+++ b/qemu_multiarch_testing/README
@@ -11,6 +11,11 @@ hdc.img, from hdc.dir/* data. This requires root for loop mount.
 one or more system-image-ARCH directories into this directory
 (the one which contains this README).
+* Install qemu-system-ARCH. The arch names may differ from
+system-image-ARCH: for example, all ARM flavors (armv4l...armv6l)
+are served by the same qemu - qemu-system-arm. On my machine,
+I needed to install qemu-system-{arm,mips,x86,ppc,sparc,m68k,sh4}.
 * Run: ./parallel-build-hdc-img.sh system-image-DIR1 system-image-DIR2...
 (background it if you don't want to see "Waiting to finish" thing).
 This runs build in several qemu virtual machines in parallel.
diff --git a/scripts/trylink b/scripts/trylink
index 48c487bcd..6e1187ed0 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -47,18 +47,22 @@ try() {
 check_cc() {
    local tempname="$(mktemp)"
+    local r
+    echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c
    # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
-    # "-xc": C language. "/dev/null" is an empty source file.
+    # Was using "-xc /dev/null", but we need a valid C program.
-    if $CC $CPPFLAGS $CFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
+    # "eval" may be needed if CFLAGS can contain
-        echo "$1";
+    # '... -D"BB_VER=KBUILD_STR(1.N.M)" ...'
-    else
+    # and we need shell to process quotes!
-        echo "$2";
+    $CC $CFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
-    fi
+    r=$?
-    rm -f "$tempname" "$tempname".o
+    rm -f "$tempname" "$tempname".c "$tempname".o
+    return $r
 }
 check_libc_is_glibc() {
    local tempname="$(mktemp)"
+    local r
    echo "\
        #include <stdlib.h>
        /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
@@ -66,12 +70,10 @@ check_libc_is_glibc() {
        syntax error here
        #endif
        " >"$tempname".c
-    if $CC $CPPFLAGS $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then
+    ! $CC $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1
-        echo "$2";
+    r=$?
-    else
+    rm -f "$tempname" "$tempname".c "$tempname".o
-        echo "$1";
+    return $r
-    fi
-    rm -f "$tempname" "$tempname".[co]
 }
 EXE="$1"
@@ -83,32 +85,41 @@ A_FILES="$6"
 LDLIBS="$7"
 # The --sort-section option is not supported by older versions of ld
-SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
+SORT_SECTION="-Wl,--sort-section,alignment"
+if ! check_cc "-Wl,--sort-section,alignment"; then
+    echo "Your linker does not support --sort-section,alignment"
+    SORT_SECTION=""
+fi
 START_GROUP="-Wl,--start-group"
 END_GROUP="-Wl,--end-group"
 INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
 # gold may not support --sort-common (yet)
-SORT_COMMON=`check_cc "-Wl,--sort-common" ""`
+SORT_COMMON="-Wl,--sort-common"
+if ! check_cc "-Wl,--sort-common"; then
+    echo "Your linker does not support --sort-common"
+    SORT_COMMON=""
+fi
 # Static linking against glibc produces buggy executables
 # (glibc does not cope well with ld --gc-sections).
 # See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
 # Note that glibc is unsuitable for static linking anyway.
 # We are removing -Wl,--gc-sections from link command line.
-GC_SECTIONS=`(
+GC_SECTIONS="-Wl,--gc-sections"
-. ./.config
+if (. ./.config && test x"$CONFIG_STATIC" = x"y") then
-if test x"$CONFIG_STATIC" = x"y"; then
+    if check_libc_is_glibc; then
-    check_libc_is_glibc "" "-Wl,--gc-sections"
+        echo "Static linking against glibc, can't use --gc-sections"
-else
+        GC_SECTIONS=""
-    echo "-Wl,--gc-sections"
+    fi
 fi
-)`
 # The --gc-sections option is not supported by older versions of ld
 if test -n "$GC_SECTIONS"; then
-    GC_SECTIONS=`check_cc "$GC_SECTIONS" ""`
+    if ! check_cc "$GC_SECTIONS"; then
+        echo "Your linker does not support $GC_SECTIONS"
+        GC_SECTIONS=""
+    fi
 fi
 # Sanitize lib list (dups, extra spaces etc)
diff --git a/shell/ash.c b/shell/ash.c
index 21fc05f01..08b6aa430 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2747,7 +2747,7 @@ updatepwd(const char *dir)
                        new = stack_putstr(p, new);
                        USTPUTC('/', new);
                }
-                p = strtok(0, "/");
+                p = strtok(NULL, "/");
        }
        if (new > lim)
                STUNPUTC(new);
@@ -5731,7 +5731,7 @@ popredir(int drop, int restore)
        struct redirtab *rp;
        int i;
-        if (--g_nullredirs >= 0)
+        if (--g_nullredirs >= 0 || redirlist == NULL)
                return;
        INT_OFF;
        rp = redirlist;
@@ -8159,14 +8159,15 @@ findkwd(const char *s)
 * Locate and print what a word is...
 */
 static int
-describe_command(char *command, int describe_command_verbose)
+describe_command(char *command, const char *path, int describe_command_verbose)
 {
        struct cmdentry entry;
        struct tblentry *cmdp;
 #if ENABLE_ASH_ALIAS
        const struct alias *ap;
 #endif
-        const char *path = pathval();
+        path = path ? path : pathval();
        if (describe_command_verbose) {
                out1str(command);
@@ -8266,7 +8267,7 @@ typecmd(int argc UNUSED_PARAM, char **argv)
                verbose = 0;
        }
        while (argv[i]) {
-                err |= describe_command(argv[i++], verbose);
+                err |= describe_command(argv[i++], NULL, verbose);
        }
        return err;
 }
@@ -8280,6 +8281,7 @@ commandcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                VERIFY_BRIEF = 1,
                VERIFY_VERBOSE = 2,
        } verify = 0;
+        const char *path = NULL;
        while ((c = nextopt("pvV")) != '\0')
                if (c == 'V')
@@ -8290,9 +8292,11 @@ commandcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                else if (c != 'p')
                        abort();
 #endif
+                else
+                        path = bb_default_path;
        /* Mimic bash: just "command -v" doesn't complain, it's a nop */
        if (verify && (*argptr != NULL)) {
-                return describe_command(*argptr, verify - VERIFY_BRIEF);
+                return describe_command(*argptr, path, verify - VERIFY_BRIEF);
        }
        return 0;
@@ -9296,14 +9300,15 @@ parse_command_args(char **argv, const char **path)
        for (;;) {
                cp = *++argv;
                if (!cp)
-                        return 0;
+                        return NULL;
                if (*cp++ != '-')
                        break;
                c = *cp++;
                if (!c)
                        break;
                if (c == '-' && !*cp) {
-                        argv++;
+                        if (!*++argv)
+                                return NULL;
                        break;
                }
                do {
@@ -9313,7 +9318,7 @@ parse_command_args(char **argv, const char **path)
                                break;
                        default:
                                /* run 'typecmd' for other options */
-                                return 0;
+                                return NULL;
                        }
                        c = *cp++;
                } while (c);
@@ -9400,6 +9405,9 @@ localcmd(int argc UNUSED_PARAM, char **argv)
 {
        char *name;
+        if (!funcnest)
+                ash_msg_and_raise_error("not in a function");
        argv = argptr;
        while ((name = *argv++) != NULL) {
                mklocal(name);
@@ -9865,7 +9873,7 @@ evalcommand(union node *cmd, int flags)
                if (evalbltin(cmdentry.u.cmd, argc, argv)) {
                        int exit_status;
                        int i = exception_type;
-                        if (i == EXEXIT)
+                        if (i == EXEXIT || i == EXEXEC)
                                goto raise;
                        exit_status = 2;
                        if (i == EXINT)
@@ -10959,7 +10967,7 @@ static union node *andor(void);
 static union node *pipeline(void);
 static union node *parse_command(void);
 static void parseheredoc(void);
-static char nexttoken_ends_list(void);
+static int peektoken(void);
 static int readtoken(void);
 static union node *
@@ -10968,11 +10976,27 @@ list(int nlflag)
        union node *n1, *n2, *n3;
        int tok;
-        checkkwd = CHKNL | CHKKWD | CHKALIAS;
-        if (nlflag == 2 && nexttoken_ends_list())
-                return NULL;
        n1 = NULL;
        for (;;) {
+                switch (peektoken()) {
+                case TNL:
+                        if (!(nlflag & 1))
+                                break;
+                        parseheredoc();
+                        return n1;
+                case TEOF:
+                        if (!n1 && (nlflag & 1))
+                                n1 = NODE_EOF;
+                        parseheredoc();
+                        return n1;
+                }
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
+                if (nlflag == 2 && tokname_array[peektoken()][0])
+                        return n1;
+                nlflag |= 2;
                n2 = andor();
                tok = readtoken();
                if (tok == TBACKGND) {
@@ -10998,37 +11022,15 @@ list(int nlflag)
                        n1 = n3;
                }
                switch (tok) {
+                case TNL:
+                case TEOF:
+                        tokpushback = 1;
+                        /* fall through */
                case TBACKGND:
                case TSEMI:
-                        tok = readtoken();
-                        /* fall through */
-                case TNL:
-                        if (tok == TNL) {
-                                parseheredoc();
-                                if (nlflag == 1)
-                                        return n1;
-                        } else {
-                                tokpushback = 1;
-                        }
-                        checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                        if (nexttoken_ends_list()) {
-                                /* Testcase: "<<EOF; then <W".
-                                 * It used to segfault w/o this check:
-                                 */
-                                if (heredoclist) {
-                                        raise_error_unexpected_syntax(-1);
-                                }
-                                return n1;
-                        }
                        break;
-                case TEOF:
-                        if (heredoclist)
-                                parseheredoc();
-                        else
-                                pungetc();              /* push back EOF on input */
-                        return n1;
                default:
-                        if (nlflag == 1)
+                        if ((nlflag & 1))
                                raise_error_unexpected_syntax(-1);
                        tokpushback = 1;
                        return n1;
@@ -11356,7 +11358,7 @@ parse_command(void)
                n1 = stzalloc(sizeof(struct nfor));
                n1->type = NFOR;
                n1->nfor.var = wordtext;
-                checkkwd = CHKKWD | CHKALIAS;
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
                if (readtoken() == TIN) {
                        app = &ap;
                        while (readtoken() == TWORD) {
@@ -11383,7 +11385,7 @@ parse_command(void)
                         * Newline or semicolon here is optional (but note
                         * that the original Bourne shell only allowed NL).
                         */
-                        if (lasttoken != TNL && lasttoken != TSEMI)
+                        if (lasttoken != TSEMI)
                                tokpushback = 1;
                }
                checkkwd = CHKNL | CHKKWD | CHKALIAS;
@@ -11402,10 +11404,8 @@ parse_command(void)
                /*n2->narg.next = NULL; - stzalloc did it */
                n2->narg.text = wordtext;
                n2->narg.backquote = backquotelist;
-                do {
+                checkkwd = CHKNL | CHKKWD | CHKALIAS;
-                        checkkwd = CHKKWD | CHKALIAS;
+                if (readtoken() != TIN)
-                } while (readtoken() == TNL);
-                if (lasttoken != TIN)
                        raise_error_unexpected_syntax(TIN);
                cpp = &n1->ncase.cases;
 next_case:
@@ -12336,6 +12336,7 @@ static int
 readtoken(void)
 {
        int t;
+        int kwd = checkkwd;
 #if DEBUG
        smallint alreadyseen = tokpushback;
 #endif
@@ -12349,7 +12350,7 @@ readtoken(void)
        /*
         * eat newlines
         */
-        if (checkkwd & CHKNL) {
+        if (kwd & CHKNL) {
                while (t == TNL) {
                        parseheredoc();
                        t = xxreadtoken();
@@ -12363,7 +12364,7 @@ readtoken(void)
        /*
         * check for keywords
         */
-        if (checkkwd & CHKKWD) {
+        if (kwd & CHKKWD) {
                const char *const *pp;
                pp = findkwd(wordtext);
@@ -12397,14 +12398,14 @@ readtoken(void)
        return t;
 }
-static char
+static int
-nexttoken_ends_list(void)
+peektoken(void)
 {
        int t;
        t = readtoken();
        tokpushback = 1;
-        return tokname_array[t][0];
+        return t;
 }
 /*
@@ -12414,18 +12415,12 @@ nexttoken_ends_list(void)
 static union node *
 parsecmd(int interact)
 {
-        int t;
        tokpushback = 0;
+        checkkwd = 0;
+        heredoclist = 0;
        doprompt = interact;
        setprompt_if(doprompt, doprompt);
        needprompt = 0;
-        t = readtoken();
-        if (t == TEOF)
-                return NODE_EOF;
-        if (t == TNL)
-                return NULL;
-        tokpushback = 1;
        return list(1);
 }
diff --git a/shell/ash_test/ash-heredoc/heredoc2.right b/shell/ash_test/ash-heredoc/heredoc2.right
new file mode 100644
index 000000000..a486f1ac4
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc2.right
@@ -0,0 +1,2 @@
+bar
+bar
diff --git a/shell/ash_test/ash-heredoc/heredoc2.tests b/shell/ash_test/ash-heredoc/heredoc2.tests
new file mode 100755
index 000000000..6d9ccb6cc
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc2.tests
@@ -0,0 +1,7 @@
+foo () {
+cat <<EOF && { echo "$1" ; }
+$1
+EOF
+}
+foo "bar"
diff --git a/shell/ash_test/ash-heredoc/heredoc3.right b/shell/ash_test/ash-heredoc/heredoc3.right
new file mode 100644
index 000000000..ce0136250
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc3.right
@@ -0,0 +1 @@
+hello
diff --git a/shell/ash_test/ash-heredoc/heredoc3.tests b/shell/ash_test/ash-heredoc/heredoc3.tests
new file mode 100755
index 000000000..96c227cc1
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc3.tests
@@ -0,0 +1,9 @@
+echo hello >greeting
+cat <<EOF &&
+$(cat greeting)
+EOF
+{
+        echo $?
+        cat greeting
+} >/dev/null
+rm greeting
diff --git a/shell/ash_test/ash-misc/command.right b/shell/ash_test/ash-misc/command.right
new file mode 100644
index 000000000..7f746d9c4
--- /dev/null
+++ b/shell/ash_test/ash-misc/command.right
@@ -0,0 +1 @@
+recho: not found
diff --git a/shell/ash_test/ash-misc/command.tests b/shell/ash_test/ash-misc/command.tests
new file mode 100755
index 000000000..5d445af51
--- /dev/null
+++ b/shell/ash_test/ash-misc/command.tests
@@ -0,0 +1 @@
+command -p -V recho
diff --git a/shell/ash_test/ash-misc/command2.right b/shell/ash_test/ash-misc/command2.right
new file mode 100644
index 000000000..8d2165f69
--- /dev/null
+++ b/shell/ash_test/ash-misc/command2.right
@@ -0,0 +1,2 @@
+test1
+./command2.tests: ./test1.sh: line 1: ./test2.sh: Permission denied
diff --git a/shell/ash_test/ash-misc/command2.tests b/shell/ash_test/ash-misc/command2.tests
new file mode 100755
index 000000000..9d9de9a89
--- /dev/null
+++ b/shell/ash_test/ash-misc/command2.tests
@@ -0,0 +1,6 @@
+echo "echo test1; ./test2.sh" >test1.sh
+echo "echo test2" >test2.sh
+command . ./test1.sh
+rm -f test1.sh test2.sh
diff --git a/shell/ash_test/ash-misc/exec.right b/shell/ash_test/ash-misc/exec.right
new file mode 100644
index 000000000..1741a38dd
--- /dev/null
+++ b/shell/ash_test/ash-misc/exec.right
@@ -0,0 +1,2 @@
+./exec.tests: exec: line 2: ./test1.sh: not found
+127
diff --git a/shell/ash_test/ash-misc/exec.tests b/shell/ash_test/ash-misc/exec.tests
new file mode 100755
index 000000000..624915de1
--- /dev/null
+++ b/shell/ash_test/ash-misc/exec.tests
@@ -0,0 +1,3 @@
+rm -f test1.sh
+(exec ./test1.sh)
+echo $?
diff --git a/shell/ash_test/ash-misc/for.right b/shell/ash_test/ash-misc/for.right
new file mode 100644
index 000000000..d86bac9de
--- /dev/null
+++ b/shell/ash_test/ash-misc/for.right
@@ -0,0 +1 @@
+OK
diff --git a/shell/ash_test/ash-misc/for.tests b/shell/ash_test/ash-misc/for.tests
new file mode 100755
index 000000000..4889a9f2d
--- /dev/null
+++ b/shell/ash_test/ash-misc/for.tests
@@ -0,0 +1,5 @@
+for i
+in OK
+do
+        echo $i
+done
diff --git a/shell/ash_test/ash-misc/local2.right b/shell/ash_test/ash-misc/local2.right
new file mode 100644
index 000000000..630ef7979
--- /dev/null
+++ b/shell/ash_test/ash-misc/local2.right
@@ -0,0 +1 @@
+./local2.tests: local: line 1: not in a function
diff --git a/shell/ash_test/ash-misc/local2.tests b/shell/ash_test/ash-misc/local2.tests
new file mode 100755
index 000000000..8e14037c5
--- /dev/null
+++ b/shell/ash_test/ash-misc/local2.tests
@@ -0,0 +1 @@
+local x=1
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all
index ad93e251d..354cc1fcf 100755
--- a/shell/ash_test/run-all
+++ b/shell/ash_test/run-all
@@ -31,8 +31,9 @@ do_test()
            *.orig|*~) ;;
            #*) echo $x ; sh $x ;;
            *)
+            echo -n "$1/$x: "
            sh "$x" >"$TOPDIR/$noslash-$x.fail" 2>&1 && \
-            { echo "$1/$x: ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo "$1/$x: fail";
+            { echo "ok"; rm "$TOPDIR/$noslash-$x.fail"; } || echo "fail";
            ;;
        esac
    done
@@ -42,11 +43,12 @@ do_test()
        test -x "$x" || continue
        name="${x%%.tests}"
        test -f "$name.right" || continue
+        echo -n "$1/$x: "
        {
            "$THIS_SH" "./$x" >"$name.xx" 2>&1
            diff -u "$name.xx" "$name.right" >"$TOPDIR/$noslash-$x.fail" \
            && rm -f "$name.xx" "$TOPDIR/$noslash-$x.fail"
-        } && echo "$1/$x: ok" || echo "$1/$x: fail"
+        } && echo "ok" || echo "fail"
    done
    )
 }
diff --git a/shell/hush_test/hush-misc/for.right b/shell/hush_test/hush-misc/for.right
new file mode 100644
index 000000000..d86bac9de
--- /dev/null
+++ b/shell/hush_test/hush-misc/for.right
@@ -0,0 +1 @@
+OK
diff --git a/shell/hush_test/hush-misc/for.tests b/shell/hush_test/hush-misc/for.tests
new file mode 100755
index 000000000..4889a9f2d
--- /dev/null
+++ b/shell/hush_test/hush-misc/for.tests
@@ -0,0 +1,5 @@
+for i
+in OK
+do
+        echo $i
+done
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 288b29cf7..0ea557a6c 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -936,11 +936,6 @@ static NOINLINE int create_socket(void)
        int sock_fd;
        char *dev_log_name;
-#if ENABLE_FEATURE_SYSTEMD
-        if (sd_listen_fds() == 1)
-                return SD_LISTEN_FDS_START;
-#endif
        memset(&sunx, 0, sizeof(sunx));
        sunx.sun_family = AF_UNIX;
diff --git a/testsuite/sort.tests b/testsuite/sort.tests
index c4b223464..c51a8e475 100755
--- a/testsuite/sort.tests
+++ b/testsuite/sort.tests
@@ -106,6 +106,50 @@ a/a:a
 a:b
 " ""
+testing "sort with ENDCHAR" "sort -t. -k1,1.1 -k2 input" "\
+ab.1
+aa.2
+" "\
+aa.2
+ab.1
+" ""
+testing "glibc build sort" "sort -t. -k 1,1 -k 2n,2n -k 3 input" "\
+GLIBC_2.1
+GLIBC_2.1.1
+GLIBC_2.2
+GLIBC_2.2.1
+GLIBC_2.10
+GLIBC_2.20
+GLIBC_2.21
+" "\
+GLIBC_2.21
+GLIBC_2.1.1
+GLIBC_2.2.1
+GLIBC_2.2
+GLIBC_2.20
+GLIBC_2.10
+GLIBC_2.1
+" ""
+testing "glibc build sort unique" "sort -u -t. -k 1,1 -k 2n,2n -k 3 input" "\
+GLIBC_2.1
+GLIBC_2.1.1
+GLIBC_2.2
+GLIBC_2.2.1
+GLIBC_2.10
+GLIBC_2.20
+GLIBC_2.21
+" "\
+GLIBC_2.10
+GLIBC_2.2.1
+GLIBC_2.1.1
+GLIBC_2.20
+GLIBC_2.2
+GLIBC_2.1
+GLIBC_2.21
+" ""
 testing "sort -u should consider field only when discarding" "sort -u -k2 input" "\
 a c
 " "\
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 4929f4e49..890a73dd5 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -53,6 +53,15 @@ dd if=/dev/zero bs=512 count=20 2>/dev/null | tar xvf - 2>&1; echo $?
 "" ""
 SKIP=
+# "tar cf test.tar input input_dir/ input_hard1 input_hard2 input_hard1 input_dir/ input":
+# GNU tar 1.26 records as hardlinks:
+#  input_hard2 -> input_hard1
+#  input_hard1 -> input_hard1 (!!!)
+#  input_dir/file -> input_dir/file
+#  input -> input
+# As of 1.24.0, we don't record last two: for them, nlink==1
+# and we check for "hardlink"ness only files with nlink!=1
+# We also don't use "hrw-r--r--" notation for hardlinks in "tar tv" listing.
 optional FEATURE_TAR_CREATE FEATURE_LS_SORTFILES
 testing "tar hardlinks and repeated files" '\
 rm -rf input_* test.tar 2>/dev/null
@@ -64,6 +73,7 @@ chmod -R 644 *
 chmod    755 input_dir
 tar cf test.tar input input_dir/ input_hard1 input_hard2 input_hard1 input_dir/ input
 tar tvf test.tar | sed "s/.*[0-9] input/input/"
+rm -rf input_dir
 tar xf test.tar 2>&1
 echo Ok: $?
 ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/"
@@ -246,6 +256,49 @@ Ok
 "" ""
 SKIP=
+# attack.tar.bz2 has symlink pointing to a system file
+# followed by a regular file with the same name
+# containing "root::0:0::/root:/bin/sh":
+#  lrwxrwxrwx root/root passwd -> /tmp/passwd
+#  -rw-r--r-- root/root passwd
+# naive tar implementation may end up creating the symlink
+# and then writing into it.
+# The correct implementation unlinks target before
+# creating the second file.
+# We test that /tmp/passwd remains empty:
+optional UUDECODE 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 \$?
+" "\
+0
+" \
+"" "\
+begin-base64 644 attack.tar.bz2
+QlpoOTFBWSZTWRVn/bIAAKt7hMqwAEBAAP2QAhB0Y96AAACACCAAlISgpqe0
+po0DIaDynqAkpDRP1ANAhiYNSPR8VchKhAz0AK59+DA6FcMKBggOARIJdVHL
+DGllrjs20ATUgR1HmccBX3EhoMnpMJaNyggmxgLDMz54lBnBTJO/1L1lbMS4
+l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
+====
+"
+SKIP=
+# And same with -k
+optional UUDECODE FEATURE_SEAMLESS_BZ2
+testing "tar -k does not extract into symlinks" "\
+>>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
+" "\
+tar: can't open 'passwd': File exists
+0
+" \
+"" "\
+begin-base64 644 attack.tar.bz2
+QlpoOTFBWSZTWRVn/bIAAKt7hMqwAEBAAP2QAhB0Y96AAACACCAAlISgpqe0
+po0DIaDynqAkpDRP1ANAhiYNSPR8VchKhAz0AK59+DA6FcMKBggOARIJdVHL
+DGllrjs20ATUgR1HmccBX3EhoMnpMJaNyggmxgLDMz54lBnBTJO/1L1lbMS4
+l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
+====
+"
+SKIP=
 cd .. && rm -rf tar.tempdir || exit 1
diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
index 8677a0306..d8738a3bd 100755
--- a/testsuite/unzip.tests
+++ b/testsuite/unzip.tests
@@ -7,7 +7,7 @@
 . ./testing.sh
-# testing "test name" "options" "expected result" "file input" "stdin"
+# testing "test name" "commands" "expected result" "file input" "stdin"
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout
@@ -30,6 +30,28 @@ testing "unzip (subdir only)" "unzip -q foo.zip foo/ && test -d foo && test ! -f
 rmdir foo
 rm foo.zip
+# File containing some damaged encrypted stream
+testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
+"Archive:  bad.zip
+  inflating: ]3j½r«IK-%Ix
+unzip: corrupted data
+unzip: inflate error
+1
+" \
+"" "\
+begin-base64 644 bad.zip
+UEsDBBQAAgkIAAAAIQA5AAAANwAAADwAAAAQAAcAXTNqwr1ywqtJGxJLLSVJ
+eCkBD0AdKBk8JzQsIj01JC0/ORJQSwMEFAECCAAAAAAhADoAAAAPAAAANgAA
+AAwAAQASw73Ct1DCokohPXQiNjoUNTUiHRwgLT4WHlBLAQIQABQAAggIAAAA
+oQA5AAAANwAAADwAAAAQQAcADAAAACwAMgCAAAAAAABdM2rCvXLCq0kbEkst
+JUl4KQEPQB0oGSY4Cz4QNgEnJSYIPVBLAQIAABQAAggAAAAAIQAqAAAADwAA
+BDYAAAAMAAEADQAAADIADQAAAEEAAAASw73Ct1DKokohPXQiNzA+FAI1HCcW
+NzITNFBLBQUKAC4JAA04Cw0EOhZQSwUGAQAABAIAAgCZAAAAeQAAAAIALhM=
+====
+"
+rm *
 # Clean up scratch directory.
 cd ..
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 854b3682e..922cabdb8 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -489,16 +489,6 @@ config SCRIPTREPLAY
          This program replays a typescript, using timing information
          given by script -t.
-config SETARCH
-        bool "setarch"
-        default y
-        select PLATFORM_LINUX
-        help
-          The linux32 utility is used to create a 32bit environment for the
-          specified program (usually a shell). It only makes sense to have
-          this util on a system that supports both 64bit and 32bit userland
-          (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 config SWAPONOFF
        bool "swaponoff"
        default y
diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
index 468fc6bc1..0b87c52ac 100644
--- a/util-linux/Kbuild.src
+++ b/util-linux/Kbuild.src
@@ -40,7 +40,6 @@ lib-$(CONFIG_READPROFILE)       += readprofile.o
 lib-$(CONFIG_RTCWAKE)           += rtcwake.o
 lib-$(CONFIG_SCRIPT)            += script.o
 lib-$(CONFIG_SCRIPTREPLAY)      += scriptreplay.o
-lib-$(CONFIG_SETARCH)           += setarch.o
 lib-$(CONFIG_SWAPONOFF)         += swaponoff.o
 lib-$(CONFIG_SWITCH_ROOT)       += switch_root.o
 lib-$(CONFIG_UMOUNT)            += umount.o
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index 7b9421af1..2e989ec2a 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -6,13 +6,30 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
+//config:config SETARCH
+//config:       bool "setarch"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       help
+//config:         The linux32 utility is used to create a 32bit environment for the
+//config:         specified program (usually a shell). It only makes sense to have
+//config:         this util on a system that supports both 64bit and 32bit userland
+//config:         (like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
+//applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_SETARCH(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
+//applet:IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))
+//kbuild:lib-$(CONFIG_SETARCH) += setarch.o
 //usage:#define setarch_trivial_usage
-//usage:       "personality PROG ARGS"
+//usage:       "PERSONALITY [-R] PROG ARGS"
 //usage:#define setarch_full_usage "\n\n"
-//usage:       "Personality may be:\n"
+//usage:       "PERSONALITY may be:"
-//usage:       "        linux32         Set 32bit uname emulation\n"
+//usage:   "\n""        linux32 Set 32bit uname emulation"
-//usage:       "        linux64         Set 64bit uname emulation"
+//usage:   "\n""        linux64 Set 64bit uname emulation"
+//usage:   "\n"
+//usage:   "\n""        -R      Disable address space randomization"
 //usage:
 //usage:#define linux32_trivial_usage NOUSAGE_STR
 //usage:#define linux32_full_usage ""
@@ -20,14 +37,18 @@
 //usage:#define linux64_trivial_usage NOUSAGE_STR
 //usage:#define linux64_full_usage ""
+#include "libbb.h"
 #include <sys/personality.h>
-#include "libbb.h"
+#ifndef ADDR_NO_RANDOMIZE
+# define ADDR_NO_RANDOMIZE       0x0040000
+#endif
 int setarch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setarch_main(int argc UNUSED_PARAM, char **argv)
 {
-        int pers;
+        unsigned opts;
+        unsigned long pers;
        /* Figure out what personality we are supposed to switch to ...
         * we can be invoked as either:
@@ -35,7 +56,7 @@ int setarch_main(int argc UNUSED_PARAM, char **argv)
         * argv[0]         == "personality"
         */
        if (ENABLE_SETARCH && applet_name[0] == 's'
-         && argv[1] && strncpy(argv[1], "linux", 5)
+         && argv[1] && is_prefixed_with(argv[1], "linux")
        ) {
                applet_name = argv[1];
                argv++;
@@ -47,15 +68,18 @@ int setarch_main(int argc UNUSED_PARAM, char **argv)
        else
                bb_show_usage();
-        argv++;
+        opts = getopt32(argv, "+R"); /* '+': stop at first non-option */
-        if (argv[0] == NULL)
+        if (opts)
-                bb_show_usage();
+                pers |= ADDR_NO_RANDOMIZE;
        /* Try to set personality */
-        if (personality(pers) >= 0) {
+        if (personality(pers) < 0)
-                /* Try to execute the program */
+                bb_perror_msg_and_die("personality(0x%lx)", pers);
-                BB_EXECVP(argv[0], argv);
-        }
+        argv += optind;
+        if (!argv[0])
+                (--argv)[0] = (char*)"/bin/sh";
-        bb_simple_perror_msg_and_die(argv[0]);
+        /* Try to execute the program */
+        BB_EXECVP_or_die(argv);
 }