Merge branch 'busybox' into merge

13 files changed, 278 insertions, 212 deletions

diff --git a/archival/Config.src b/archival/Config.src
index 0c97f3d7c..449914565 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -27,4 +27,12 @@ config FEATURE_SEAMLESS_Z
 
 INSERT
 
+config FEATURE_LZMA_FAST
+        bool "Optimize lzma for speed"
+        default n
+        depends on UNLZMA || LZCAT || LZMA || FEATURE_SEAMLESS_LZMA
+        help
+        This option reduces decompression time by about 25% at the cost of
+        a 1K bigger binary.
+
 endmenu
diff --git a/archival/ar.c b/archival/ar.c
index f9f712fde..ea36bda88 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -18,34 +18,32 @@
  */
 
 //config:config AR
-//config:       bool "ar"
+//config:       bool "ar (9.5 kb)"
 //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. In practice, it is used exclusively
-//config:         for object module archives used by compilers.
+//config:       ar is an archival utility program used to create, modify, and
+//config:       extract contents from archives. In practice, it is used exclusively
+//config:       for object module archives used by compilers.
 //config:
-//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: most compilers come with their own ar utility.
+//config:       Unless you have a specific application which requires ar, you should
+//config:       probably say N here: most compilers come with their own ar utility.
 //config:
 //config:config FEATURE_AR_LONG_FILENAMES
 //config:       bool "Support long filenames (not needed for debs)"
 //config:       default y
 //config:       depends on AR
 //config:       help
-//config:         By default the ar format can only store the first 15 characters
-//config:         of the filename, this option removes that limitation.
-//config:         It supports the GNU ar long filename method which moves multiple long
-//config:         filenames into a the data section of a new ar entry.
+//config:       By default the ar format can only store the first 15 characters
+//config:       of the filename, this option removes that limitation.
+//config:       It supports the GNU ar long filename method which moves multiple long
+//config:       filenames into a the data section of a new ar entry.
 //config:
 //config:config FEATURE_AR_CREATE
 //config:       bool "Support archive creation"
 //config:       default y
 //config:       depends on AR
 //config:       help
-//config:         This enables archive creation (-c and -r) with busybox ar.
+//config:       This enables archive creation (-c and -r) with busybox ar.
 
 //applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_AR) += ar.o
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 1e3d6e586..f91dd25eb 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -239,11 +239,11 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //usage:     "\n        -f      Overwrite"
 
 //config:config UNCOMPRESS
-//config:       bool "uncompress"
+//config:       bool "uncompress (7.1 kb)"
 //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.
+//config:       uncompress is used to decompress archives created by compress.
+//config:       Not much used anymore, replaced by gzip/gunzip.
 
 //applet:IF_UNCOMPRESS(APPLET(uncompress, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o
@@ -314,20 +314,20 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config GUNZIP
-//config:       bool "gunzip"
+//config:       bool "gunzip (12 kb)"
 //config:       default y
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
-//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:       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 ZCAT
-//config:       bool "zcat"
+//config:       bool "zcat (25 kb)"
 //config:       default y
 //config:       select FEATURE_GZIP_DECOMPRESS
 //config:       help
-//config:         Alias to "gunzip -c".
+//config:       Alias to "gunzip -c".
 //config:
 //config:config FEATURE_GUNZIP_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -400,7 +400,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
          * Normally, "zcat" is just "gunzip -c".
          * But if seamless magic is enabled, then we are much more clever.
          */
-        if (ENABLE_ZCAT && applet_name[1] == 'c')
+        if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
                 option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
 
         return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
@@ -427,25 +427,25 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config BUNZIP2
-//config:       bool "bunzip2"
+//config:       bool "bunzip2 (8.8 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
-//config:         bunzip2 is a compression utility using the Burrows-Wheeler block
-//config:         sorting text compression algorithm, and Huffman coding. Compression
-//config:         is generally considerably better than that achieved by more
-//config:         conventional LZ77/LZ78-based compressors, and approaches the
-//config:         performance of the PPM family of statistical compressors.
+//config:       bunzip2 is a compression utility using the Burrows-Wheeler block
+//config:       sorting text compression algorithm, and Huffman coding. Compression
+//config:       is generally considerably better than that achieved by more
+//config:       conventional LZ77/LZ78-based compressors, and approaches the
+//config:       performance of the PPM family of statistical compressors.
 //config:
-//config:         Unless you have a specific application which requires bunzip2, you
-//config:         should probably say N here.
+//config:       Unless you have a specific application which requires bunzip2, you
+//config:       should probably say N here.
 //config:
 //config:config BZCAT
