21 files changed, 477 insertions, 431 deletions
diff --git a/archival/Config.src b/archival/Config.src
index 13c33c795..76635ba78 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -5,8 +5,6 @@
 menu "Archival Utilities"
-INSERT
 config FEATURE_SEAMLESS_XZ
        bool "Make tar, rpm, modprobe etc understand .xz data"
        default y
@@ -37,353 +35,6 @@ config FEATURE_SEAMLESS_Z
        help
          Make tar, rpm, modprobe etc understand .Z data.
-config AR
+INSERT
-        bool "ar"
-        default n  # needs to be improved to be able to replace binutils ar
-        help
-          ar is an archival utility program used to create, modify, and
-          extract contents from archives. An archive is a single file holding
-          a collection of other files in a structure that makes it possible to
-          retrieve the original individual files (called archive members).
-          The original files' contents, mode (permissions), timestamp, owner,
-          and group are preserved in the archive, and can be restored on
-          extraction.
-          The stored filename is limited to 15 characters. (for more information
-          see long filename support).
-          ar has 60 bytes of overheads for every stored file.
-          This implementation of ar can extract archives, it cannot create or
-          modify them.
-          On an x86 system, the ar applet adds about 1K.
-          Unless you have a specific application which requires ar, you should
-          probably say N here.
-config FEATURE_AR_LONG_FILENAMES
-        bool "Support for long filenames (not needed for debs)"
-        default y
-        depends on AR
-        help
-          By default the ar format can only store the first 15 characters
-          of the filename, this option removes that limitation.
-          It supports the GNU ar long filename method which moves multiple long
-          filenames into a the data section of a new ar entry.
-config FEATURE_AR_CREATE
-        bool "Support archive creation"
-        default y
-        depends on AR
-        help
-          This enables archive creation (-c and -r) with busybox ar.
-config BUNZIP2
-        bool "bunzip2"
-        default y
-        help
-          bunzip2 is a compression utility using the Burrows-Wheeler block
-          sorting text compression algorithm, and Huffman coding. Compression
-          is generally considerably better than that achieved by more
-          conventional LZ77/LZ78-based compressors, and approaches the
-          performance of the PPM family of statistical compressors.
-          Unless you have a specific application which requires bunzip2, you
-          should probably say N here.
-config BZIP2
-        bool "bzip2"
-        default y
-        help
-          bzip2 is a compression utility using the Burrows-Wheeler block
-          sorting text compression algorithm, and Huffman coding. Compression
-          is generally considerably better than that achieved by more
-          conventional LZ77/LZ78-based compressors, and approaches the
-          performance of the PPM family of statistical compressors.
-          Unless you have a specific application which requires bzip2, you
-          should probably say N here.
-config CPIO
-        bool "cpio"
-        default y
-        help
-          cpio is an archival utility program used to create, modify, and
-          extract contents from archives.
-          cpio has 110 bytes of overheads for every stored file.
-          This implementation of cpio can extract cpio archives created in the
-          "newc" or "crc" format, it cannot create or modify them.
-          Unless you have a specific application which requires cpio, you
-          should probably say N here.
-config FEATURE_CPIO_O
-        bool "Support for archive creation"
-        default y
-        depends on CPIO
-        help
-          This implementation of cpio can create cpio archives in the "newc"
-          format only.
-config FEATURE_CPIO_P
-        bool "Support for passthrough mode"
-        default y
-        depends on FEATURE_CPIO_O
-        help
-          Passthrough mode. Rarely used.
-config DPKG
-        bool "dpkg"
-        default n
-        select FEATURE_SEAMLESS_GZ
-        help
-          dpkg is a medium-level tool to install, build, remove and manage
-          Debian packages.
-          This implementation of dpkg has a number of limitations,
-          you should use the official dpkg if possible.
-config DPKG_DEB
-        bool "dpkg_deb"
-        default n
-        select FEATURE_SEAMLESS_GZ
-        help
-          dpkg-deb unpacks and provides information about Debian archives.
-          This implementation of dpkg-deb cannot pack archives.
-          Unless you have a specific application which requires dpkg-deb,
-          say N here.
-config FEATURE_DPKG_DEB_EXTRACT_ONLY
-        bool "Extract only (-x)"
-        default n
-        depends on DPKG_DEB
-        help
-          This reduces dpkg-deb to the equivalent of
-          "ar -p <deb> data.tar.gz | tar -zx". However it saves space as none
-          of the extra dpkg-deb, ar or tar options are needed, they are linked
-          to internally.
-config GUNZIP
-        bool "gunzip"
-        default y
-        help
-          gunzip is used to decompress archives created by gzip.
-          You can use the `-t' option to test the integrity of
-          an archive, without decompressing it.
-config GZIP
-        bool "gzip"
-        default y
-        help
-          gzip is used to compress files.
-          It's probably the most widely used UNIX compression program.
-config FEATURE_GZIP_LONG_OPTIONS
-        bool "Enable long options"
-        default y
-        depends on GZIP && LONG_OPTS
-        help
-          Enable use of long options, increases size by about 106 Bytes
-config GZIP_FAST
-        int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
-        default 0
-        range 0 2
-        depends on GZIP
-        help
-          Enable big memory options for gzip.
-          0: small buffers, small hash-tables
-          1: larger buffers, larger hash-tables
-          2: larger buffers, largest hash-tables
-          Larger models may give slightly better compression
-config LZOP
-        bool "lzop"
-        default y
-        depends on PLATFORM_POSIX || WIN32_NET
-        help
-          Lzop compression/decompresion.
-config LZOP_COMPR_HIGH
-        bool "lzop compression levels 7,8,9 (not very useful)"
-        default n
-        depends on LZOP
-        help
-          High levels (7,8,9) of lzop compression. These levels
-          are actually slower than gzip at equivalent compression ratios
-          and take up 3.2K of code.
-config RPM2CPIO
-        bool "rpm2cpio"
-        default y
-        help
-          Converts a RPM file into a CPIO archive.
-config RPM
-        bool "rpm"
-        default y
-        help
-          Mini RPM applet - queries and extracts RPM packages.
-config TAR
-        bool "tar"
-        default y
-        help
-          tar is an archiving program. It's commonly used with gzip to
-          create compressed archives. It's probably the most widely used
-          UNIX archive program.
-config FEATURE_TAR_CREATE
-        bool "Enable archive creation"
-        default y
-        depends on TAR
-        help
-          If you enable this option you'll be able to create
-          tar archives using the `-c' option.
-config FEATURE_TAR_AUTODETECT
-        bool "Autodetect compressed tarballs"
-        default y
-        depends on TAR && (FEATURE_SEAMLESS_Z || FEATURE_SEAMLESS_GZ || FEATURE_SEAMLESS_BZ2 || FEATURE_SEAMLESS_LZMA || FEATURE_SEAMLESS_XZ)
-        help
-          With this option tar can automatically detect compressed
-          tarballs. Currently it works only on files (not pipes etc).
-config FEATURE_TAR_FROM
-        bool "Enable -X (exclude from) and -T (include from) options)"
-        default y
-        depends on TAR
-        help
-          If you enable this option you'll be able to specify
-          a list of files to include or exclude from an archive.
-config FEATURE_TAR_OLDGNU_COMPATIBILITY
-        bool "Support for old tar header format"
-        default y
-        depends on TAR || DPKG
-        help
-          This option is required to unpack archives created in
-          the old GNU format; help to kill this old format by
-          repacking your ancient archives with the new format.
-config FEATURE_TAR_OLDSUN_COMPATIBILITY
-        bool "Enable untarring of tarballs with checksums produced by buggy Sun tar"
-        default y
-        depends on TAR || DPKG
-        help
-          This option is required to unpack archives created by some old
-          version of Sun's tar (it was calculating checksum using signed
-          arithmetic). It is said to be fixed in newer Sun tar, but "old"
-          tarballs still exist.
-config FEATURE_TAR_GNU_EXTENSIONS
-        bool "Support for GNU tar extensions (long filenames)"
-        default y
-        depends on TAR || DPKG
-        help
-          With this option busybox supports GNU long filenames and
-          linknames.
-config FEATURE_TAR_LONG_OPTIONS
-        bool "Enable long options"
-        default y
-        depends on TAR && LONG_OPTS
-        help
-          Enable use of long options, increases size by about 400 Bytes
-config FEATURE_TAR_TO_COMMAND
-        bool "Support for writing to an external program"
-        default y
-        depends on TAR && FEATURE_TAR_LONG_OPTIONS
-        help
-          If you enable this option you'll be able to instruct tar to send
-          the contents of each extracted file to the standard input of an
-          external program.
-config FEATURE_TAR_UNAME_GNAME
-        bool "Enable use of user and group names"
-        default y
-        depends on TAR
-        help
-          Enables use of user and group names in tar. This affects contents
-          listings (-t) and preserving permissions when unpacking (-p).
-          +200 bytes.
-config FEATURE_TAR_NOPRESERVE_TIME
-        bool "Enable -m (do not preserve time) option"
-        default y
-        depends on TAR
-        help
-          With this option busybox supports GNU tar -m
-          (do not preserve time) option.
-config FEATURE_TAR_SELINUX
-        bool "Support for extracting SELinux labels"
-        default n
-        depends on TAR && SELINUX
-        help
-          With this option busybox supports restoring SELinux labels
-          when extracting files from tar archives.
-config UNCOMPRESS
-        bool "uncompress"
-        default n
-        help
-          uncompress is used to decompress archives created by compress.
-          Not much used anymore, replaced by gzip/gunzip.
-config UNLZMA
-        bool "unlzma"
-        default y
-        help
-          unlzma is a compression utility using the Lempel-Ziv-Markov chain
-          compression algorithm, and range coding. Compression
-          is generally considerably better than that achieved by the bzip2
-          compressors.
-          The BusyBox unlzma applet is limited to decompression only.
-          On an x86 system, this applet adds about 4K.
-config FEATURE_LZMA_FAST
-        bool "Optimize unlzma for speed"
-        default n
-        depends on UNLZMA
-        help
-          This option reduces decompression time by about 25% at the cost of
-          a 1K bigger binary.
-config LZMA
-        bool "Provide lzma alias which supports only unpacking"
-        default y
-        depends on UNLZMA
-        help
-          Enable this option if you want commands like "lzma -d" to work.
-          IOW: you'll get lzma applet, but it will always require -d option.
-config UNXZ
-        bool "unxz"
-        default y
-        help
-          unxz is a unlzma successor.
-config XZ
-        bool "Provide xz alias which supports only unpacking"
-        default y
-        depends on UNXZ
-        help
-          Enable this option if you want commands like "xz -d" to work.
-          IOW: you'll get xz applet, but it will always require -d option.
-config UNZIP
-        bool "unzip"
-        default y
-        help
-          unzip will list or extract files from a ZIP archive,
-          commonly found on DOS/WIN systems. The default behavior
-          (with no options) is to extract the archive into the
-          current directory. Use the `-d' option to extract to a
-          directory of your choice.
 endmenu
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index 3466452f7..a6fd2eac0 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -9,22 +9,3 @@ libs-y				+= libarchive/
 lib-y:=
 INSERT
-lib-$(CONFIG_AR)                += ar.o
-lib-$(CONFIG_CPIO)              += cpio.o
-lib-$(CONFIG_DPKG)              += dpkg.o
-lib-$(CONFIG_DPKG_DEB)          += dpkg_deb.o
-lib-$(CONFIG_RPM2CPIO)          += rpm2cpio.o
-lib-$(CONFIG_RPM)               += rpm.o
-lib-$(CONFIG_TAR)               += tar.o
-lib-$(CONFIG_UNZIP)             += unzip.o
-lib-$(CONFIG_LZOP)              += lzop.o bbunzip.o
-lib-$(CONFIG_GZIP)              += gzip.o bbunzip.o
-lib-$(CONFIG_BZIP2)             += bzip2.o bbunzip.o
-lib-$(CONFIG_UNXZ)              += bbunzip.o
-lib-$(CONFIG_UNLZMA)            += bbunzip.o
-lib-$(CONFIG_BUNZIP2)           += bbunzip.o
-lib-$(CONFIG_GUNZIP)            += bbunzip.o
-lib-$(CONFIG_UNCOMPRESS)        += bbunzip.o
diff --git a/archival/ar.c b/archival/ar.c
index 88236e878..f86c52d9b 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -17,6 +17,49 @@
 * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
 */
+//config:config AR
+//config:       bool "ar"
+//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:         a collection of other files in a structure that makes it possible to
+//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:
+//config:config FEATURE_AR_LONG_FILENAMES
+//config:       bool "Support for 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:
+//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.
+//applet:IF_AR(APPLET(ar, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_AR) += ar.o
 //usage:#define ar_trivial_usage
 //usage:       "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
 //usage:#define ar_full_usage "\n\n"
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 9d1cd9485..3de8e1d48 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -7,6 +7,9 @@
 #include "libbb.h"
 #include "bb_archive.h"
+/* lzop_main() uses bbunpack(), need this: */
+//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o
 /* Note: must be kept in sync with archival/lzop.c */
 enum {
        OPT_STDOUT     = 1 << 0,
@@ -207,7 +210,6 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 //usage:#define uncompress_trivial_usage
 //usage:       "[-cf] [FILE]..."
 //usage:#define uncompress_full_usage "\n\n"
@@ -215,6 +217,15 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //usage:     "\n        -c      Write to stdout"
 //usage:     "\n        -f      Overwrite"
+//config:config UNCOMPRESS
+//config:       bool "uncompress"
+//config:       default n
+//config:       help
+//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
 #if ENABLE_UNCOMPRESS
 static
 IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(transformer_aux_data_t *aux)
@@ -255,11 +266,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 * Portions of the lzw code are derived from the public domain 'compress'
 * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies,
 * Ken Turkowski, Dave Mack and Peter Jannesen.
- *
- * See the license_msg below and the file COPYING for the software license.
- * See the file algorithm.doc for the compression algorithms and file formats.
 */
 //usage:#define gunzip_trivial_usage
 //usage:       "[-cft] [FILE]..."
 //usage:#define gunzip_full_usage "\n\n"
@@ -280,6 +287,18 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define zcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
+//config:config GUNZIP
+//config:       bool "gunzip"
+//config:       default y
+//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.
+//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))
+//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
+//kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
 #if ENABLE_GUNZIP
 static
 char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM)
@@ -358,8 +377,24 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "[FILE]..."
 //usage:#define bzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
+//config:config BUNZIP2
+//config:       bool "bunzip2"
+//config:       default y
+//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:
+//config:         Unless you have a specific application which requires bunzip2, you
+//config:         should probably say N here.
 //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
 //applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat))
+//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
+//kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o
 #if ENABLE_BUNZIP2
 static
 IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_aux_data_t *aux)
@@ -387,7 +422,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 *
 * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 //usage:#define unlzma_trivial_usage
 //usage:       "[-cf] [FILE]..."
 //usage:#define unlzma_full_usage "\n\n"
@@ -428,6 +462,38 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define xzcat_full_usage "\n\n"
 //usage:       "Decompress to stdout"
+//config:config UNLZMA
+//config:       bool "unlzma"
+//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:
+//config:config FEATURE_LZMA_FAST
+//config:       bool "Optimize unlzma for speed"
+//config:       default n
+//config:       depends on UNLZMA
+//config:       help
+//config:         This option reduces decompression time by about 25% at the cost of
+//config:         a 1K bigger binary.
+//config:
+//config:config LZMA
+//config:       bool "Provide lzma alias which supports only unpacking"
+//config:       default y
+//config:       depends on UNLZMA
+//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.
+//applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat))
+//applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma))
+//kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o
 #if ENABLE_UNLZMA
 static
 IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_aux_data_t *aux)
@@ -453,6 +519,24 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 #endif
+//config:config UNXZ
+//config:       bool "unxz"
+//config:       default y
+//config:       help
+//config:         unxz is a unlzma successor.
+//config:
+//config:config XZ
+//config:       bool "Provide xz alias which supports only unpacking"
+//config:       default y
+//config:       depends on UNXZ
+//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.
+//applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_UNXZ(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat))
+//applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz))
+//kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o
 #if ENABLE_UNXZ
 static
 IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_aux_data_t *aux)
diff --git a/archival/bzip2.c b/archival/bzip2.c
index dd77c8efc..f7718b411 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -7,6 +7,22 @@
 * about bzip2 library code.
 */
+//config:config BZIP2
+//config:       bool "bzip2"
+//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:
+//config:         Unless you have a specific application which requires bzip2, you
+//config:         should probably say N here.
+//applet:IF_BZIP2(APPLET(bzip2, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_BZIP2) += bzip2.o
 //usage:#define bzip2_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define bzip2_full_usage "\n\n"
diff --git a/archival/cpio.c b/archival/cpio.c
index 699c6dbb7..1cce7c8b4 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -9,11 +9,42 @@
 * Limitations:
 * Doesn't check CRC's
 * Only supports new ASCII and CRC formats
- *
 */
 #include "libbb.h"
 #include "bb_archive.h"
+//config:config CPIO
+//config:       bool "cpio"
+//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:
+//config:         This implementation of cpio can extract cpio archives created in the
+//config:         "newc" or "crc" format, it cannot create or modify them.
+//config:
+//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 for 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:
+//config:config FEATURE_CPIO_P
+//config:       bool "Support for passthrough mode"
+//config:       default y
+//config:       depends on FEATURE_CPIO_O
+//config:       help
+//config:         Passthrough mode. Rarely used.
+//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_CPIO) += cpio.o
 //usage:#define cpio_trivial_usage
 //usage:       "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]")
 //usage:       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
diff --git a/archival/dpkg.c b/archival/dpkg.c
index ed86f3355..2893cfc2d 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -14,7 +14,6 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /*
 * known difference between busybox dpkg and the official dpkg that i don't
 * consider important, its worth keeping a note of differences anyway, just to
@@ -25,9 +24,22 @@
 *
 * bugs that need to be fixed
 *  - (unknown, please let me know when you find any)
- *
 */
+//config:config DPKG
+//config:       bool "dpkg"
+//config:       default n
+//config:       select FEATURE_SEAMLESS_GZ
+//config:       help
+//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.
+//applet:IF_DPKG(APPLET(dpkg, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_DPKG) += dpkg.o
 //usage:#define dpkg_trivial_usage
 //usage:       "[-ilCPru] [-F OPT] PACKAGE"
 //usage:#define dpkg_full_usage "\n\n"
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index a04ec9407..13f9db991 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -5,8 +5,33 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
+//config:config DPKG_DEB
+//config:       bool "dpkg_deb"
+//config:       default n
+//config:       select FEATURE_SEAMLESS_GZ
+//config:       help
+//config:         dpkg-deb unpacks and provides information about Debian archives.
+//config:
+//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:
+//config:config FEATURE_DPKG_DEB_EXTRACT_ONLY
+//config:       bool "Extract only (-x)"
+//config:       default n
+//config:       depends on DPKG_DEB
+//config:       help
+//config:         This reduces dpkg-deb to the equivalent of
+//config:         "ar -p <deb> data.tar.gz | tar -zx". However it saves space as none
+//config:         of the extra dpkg-deb, ar or tar options are needed, they are linked
+//config:         to internally.
+//applet:IF_DPKG_DEB(APPLET_ODDNAME(dpkg-deb, dpkg_deb, BB_DIR_USR_BIN, BB_SUID_DROP, dpkg_deb))
+//kbuild:lib-$(CONFIG_DPKG_DEB) += dpkg_deb.o
 //usage:#define dpkg_deb_trivial_usage
-//usage:       "[-cefxX] FILE [argument"
+//usage:       "[-cefxX] FILE [argument]"
 //usage:#define dpkg_deb_full_usage "\n\n"
 //usage:       "Perform actions on Debian packages (.debs)\n"
 //usage:     "\n        -c      List contents of filesystem tree"
diff --git a/archival/gzip.c b/archival/gzip.c
index 31ccab3cd..1e779c9c3 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -15,7 +15,6 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /* big objects in bss:
 * 00000020 b bl_count
 * 00000074 b base_length
@@ -31,7 +30,6 @@
 * 00000480 b static_ltree
 * 000008f4 b dyn_ltree
 */
 /* TODO: full support for -v for DESKTOP
 * "/usr/bin/gzip -v a bogus aa" should say:
 a:       85.1% -- replaced with a.gz
@@ -39,6 +37,35 @@ gzip: bogus: No such file or directory
 aa:      85.1% -- replaced with aa.gz
 */
+//config:config GZIP
+//config:       bool "gzip"
+//config:       default y
+//config:       help
+//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"
+//config:       default y
+//config:       depends on GZIP && LONG_OPTS
+//config:       help
+//config:         Enable use of long options, increases size by about 106 Bytes
+//config:
+//config:config GZIP_FAST
+//config:       int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
+//config:       default 0
+//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
+//applet:IF_GZIP(APPLET(gzip, BB_DIR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_GZIP) += gzip.o
 //usage:#define gzip_trivial_usage
 //usage:       "[-cfd] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index e9f1afdaf..23de9d3f5 100644
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -249,7 +249,7 @@ void generateMTFValues(EState* s)
 static NOINLINE
 void sendMTFValues(EState* s)
 {
-        int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
+        int32_t v, t, i, j, gs, ge, bt, bc, iter;
        int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
        int32_t nGroups;
@@ -345,7 +345,6 @@ void sendMTFValues(EState* s)
                }
 #endif
                nSelectors = 0;
-                totc = 0;
                gs = 0;
                while (1) {
                        /*--- Set group start & end marks. --*/
@@ -411,7 +410,6 @@ void sendMTFValues(EState* s)
                                        bt = t;
                                }
                        }
-                        totc += bc;
                        fave[bt]++;
                        s->selector[nSelectors] = bt;
                        nSelectors++;
@@ -501,14 +499,14 @@ void sendMTFValues(EState* s)
                for (i = 0; i < 16; i++) {
                        if (sizeof(long) <= 4) {
                                inUse16 = inUse16*2 +
-                                        ((*(uint32_t*)&(s->inUse[i * 16 + 0])
+                                        ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0])
-                                        | *(uint32_t*)&(s->inUse[i * 16 + 4])
+                                        | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4])
-                                        | *(uint32_t*)&(s->inUse[i * 16 + 8])
+                                        | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8])
-                                        | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
+                                        | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
                        } else { /* Our CPU can do better */
                                inUse16 = inUse16*2 +
-                                        ((*(uint64_t*)&(s->inUse[i * 16 + 0])
+                                        ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0])
-                                        | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
+                                        | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
                        }
                }
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index dc252bb82..6396fe40d 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -42,6 +42,12 @@
 #include "libbb.h"
 #include "bb_archive.h"
+#if 0
+# define dbg(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg(...) ((void)0)
+#endif
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
 #define GROUP_SIZE          50      /* 64 would have been more efficient */
@@ -52,13 +58,13 @@
 /* Status return values */
 #define RETVAL_OK                       0
-#define RETVAL_LAST_BLOCK               (-1)
+#define RETVAL_LAST_BLOCK               (dbg("%d", __LINE__), -1)
-#define RETVAL_NOT_BZIP_DATA            (-2)
+#define RETVAL_NOT_BZIP_DATA            (dbg("%d", __LINE__), -2)
-#define RETVAL_UNEXPECTED_INPUT_EOF     (-3)
+#define RETVAL_UNEXPECTED_INPUT_EOF     (dbg("%d", __LINE__), -3)
-#define RETVAL_SHORT_WRITE              (-4)
+#define RETVAL_SHORT_WRITE              (dbg("%d", __LINE__), -4)
-#define RETVAL_DATA_ERROR               (-5)
+#define RETVAL_DATA_ERROR               (dbg("%d", __LINE__), -5)
-#define RETVAL_OUT_OF_MEMORY            (-6)
+#define RETVAL_OUT_OF_MEMORY            (dbg("%d", __LINE__), -6)
-#define RETVAL_OBSOLETE_INPUT           (-7)
+#define RETVAL_OBSOLETE_INPUT           (dbg("%d", __LINE__), -7)
 /* Other housekeeping constants */
 #define IOBUF_SIZE          4096
@@ -440,7 +446,11 @@ static int get_next_block(bunzip_data *bd)
                   literal used is the one at the head of the mtfSymbol array.) */
                if (runPos != 0) {
                        uint8_t tmp_byte;
-                        if (dbufCount + runCnt >= dbufSize) return RETVAL_DATA_ERROR;
+                        if (dbufCount + runCnt > dbufSize) {
+                                dbg("dbufCount:%d+runCnt:%d %d > dbufSize:%d RETVAL_DATA_ERROR",
+                                                dbufCount, runCnt, dbufCount + runCnt, dbufSize);
+                                return RETVAL_DATA_ERROR;
+                        }
                        tmp_byte = symToByte[mtfSymbol[0]];
                        byteCount[tmp_byte] += runCnt;
                        while (--runCnt >= 0) dbuf[dbufCount++] = (uint32_t)tmp_byte;
@@ -808,7 +818,6 @@ static char *const bunzip_errors[] = {
 /* Dumb little test thing, decompress stdin to stdout */
 int main(int argc, char **argv)
 {
-        int i;
        char c;
        int i = unpack_bz2_stream(0, 1);
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 4e6b138c3..7c6f38ec3 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -336,7 +336,7 @@ static int huft_build(const unsigned *b, const unsigned n,
        }
        /* Find minimum and maximum length, bound *m by those */
-        for (j = 1; (c[j] == 0) && (j <= BMAX); j++)
+        for (j = 1; (j <= BMAX) && (c[j] == 0); j++)
                continue;
        k = j; /* minimum code length */
        for (i = BMAX; (c[i] == 0) && i; i--)
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 23c412496..c66bb3ee7 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -8,11 +8,19 @@
 #include "bb_archive.h"
 #include "ar.h"
-static unsigned read_num(const char *str, int base)
+/* WARNING: Clobbers str[len], so fields must be read in reverse order! */
+static unsigned read_num(char *str, int base, int len)
 {
+        int err;
+        /* ar fields are fixed length text strings (padded with spaces).
+         * Ensure bb_strtou doesn't read past the field in case the full
+         * width is used. */
+        str[len] = 0;
        /* This code works because
         * on misformatted numbers bb_strtou returns all-ones */
-        int err = bb_strtou(str, NULL, base);
+        err = bb_strtou(str, NULL, base);
        if (err == -1)
                bb_error_msg_and_die("invalid ar header");
        return err;
@@ -51,11 +59,13 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
        if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n')
                bb_error_msg_and_die("invalid ar header");
-        /* FIXME: more thorough routine would be in order here
+        /*
-         * (we have something like that in tar)
+         * Note that the fields MUST be read in reverse order as
-         * but for now we are lax. */
+         * read_num() clobbers the next byte after the field!
-        ar.formatted.magic[0] = '\0'; /* else 4G-2 file will have size="4294967294`\n..." */
+         * Order is: name, date, uid, gid, mode, size, magic.
-        typed->size = size = read_num(ar.formatted.size, 10);
+         */
+        typed->size = size = read_num(ar.formatted.size, 10,
+                                      sizeof(ar.formatted.size));
        /* special filenames have '/' as the first character */
        if (ar.formatted.name[0] == '/') {
@@ -87,10 +97,10 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
         * long filename pseudo file. Thus we decode the rest
         * after dealing with long filename pseudo file.
         */
-        typed->mode = read_num(ar.formatted.mode, 8);
+        typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode));
-        typed->mtime = read_num(ar.formatted.date, 10);
+        typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid));
-        typed->uid = read_num(ar.formatted.uid, 10);
+        typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid));
-        typed->gid = read_num(ar.formatted.gid, 10);
+        typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date));
 #if ENABLE_FEATURE_AR_LONG_FILENAMES
        if (ar.formatted.name[0] == '/') {
@@ -98,7 +108,8 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
                /* The number after the '/' indicates the offset in the ar data section
                 * (saved in ar_long_names) that conatains the real filename */
-                long_offset = read_num(&ar.formatted.name[1], 10);
+                long_offset = read_num(&ar.formatted.name[1], 10,
+                                       sizeof(ar.formatted.name) - 1);
                if (long_offset >= ar_long_name_size) {
                        bb_error_msg_and_die("can't resolve long filename");
                }
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index bc09756ba..32f842095 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -198,13 +198,13 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         * the message and we don't check whether we indeed
         * saw zero block directly before this. */
        if (i == 0) {
-                xfunc_error_retval = 0;
+                bb_error_msg("short read");
- short_read:
+                /* this merely signals end of archive, not exit(1): */
-                bb_error_msg_and_die("short read");
+                return EXIT_FAILURE;
        }
        if (i != 512) {
                IF_FEATURE_TAR_AUTODETECT(goto autodetect;)
-                goto short_read;
+                bb_error_msg_and_die("short read");
        }
 #else
@@ -221,10 +221,10 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                         */
                        while (full_read(archive_handle->src_fd, &tar, 512) == 512)
                                continue;
-                        return EXIT_FAILURE;
+                        return EXIT_FAILURE; /* "end of archive" */
                }
                archive_handle->tar__end = 1;