-//config:       bool "bzcat"
+//config:       bool "bzcat (8.8 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
-//config:         Alias to "bunzip2 -c".
+//config:       Alias to "bunzip2 -c".
 
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main     location        suid_type     help
@@ -456,7 +456,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
         getopt32(argv, "cfkvqdt");
         argv += optind;
-        if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
+        if (ENABLE_BZCAT && (!ENABLE_BUNZIP2 || applet_name[2] == 'c')) /* bzcat */
                 option_mask32 |= OPT_STDOUT;
 
         return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");
@@ -495,43 +495,26 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNLZMA
-//config:       bool "unlzma"
+//config:       bool "unlzma (8.6 kb)"
 //config:       default y
 //config:       help
-//config:         unlzma is a compression utility using the Lempel-Ziv-Markov chain
-//config:         compression algorithm, and range coding. Compression
-//config:         is generally considerably better than that achieved by the bzip2
-//config:         compressors.
-//config:
-//config:         The BusyBox unlzma applet is limited to decompression only.
-//config:         On an x86 system, this applet adds about 4K.
+//config:       unlzma is a compression utility using the Lempel-Ziv-Markov chain
+//config:       compression algorithm, and range coding. Compression
+//config:       is generally considerably better than that achieved by the bzip2
+//config:       compressors.
 //config:
 //config:config LZCAT
-//config:       bool "lzcat"
+//config:       bool "lzcat (8.5 kb)"
 //config:       default y
 //config:       help
-//config:         unlzma is a compression utility using the Lempel-Ziv-Markov chain
-//config:         compression algorithm, and range coding. Compression
-//config:         is generally considerably better than that achieved by the bzip2
-//config:         compressors.
-//config:
-//config:         The BusyBox unlzma applet is limited to decompression only.
-//config:         On an x86 system, this applet adds about 4K.
+//config:       Alias to "unlzma -c".
 //config:
 //config:config LZMA
 //config:       bool "lzma -d"
 //config:       default y
 //config:       help
-//config:         Enable this option if you want commands like "lzma -d" to work.
-//config:         IOW: you'll get lzma applet, but it will always require -d option.
-//config:
-//config:config FEATURE_LZMA_FAST
-//config:       bool "Optimize for speed"
-//config:       default n
-//config:       depends on UNLZMA || LZCAT || LZMA
-//config:       help
-//config:         This option reduces decompression time by about 25% at the cost of
-//config:         a 1K bigger binary.
+//config:       Enable this option if you want commands like "lzma -d" to work.
+//config:       IOW: you'll get lzma applet, but it will always require -d option.
 
 //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main    location        suid_type     help
@@ -583,23 +566,23 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNXZ
-//config:       bool "unxz"
+//config:       bool "unxz (13 kb)"
 //config:       default y
 //config:       help
-//config:         unxz is a unlzma successor.
+//config:       unxz is a unlzma successor.
 //config:
 //config:config XZCAT
-//config:       bool "xzcat"
+//config:       bool "xzcat (13 kb)"
 //config:       default y
 //config:       help
-//config:         Alias to "unxz -c".
+//config:       Alias to "unxz -c".
 //config:
 //config:config XZ
 //config:       bool "xz -d"
 //config:       default y
 //config:       help
-//config:         Enable this option if you want commands like "xz -d" to work.
-//config:         IOW: you'll get xz applet, but it will always require -d option.
+//config:       Enable this option if you want commands like "xz -d" to work.
+//config:       IOW: you'll get xz applet, but it will always require -d option.
 
 //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP))
 //                APPLET_ODDNAME:name   main  location        suid_type     help
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 8afa43802..0b9c508df 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -8,26 +8,26 @@
  */
 
 //config:config BZIP2
-//config:       bool "bzip2"
+//config:       bool "bzip2 (18 kb)"
 //config:       default y
 //config:       help
-//config:         bzip2 is a compression utility using the Burrows-Wheeler block
-//config:         sorting text compression algorithm, and Huffman coding. Compression
-//config:         is generally considerably better than that achieved by more
-//config:         conventional LZ77/LZ78-based compressors, and approaches the
-//config:         performance of the PPM family of statistical compressors.
+//config:       bzip2 is a compression utility using the Burrows-Wheeler block
+//config:       sorting text compression algorithm, and Huffman coding. Compression
+//config:       is generally considerably better than that achieved by more
+//config:       conventional LZ77/LZ78-based compressors, and approaches the
+//config:       performance of the PPM family of statistical compressors.
 //config:
-//config:         Unless you have a specific application which requires bzip2, you
-//config:         should probably say N here.
+//config:       Unless you have a specific application which requires bzip2, you
+//config:       should probably say N here.
 //config:
 //config:config FEATURE_BZIP2_DECOMPRESS
 //config:       bool "Enable decompression"
 //config:       default y
 //config:       depends on BZIP2 || BUNZIP2 || BZCAT
 //config:       help
-//config:         Enable -d (--decompress) and -t (--test) options for bzip2.
-//config:         This will be automatically selected if bunzip2 or bzcat is
-//config:         enabled.
+//config:       Enable -d (--decompress) and -t (--test) options for bzip2.
+//config:       This will be automatically selected if bunzip2 or bzcat is
+//config:       enabled.
 
 //applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
diff --git a/archival/cpio.c b/archival/cpio.c
index 683f0bb1f..38bab8257 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -15,33 +15,33 @@
 #include "bb_archive.h"
 
 //config:config CPIO
-//config:       bool "cpio"
+//config:       bool "cpio (14 kb)"
 //config:       default y
 //config:       help
-//config:         cpio is an archival utility program used to create, modify, and
-//config:         extract contents from archives.
-//config:         cpio has 110 bytes of overheads for every stored file.
+//config:       cpio is an archival utility program used to create, modify, and
+//config:       extract contents from archives.
+//config:       cpio has 110 bytes of overheads for every stored file.
 //config:
-//config:         This implementation of cpio can extract cpio archives created in the
-//config:         "newc" or "crc" format.
+//config:       This implementation of cpio can extract cpio archives created in the
+//config:       "newc" or "crc" format.
 //config:
-//config:         Unless you have a specific application which requires cpio, you
-//config:         should probably say N here.
+//config:       Unless you have a specific application which requires cpio, you
+//config:       should probably say N here.
 //config:
 //config:config FEATURE_CPIO_O
 //config:       bool "Support archive creation"
 //config:       default y
 //config:       depends on CPIO
 //config:       help
-//config:         This implementation of cpio can create cpio archives in the "newc"
-//config:         format only.
+//config:       This implementation of cpio can create cpio archives in the "newc"
+//config:       format only.
 //config:
 //config:config FEATURE_CPIO_P
 //config:       bool "Support passthrough mode"
 //config:       default y
 //config:       depends on FEATURE_CPIO_O
 //config:       help
-//config:         Passthrough mode. Rarely used.
+//config:       Passthrough mode. Rarely used.
 
 //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_CPIO) += cpio.o
diff --git a/archival/dpkg.c b/archival/dpkg.c
index da3b0864e..90ad8766c 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -27,15 +27,15 @@
  */
 
 //config:config DPKG
-//config:       bool "dpkg"
+//config:       bool "dpkg (44 kb)"
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
-//config:         dpkg is a medium-level tool to install, build, remove and manage
-//config:         Debian packages.
+//config:       dpkg is a medium-level tool to install, build, remove and manage
+//config:       Debian packages.
 //config:
-//config:         This implementation of dpkg has a number of limitations,
-//config:         you should use the official dpkg if possible.
+//config:       This implementation of dpkg has a number of limitations,
+//config:       you should use the official dpkg if possible.
 
 //applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_DPKG) += dpkg.o
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index ebbc7f035..029bc4af1 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -10,12 +10,12 @@
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
-//config:         dpkg-deb unpacks and provides information about Debian archives.
+//config:       dpkg-deb unpacks and provides information about Debian archives.
 //config:
-//config:         This implementation of dpkg-deb cannot pack archives.
+//config:       This implementation of dpkg-deb cannot pack archives.
 //config:
-//config:         Unless you have a specific application which requires dpkg-deb,
-//config:         say N here.
+//config:       Unless you have a specific application which requires dpkg-deb,
+//config:       say N here.
 
 //applet:IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, BB_DIR_USR_BIN, BB_SUID_DROP, dpkg_deb))
 
diff --git a/archival/gzip.c b/archival/gzip.c
index c895de426..4cf34ac28 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -38,11 +38,11 @@ aa:      85.1% -- replaced with aa.gz
 */
 
 //config:config GZIP
-//config:       bool "gzip"
+//config:       bool "gzip (19 kb)"
 //config:       default y
 //config:       help
-//config:         gzip is used to compress files.
-//config:         It's probably the most widely used UNIX compression program.
+//config:       gzip is used to compress files.
+//config:       It's probably the most widely used UNIX compression program.
 //config:
 //config:config FEATURE_GZIP_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -55,30 +55,30 @@ aa:      85.1% -- replaced with aa.gz
 //config:       range 0 2
 //config:       depends on GZIP
 //config:       help
-//config:         Enable big memory options for gzip.
-//config:         0: small buffers, small hash-tables
-//config:         1: larger buffers, larger hash-tables
-//config:         2: larger buffers, largest hash-tables
-//config:         Larger models may give slightly better compression
+//config:       Enable big memory options for gzip.
+//config:       0: small buffers, small hash-tables
+//config:       1: larger buffers, larger hash-tables
+//config:       2: larger buffers, largest hash-tables
+//config:       Larger models may give slightly better compression
 //config:
 //config:config FEATURE_GZIP_LEVELS
 //config:       bool "Enable compression levels"
 //config:       default n
 //config:       depends on GZIP
 //config:       help
-//config:         Enable support for compression levels 4-9. The default level
-//config:         is 6. If levels 1-3 are specified, 4 is used.
-//config:         If this option is not selected, -N options are ignored and -9
-//config:         is used.
+//config:       Enable support for compression levels 4-9. The default level
+//config:       is 6. If levels 1-3 are specified, 4 is used.
+//config:       If this option is not selected, -N options are ignored and -9
+//config:       is used.
 //config:
 //config:config FEATURE_GZIP_DECOMPRESS
 //config:       bool "Enable decompression"
 //config:       default y
 //config:       depends on GZIP || GUNZIP || ZCAT
 //config:       help
-//config:         Enable -d (--decompress) and -t (--test) options for gzip.
-//config:         This will be automatically selected if gunzip or zcat is
-//config:         enabled.
+//config:       Enable -d (--decompress) and -t (--test) options for gzip.
+//config:       This will be automatically selected if gunzip or zcat is
+//config:       enabled.
 
 //applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_GZIP) += gzip.o
diff --git a/archival/lzop.c b/archival/lzop.c
index 6ef82b749..df18ff170 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -26,31 +26,31 @@
 */
 
 //config:config LZOP
-//config:       bool "lzop"
+//config:       bool "lzop (13 kb)"
 //config:       default y
 //config:       help
-//config:         Lzop compression/decompresion.
+//config:       Lzop compression/decompresion.
 //config:
 //config:config UNLZOP
-//config:       bool "unlzop"
+//config:       bool "unlzop (13 kb)"
 //config:       default n  # INCOMPAT: upstream lzop does not provide such tool
 //config:       help
-//config:         Lzop decompresion.
+//config:       Lzop decompresion.
 //config:
 //config:config LZOPCAT
-//config:       bool "lzopcat"
+//config:       bool "lzopcat (13 kb)"
 //config:       default n  # INCOMPAT: upstream lzop does not provide such tool
 //config:       help
-//config:         Alias to "unlzop -c".
+//config:       Alias to "lzop -dc".
 //config:
 //config:config LZOP_COMPR_HIGH
 //config:       bool "lzop compression levels 7,8,9 (not very useful)"
 //config:       default n
 //config:       depends on LZOP || UNLZOP || LZOPCAT
 //config:       help
-//config:         High levels (7,8,9) of lzop compression. These levels
-//config:         are actually slower than gzip at equivalent compression ratios
-//config:         and take up 3.2K of code.
+//config:       High levels (7,8,9) of lzop compression. These levels
+//config:       are actually slower than gzip at equivalent compression ratios
+//config:       and take up 3.2K of code.
 
 //applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP))
 //                  APPLET_ODDNAME:name     main  location        suid_type     help
diff --git a/archival/rpm.c b/archival/rpm.c
index 83160f975..98039d499 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -8,10 +8,10 @@
  */
 
 //config:config RPM
-//config:       bool "rpm"
+//config:       bool "rpm (33 kb)"
 //config:       default y
 //config:       help
-//config:         Mini RPM applet - queries and extracts RPM packages.
+//config:       Mini RPM applet - queries and extracts RPM packages.
 
 //applet:IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_RPM) += rpm.o
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 7057570f5..3e4a6a249 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -8,10 +8,10 @@
  */
 
 //config:config RPM2CPIO
-//config:       bool "rpm2cpio"
+//config:       bool "rpm2cpio (20 kb)"
 //config:       default y
 //config:       help
-//config:         Converts a RPM file into a CPIO archive.
+//config:       Converts a RPM file into a CPIO archive.
 
 //applet:IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_RPM2CPIO) += rpm2cpio.o
diff --git a/archival/tar.c b/archival/tar.c
index c11b735d5..4d1db4934 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -42,12 +42,12 @@
  */
 
 //config:config TAR
-//config:       bool "tar"
+//config:       bool "tar (40 kb)"
 //config:       default y
 //config:       help