-                return EXIT_SUCCESS;
+                return EXIT_SUCCESS; /* "decoded one header" */
        }
        archive_handle->tar__end = 0;
@@ -471,5 +471,5 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
        free(file_header->tar__uname);
        free(file_header->tar__gname);
 #endif
-        return EXIT_SUCCESS;
+        return EXIT_SUCCESS; /* "decoded one header" */
 }
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 897132987..2b490ae83 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -94,7 +94,7 @@ typedef struct {
        ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) )
 #if defined(LZO_UNALIGNED_OK_2)
-#  define HEAD2(b,p)      (* (uint16_t *) &(b[p]))
+#  define HEAD2(b,p)      (* (bb__aliased_uint16_t *) &(b[p]))
 #else
 #  define HEAD2(b,p)      (b[p] ^ ((unsigned)b[p+1]<<8))
 #endif
@@ -466,7 +466,6 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s,
        }
        s->m_len = 1;
-        s->m_len = 1;
 #ifdef SWD_BEST_OFF
        if (s->use_best_off)
                memset(s->best_pos, 0, sizeof(s->best_pos));
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 841e9dce9..c4e02f0f7 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -81,16 +81,17 @@ void FAST_FUNC open_transformer(int fd, const char *transform_prog)
                // FIXME: error check?
 #if BB_MMU
                {
+                        IF_DESKTOP(long long) int r;
                        transformer_aux_data_t aux;
                        init_transformer_aux_data(&aux);
                        aux.check_signature = check_signature;
-                        transformer(&aux, fd, fd_pipe.wr);
+                        r = transformer(&aux, fd, fd_pipe.wr);
                        if (ENABLE_FEATURE_CLEAN_UP) {
                                close(fd_pipe.wr); /* send EOF */
                                close(fd);
                        }
                        /* must be _exit! bug was actually seen here */
-                        _exit(EXIT_SUCCESS);
+                        _exit(/*error if:*/ r < 0);
                }
 #else
                {
diff --git a/archival/lzop.c b/archival/lzop.c
index 9b42e5fd3..5062d9300 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -25,6 +25,26 @@
   "Minimalized" for busybox by Alain Knaff
 */
+//config:config LZOP
+//config:       bool "lzop"
+//config:       default y
+//config:       help
+//config:         Lzop compression/decompresion.
+//config:
+//config:config LZOP_COMPR_HIGH
+//config:       bool "lzop compression levels 7,8,9 (not very useful)"
+//config:       default n
+//config:       depends on LZOP
+//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.
+//applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_LZOP(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
+//applet:IF_LZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop))
+//kbuild:lib-$(CONFIG_LZOP) += lzop.o
 //usage:#define lzop_trivial_usage
 //usage:       "[-cfvd123456789CF] [FILE]..."
 //usage:#define lzop_full_usage "\n\n"
diff --git a/archival/rpm.c b/archival/rpm.c
index 86ba4dca4..885eddd64 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -7,6 +7,15 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
+//config:config RPM
+//config:       bool "rpm"
+//config:       default y
+//config:       help
+//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
 //usage:#define rpm_trivial_usage
 //usage:       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
 //usage:#define rpm_full_usage "\n\n"
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index f3dfa5159..61adde795 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -7,6 +7,15 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
+//config:config RPM2CPIO
+//config:       bool "rpm2cpio"
+//config:       default y
+//config:       help
+//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
 //usage:#define rpm2cpio_trivial_usage
 //usage:       "package.rpm"
 //usage:#define rpm2cpio_full_usage "\n\n"
diff --git a/archival/tar.c b/archival/tar.c
index 3129781d2..2909eca1b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -22,7 +22,6 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /* TODO: security with -C DESTDIR option can be enhanced.
 * Consider tar file created via:
 * $ tar cvf bug.tar anything.txt
@@ -42,6 +41,109 @@
 * This doesn't feel right, and IIRC GNU tar doesn't do that.
 */
+//config:config TAR
+//config:       bool "tar"
+//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:
+//config:config FEATURE_TAR_CREATE
+//config:       bool "Enable archive creation"
+//config:       default y
+//config:       depends on TAR
+//config:       help
+//config:         If you enable this option you'll be able to create
+//config:         tar archives using the `-c' option.
+//config:
+//config:config FEATURE_TAR_AUTODETECT
+//config:       bool "Autodetect compressed tarballs"
+//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:
+//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:
+//config:config FEATURE_TAR_OLDGNU_COMPATIBILITY
+//config:       bool "Support for 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:
+//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:
+//config:config FEATURE_TAR_GNU_EXTENSIONS
+//config:       bool "Support for GNU tar extensions (long filenames)"
+//config:       default y
+//config:       depends on TAR || DPKG
+//config:       help
+//config:         With this option busybox supports GNU long filenames and
+//config:         linknames.
+//config:
+//config:config FEATURE_TAR_LONG_OPTIONS
+//config:       bool "Enable long options"
+//config:       default y
+//config:       depends on TAR && LONG_OPTS
+//config:       help
+//config:         Enable use of long options, increases size by about 400 Bytes
+//config:
+//config:config FEATURE_TAR_TO_COMMAND
+//config:       bool "Support for writing to an external program"
+//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:
+//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:         Enables 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) option"
+//config:       default y
+//config:       depends on TAR
+//config:       help
+//config:         With this option busybox supports GNU tar -m
+//config:         (do not preserve time) option.
+//config:
+//config:config FEATURE_TAR_SELINUX
+//config:       bool "Support for extracting SELinux labels"
+//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.
+//applet:IF_TAR(APPLET(tar, BB_DIR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_TAR) += tar.o
 #include <fnmatch.h>
 #include "libbb.h"
 #include "bb_archive.h"
@@ -1096,8 +1198,14 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                /*tar_handle->offset = 0; - already is */
        }