-//config:         tar is an archiving program. It's commonly used with gzip to
-//config:         create compressed archives. It's probably the most widely used
-//config:         UNIX archive program.
+//config:       tar is an archiving program. It's commonly used with gzip to
+//config:       create compressed archives. It's probably the most widely used
+//config:       UNIX archive program.
 //config:
 //config:config FEATURE_TAR_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -64,35 +64,35 @@
 //config:       default y
 //config:       depends on TAR && (FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA || FEATURE_SEAMLESS_XZ)
 //config:       help
-//config:         With this option tar can automatically detect compressed
-//config:         tarballs. Currently it works only on files (not pipes etc).
+//config:       With this option tar can automatically detect compressed
+//config:       tarballs. Currently it works only on files (not pipes etc).
 //config:
 //config:config FEATURE_TAR_FROM
 //config:       bool "Enable -X (exclude from) and -T (include from) options)"
 //config:       default y
 //config:       depends on TAR
 //config:       help
-//config:         If you enable this option you'll be able to specify
-//config:         a list of files to include or exclude from an archive.
+//config:       If you enable this option you'll be able to specify
+//config:       a list of files to include or exclude from an archive.
 //config:
 //config:config FEATURE_TAR_OLDGNU_COMPATIBILITY
 //config:       bool "Support old tar header format"
 //config:       default y
 //config:       depends on TAR || DPKG
 //config:       help
-//config:         This option is required to unpack archives created in
-//config:         the old GNU format; help to kill this old format by
-//config:         repacking your ancient archives with the new format.
+//config:       This option is required to unpack archives created in
+//config:       the old GNU format; help to kill this old format by
+//config:       repacking your ancient archives with the new format.
 //config:
 //config:config FEATURE_TAR_OLDSUN_COMPATIBILITY
 //config:       bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
 //config:       default y
 //config:       depends on TAR || DPKG
 //config:       help
-//config:         This option is required to unpack archives created by some old
-//config:         version of Sun's tar (it was calculating checksum using signed
-//config:         arithmetic). It is said to be fixed in newer Sun tar, but "old"
-//config:         tarballs still exist.
+//config:       This option is required to unpack archives created by some old
+//config:       version of Sun's tar (it was calculating checksum using signed
+//config:       arithmetic). It is said to be fixed in newer Sun tar, but "old"
+//config:       tarballs still exist.
 //config:
 //config:config FEATURE_TAR_GNU_EXTENSIONS
 //config:       bool "Support GNU tar extensions (long filenames)"
@@ -104,18 +104,18 @@
 //config:       default y
 //config:       depends on TAR && FEATURE_TAR_LONG_OPTIONS
 //config:       help
-//config:         If you enable this option you'll be able to instruct tar to send
-//config:         the contents of each extracted file to the standard input of an
-//config:         external program.
+//config:       If you enable this option you'll be able to instruct tar to send
+//config:       the contents of each extracted file to the standard input of an
+//config:       external program.
 //config:
 //config:config FEATURE_TAR_UNAME_GNAME
 //config:       bool "Enable use of user and group names"
 //config:       default y
 //config:       depends on TAR
 //config:       help
-//config:         Enable use of user and group names in tar. This affects contents
-//config:         listings (-t) and preserving permissions when unpacking (-p).
-//config:         +200 bytes.
+//config:       Enable use of user and group names in tar. This affects contents
+//config:       listings (-t) and preserving permissions when unpacking (-p).
+//config:       +200 bytes.
 //config:
 //config:config FEATURE_TAR_NOPRESERVE_TIME
 //config:       bool "Enable -m (do not preserve time) GNU option"
@@ -127,8 +127,8 @@
 //config:       default n
 //config:       depends on TAR && SELINUX
 //config:       help
-//config:         With this option busybox supports restoring SELinux labels
-//config:         when extracting files from tar archives.
+//config:       With this option busybox supports restoring SELinux labels
+//config:       when extracting files from tar archives.
 
 //applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
 //kbuild:lib-$(CONFIG_TAR) += tar.o
diff --git a/archival/unzip.c b/archival/unzip.c
index 8dfc4e678..4c4feda82 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -17,23 +17,23 @@
  * Zip64 + other methods
  */
 //config:config UNZIP
-//config:       bool "unzip"
+//config:       bool "unzip (24 kb)"
 //config:       default y
 //config:       help
-//config:         unzip will list or extract files from a ZIP archive,
-//config:         commonly found on DOS/WIN systems. The default behavior
-//config:         (with no options) is to extract the archive into the
-//config:         current directory.
+//config:       unzip will list or extract files from a ZIP archive,
+//config:       commonly found on DOS/WIN systems. The default behavior
+//config:       (with no options) is to extract the archive into the
+//config:       current directory.
 //config:
 //config:config FEATURE_UNZIP_CDF
 //config:       bool "Read and use Central Directory data"
 //config:       default y
 //config:       depends on UNZIP
 //config:       help
-//config:         If you know that you only need to deal with simple
-//config:         ZIP files without deleted/updated files, SFX archives etc,
-//config:         you can reduce code size by unselecting this option.
-//config:         To support less trivial ZIPs, say Y.
+//config:       If you know that you only need to deal with simple
+//config:       ZIP files without deleted/updated files, SFX archives etc,
+//config:       you can reduce code size by unselecting this option.
+//config:       To support less trivial ZIPs, say Y.
 //config:
 //config:config FEATURE_UNZIP_BZIP2
 //config:       bool "Support compression method 12 (bzip2)"
@@ -62,6 +62,7 @@
 //usage:     "\n        -l      List contents (with -q for short form)"
 //usage:     "\n        -n      Never overwrite files (default: ask)"
 //usage:     "\n        -o      Overwrite"
+//usage:     "\n        -j      Do not restore paths"
 //usage:     "\n        -p      Print to stdout"
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -x FILE Exclude FILEs"
@@ -320,6 +321,12 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf)
 };
 #endif
 
+static void die_if_bad_fnamesize(unsigned sz)
+{
+        if (sz > 0xfff) /* more than 4k?! no funny business please */
+                bb_error_msg_and_die("bad archive");
+}
+
 static void unzip_skip(off_t skip)
 {
         if (skip != 0)
@@ -337,6 +344,39 @@ static void unzip_create_leading_dirs(const char *fn)
         free(name);
 }
 
+#if ENABLE_FEATURE_UNZIP_CDF
+static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn)
+{
+        char *target;
+
+        die_if_bad_fnamesize(zip->fmt.ucmpsize);
+
+        if (zip->fmt.method == 0) {
+                /* Method 0 - stored (not compressed) */
+                target = xzalloc(zip->fmt.ucmpsize + 1);
+                xread(zip_fd, target, zip->fmt.ucmpsize);
+        } else {
+#if 1
+                bb_error_msg_and_die("compressed symlink is not supported");
+#else
+                transformer_state_t xstate;
+                init_transformer_state(&xstate);
+                xstate.mem_output_size_max = zip->fmt.ucmpsize;
+                /* ...unpack... */
+                if (!xstate.mem_output_buf)
+                        WTF();
+                target = xstate.mem_output_buf;
+                target = xrealloc(target, xstate.mem_output_size + 1);
+                target[xstate.mem_output_size] = '\0';
+#endif
+        }
+//TODO: libbb candidate
+        if (symlink(target, dst_fn))
+                bb_perror_msg_and_die("can't create symlink '%s'", dst_fn);
+        free(target);
+}
+#endif
+
 static void unzip_extract(zip_header_t *zip, int dst_fd)
 {
         transformer_state_t xstate;
@@ -349,12 +389,6 @@ static void unzip_extract(zip_header_t *zip, int dst_fd)
                 return;
         }
 
-// NB: to support symlinks, need to extract symlink target. A-la:
-// xstate.mem_output_size_max = zip->fmt.ucmpsize;
-// ...unpack...
-// if (xstate.mem_output_buf) { success, xstate.mem_output_size is the size }
-// Although archives I've seen have fmt.method == 0 for symlinks.
-
         init_transformer_state(&xstate);
         xstate.bytes_in = zip->fmt.cmpsize;
         xstate.src_fd = zip_fd;
@@ -414,16 +448,32 @@ static void my_fgets80(char *buf80)
         }
 }
 