+        /* Zero processed headers (== empty file) is not a valid tarball.
+         * We (ab)use bb_got_signal as exitcode here,
+         * because check_errors_in_children() uses _it_ as error indicator.
+         */
+        bb_got_signal = EXIT_FAILURE;
        while (get_header_tar(tar_handle) == EXIT_SUCCESS)
-                continue;
+                bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */
        /* Check that every file that should have been extracted was */
        while (tar_handle->accept) {
@@ -1113,8 +1221,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                close(tar_handle->src_fd);
        if (SEAMLESS_COMPRESSION || OPT_COMPRESS) {
+                /* Set bb_got_signal to 1 if a child died with !0 exitcode */
                check_errors_in_children(0);
-                return bb_got_signal;
        }
-        return EXIT_SUCCESS;
+        return bb_got_signal;
 }
diff --git a/archival/unzip.c b/archival/unzip.c
index 673e5fe08..fcfc9a448 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -9,16 +9,27 @@
 *
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /* For reference see
 * http://www.pkware.com/company/standards/appnote/
 * http://www.info-zip.org/pub/infozip/doc/appnote-iz-latest.zip
- */
+ *
+ * TODO
-/* TODO
 * Zip64 + other methods
 */
+//config:config UNZIP
+//config:       bool "unzip"
+//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. Use the `-d' option to extract to a
+//config:         directory of your choice.
+//applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 //usage:#define unzip_trivial_usage
 //usage:       "[-lnopq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"