+static int get_lstat_mode(const char *dst_fn)
+{
+        struct stat stat_buf;
+        if (lstat(dst_fn, &stat_buf) == -1) {
+                if (errno != ENOENT) {
+                        bb_perror_msg_and_die("can't stat '%s'", dst_fn);
+                }
+                /* File does not exist */
+                return -1;
+        }
+        return stat_buf.st_mode;
+}
+
 int unzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unzip_main(int argc, char **argv)
 {
-        enum { O_PROMPT, O_NEVER, O_ALWAYS };
-
+        enum {
+                OPT_l = (1 << 0),
+                OPT_x = (1 << 1),
+                OPT_j = (1 << 2),
+        };
+        unsigned opts;
         smallint quiet = 0;
         IF_NOT_FEATURE_UNZIP_CDF(const) smallint verbose = 0;
-        smallint listing = 0;
+        enum { O_PROMPT, O_NEVER, O_ALWAYS };
         smallint overwrite = O_PROMPT;
-        smallint x_opt_seen;
         uint32_t cdf_offset;
         unsigned long total_usize;
         unsigned long total_size;
@@ -434,9 +484,8 @@ int unzip_main(int argc, char **argv)
         llist_t *zaccept = NULL;
         llist_t *zreject = NULL;
         char *base_dir = NULL;
-        int i, opt;
+        int i;
         char key_buf[80]; /* must match size used by my_fgets80 */
-        struct stat stat_buf;
 
 /* -q, -l and -v: UnZip 5.52 of 28 February 2005, by Info-ZIP:
  *
@@ -479,16 +528,16 @@ int unzip_main(int argc, char **argv)
  *    204372                   1 file
  */
 
-        x_opt_seen = 0;
+        opts = 0;
         /* '-' makes getopt return 1 for non-options */
-        while ((opt = getopt(argc, argv, "-d:lnopqxv")) != -1) {
-                switch (opt) {
+        while ((i = getopt(argc, argv, "-d:lnopqxjv")) != -1) {
+                switch (i) {
                 case 'd':  /* Extract to base directory */
                         base_dir = optarg;
                         break;
 
                 case 'l': /* List */
-                        listing = 1;
+                        opts |= OPT_l;
                         break;
 
                 case 'n': /* Never overwrite existing files */
@@ -508,11 +557,15 @@ int unzip_main(int argc, char **argv)
 
                 case 'v': /* Verbose list */
                         IF_FEATURE_UNZIP_CDF(verbose++;)
-                        listing = 1;
+                        opts |= OPT_l;
                         break;
 
                 case 'x':
-                        x_opt_seen = 1;
+                        opts |= OPT_x;
+                        break;
+
+                case 'j':
+                        opts |= OPT_j;
                         break;
 
                 case 1:
@@ -521,7 +574,7 @@ int unzip_main(int argc, char **argv)
                                 /* +5: space for ".zip" and NUL */
                                 src_fn = xmalloc(strlen(optarg) + 5);
                                 strcpy(src_fn, optarg);
-                        } else if (!x_opt_seen) {
+                        } else if (!(opts & OPT_x)) {
                                 /* Include files */
                                 llist_add_to(&zaccept, optarg);
                         } else {
@@ -589,7 +642,7 @@ int unzip_main(int argc, char **argv)
         if (quiet <= 1) { /* not -qq */
                 if (quiet == 0)
                         printf("Archive:  %s\n", src_fn);
-                if (listing) {
+                if (opts & OPT_l) {
                         puts(verbose ?
                                 " Length   Method    Size  Cmpr    Date    Time   CRC-32   Name\n"
                                 "--------  ------  ------- ---- ---------- ----- --------  ----"
@@ -722,7 +775,6 @@ int unzip_main(int argc, char **argv)
                         if ((cdf.fmt.version_made_by >> 8) == 3) {
                                 /* This archive is created on Unix */
                                 dir_mode = file_mode = (cdf.fmt.external_attributes >> 16);
-//TODO: if (S_ISLNK(file_mode)) this is a symlink
                         }
                 }
 #endif
@@ -740,15 +792,22 @@ int unzip_main(int argc, char **argv)
 
                 /* Read filename */
                 free(dst_fn);
+                die_if_bad_fnamesize(zip.fmt.filename_len);
                 dst_fn = xzalloc(zip.fmt.filename_len + 1);
                 xread(zip_fd, dst_fn, zip.fmt.filename_len);
-
                 /* Skip extra header bytes */
                 unzip_skip(zip.fmt.extra_len);
 
                 /* Guard against "/abspath", "/../" and similar attacks */
                 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
 
+                if (opts & OPT_j) /* Strip paths? */
+                        overlapping_strcpy(dst_fn, bb_basename(dst_fn));
+
+                /* Did this strip everything ("DIR/" case)? Then skip */
+                if (!dst_fn[0])
+                        goto skip_cmpsize;
+
                 /* Filter zip entries */
                 if (find_list_entry(zreject, dst_fn)
                  || (zaccept && !find_list_entry(zaccept, dst_fn))
@@ -756,7 +815,7 @@ int unzip_main(int argc, char **argv)
                         goto skip_cmpsize;
                 }
 
-                if (listing) {
+                if (opts & OPT_l) {
                         /* List entry */
                         char dtbuf[sizeof("mm-dd-yyyy hh:mm")];
                         sprintf(dtbuf, "%02u-%02u-%04u %02u:%02u",
@@ -814,11 +873,11 @@ int unzip_main(int argc, char **argv)
                         goto do_extract;
                 }
                 if (last_char_is(dst_fn, '/')) {
+                        int mode;
+
                         /* Extract directory */
-                        if (stat(dst_fn, &stat_buf) == -1) {
-                                if (errno != ENOENT) {
-                                        bb_perror_msg_and_die("can't stat '%s'", dst_fn);
-                                }
+                        mode = get_lstat_mode(dst_fn);
+                        if (mode == -1) { /* ENOENT */
                                 if (!quiet) {
                                         printf("   creating: %s\n", dst_fn);
                                 }
@@ -827,7 +886,7 @@ int unzip_main(int argc, char **argv)
                                         xfunc_die();
                                 }
                         } else {
-                                if (!S_ISDIR(stat_buf.st_mode)) {
+                                if (!S_ISDIR(mode)) {
                                         bb_error_msg_and_die("'%s' exists but is not a %s",
                                                 dst_fn, "directory");
                                 }
@@ -835,29 +894,33 @@ int unzip_main(int argc, char **argv)
                         goto skip_cmpsize;
                 }
  check_file:
-                /* Extract file */
-                if (stat(dst_fn, &stat_buf) == -1) {
-                        /* File does not exist */
-                        if (errno != ENOENT) {
-                                bb_perror_msg_and_die("can't stat '%s'", dst_fn);
+                /* Does target file already exist? */
+                {
+                        int mode = get_lstat_mode(dst_fn);
+                        if (mode == -1) {
+                                /* ENOENT: does not exist */
+                                goto do_open_and_extract;
                         }
-                        goto do_open_and_extract;
-                }
-                /* File already exists */
-                if (overwrite == O_NEVER) {
-                        goto skip_cmpsize;
-                }
-                if (!S_ISREG(stat_buf.st_mode)) {
-                        /* File is not regular file */
-                        bb_error_msg_and_die("'%s' exists but is not a %s",
-                                dst_fn, "regular file");
+                        if (overwrite == O_NEVER) {
+                                goto skip_cmpsize;
+                        }
+                        if (!S_ISREG(mode)) {
+ fishy:
+                                bb_error_msg_and_die("'%s' exists but is not a %s",
+                                        dst_fn, "regular file");
+                        }
+                        if (overwrite == O_ALWAYS) {
+                                goto do_open_and_extract;
+                        }
+                        printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
+                        my_fgets80(key_buf);
+                        /* User input could take a long time. Is it still a regular file? */
+                        mode = get_lstat_mode(dst_fn);
+                        if (!S_ISREG(mode))
+                                goto fishy;
                 }
-                /* File is regular file */
-                if (overwrite == O_ALWAYS)
-                        goto do_open_and_extract;
-                printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
-                my_fgets80(key_buf);
 
+                /* Extract (or skip) it */
                 switch (key_buf[0]) {
                 case 'A':
                         overwrite = O_ALWAYS;
@@ -865,9 +928,15 @@ int unzip_main(int argc, char **argv)
  do_open_and_extract:
                         unzip_create_leading_dirs(dst_fn);
 #if ENABLE_FEATURE_UNZIP_CDF
-                        dst_fd = xopen3(dst_fn, O_WRONLY | O_CREAT | O_TRUNC, file_mode);
+                        dst_fd = -1;
+                        if (!S_ISLNK(file_mode)) {
+                                dst_fd = xopen3(dst_fn,
+                                        O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW,
+                                        file_mode);
+                        }
 #else
-                        dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC);
+                        /* O_NOFOLLOW defends against symlink attacks */
+                        dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW);
 #endif
  do_extract:
                         if (!quiet) {
@@ -875,10 +944,18 @@ int unzip_main(int argc, char **argv)
                                         ? " extracting: %s\n"
                                         : */ "  inflating: %s\n", dst_fn);
                         }
-                        unzip_extract(&zip, dst_fd);
-                        if (dst_fd != STDOUT_FILENO) {
-                                /* closing STDOUT is potentially bad for future business */
-                                close(dst_fd);
+#if ENABLE_FEATURE_UNZIP_CDF
+                        if (S_ISLNK(file_mode)) {
+                                if (dst_fd != STDOUT_FILENO) /* not -p? */
+                                        unzip_extract_symlink(&zip, dst_fn);
+                        } else
+#endif
+                        {
+                                unzip_extract(&zip, dst_fd);
+                                if (dst_fd != STDOUT_FILENO) {
+                                        /* closing STDOUT is potentially bad for future business */
+                                        close(dst_fd);
+                                }
                         }
                         break;
 
@@ -906,7 +983,7 @@ int unzip_main(int argc, char **argv)
                 total_entries++;
         }
 
-        if (listing && quiet <= 1) {
+        if ((opts & OPT_l) && quiet <= 1) {
                 if (!verbose) {
                         //      "  Length      Date    Time    Name\n"
                         //      "---------  ---------- -----   ----"