5 files changed, 141 insertions, 95 deletions

diff --git a/archival/Config.src b/archival/Config.src
index a9afaea5b..5e7cfc0a4 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -30,7 +30,7 @@ config FEATURE_SEAMLESS_GZ
           Make tar, rpm, modprobe etc understand .gz data.
 
 config FEATURE_SEAMLESS_Z
-        bool "tar, rpm, modprobe etc understand .Z data"
+        bool "Make tar, rpm, modprobe etc understand .Z data"
         default n  # it is ancient
         help
           Make tar, rpm, modprobe etc understand .Z data.
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 3a483219d..e1eec6d4b 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -293,18 +293,24 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //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:       default y
+//config:       help
+//config:         Alias to "gunzip -c".
+//config:
 //config:config FEATURE_GUNZIP_LONG_OPTIONS
 //config:       bool "Enable long options"
 //config:       default y
-//config:       depends on GUNZIP && LONG_OPTS
+//config:       depends on (GUNZIP || ZCAT) && LONG_OPTS
 //config:       help
 //config:         Enable use of long options.
 
 //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP))
-//applet:IF_GUNZIP(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
-//kbuild:lib-$(CONFIG_GZIP) += bbunzip.o
+//applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
 //kbuild:lib-$(CONFIG_GUNZIP) += bbunzip.o
-#if ENABLE_GUNZIP
+//kbuild:lib-$(CONFIG_ZCAT) += bbunzip.o
+#if ENABLE_GUNZIP || ENABLE_ZCAT
 static
 char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM)
 {
@@ -367,7 +373,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 (applet_name[1] == 'c')
+        if (ENABLE_ZCAT && applet_name[1] == 'c')
                 option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
 
         return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
@@ -404,18 +410,24 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //config:
 //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:       default y
+//config:       help
+//config:         Alias to "bunzip2 -c".
 
 //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
+//applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat))
 //kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o
-#if ENABLE_BUNZIP2
+//kbuild:lib-$(CONFIG_BZCAT) += bbunzip.o
+#if ENABLE_BUNZIP2 || ENABLE_BZCAT
 int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 {
         getopt32(argv, "cfvqdt");
         argv += optind;
-        if (applet_name[2] == 'c') /* bzcat */
+        if (ENABLE_BZCAT && applet_name[2] == 'c') /* bzcat */
                 option_mask32 |= OPT_STDOUT;
 
         return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");
@@ -483,27 +495,40 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //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:config LZCAT
+//config:       bool "lzcat"
+//config:       default y
 //config:       help
-//config:         This option reduces decompression time by about 25% at the cost of
-//config:         a 1K bigger binary.
+//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 LZMA
-//config:       bool "Provide lzma alias which supports only unpacking"
+//config:       bool "lzma -d"
 //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.
+//config:
+//config:config FEATURE_LZMA_FAST
+//config:       bool "Optimize unlzma 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.
 
 //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_LZCAT(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
+//kbuild:lib-$(CONFIG_LZCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_LZMA) += bbunzip.o
+#if ENABLE_UNLZMA || ENABLE_LZCAT || ENABLE_LZMA
 int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unlzma_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -514,7 +539,7 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
 # endif
         /* lzcat? */
-        if (applet_name[2] == 'c')
+        if (ENABLE_LZCAT && applet_name[2] == 'c')
                 option_mask32 |= OPT_STDOUT;
 
         argv += optind;
@@ -529,19 +554,26 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv)
 //config:       help
 //config:         unxz is a unlzma successor.
 //config:
+//config:config XZCAT
+//config:       bool "xzcat"
+//config:       default y
+//config:       help
+//config:         Alias to "unxz -c".
+//config:
 //config:config XZ
-//config:       bool "Provide xz alias which supports only unpacking"
+//config:       bool "xz -d"
 //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_XZCAT(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
+//kbuild:lib-$(CONFIG_XZCAT) += bbunzip.o
+//kbuild:lib-$(CONFIG_XZ) += bbunzip.o
+#if ENABLE_UNXZ || ENABLE_XZCAT || ENABLE_XZ
 int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unxz_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -552,7 +584,7 @@ int unxz_main(int argc UNUSED_PARAM, char **argv)
                 bb_show_usage();
 # endif
         /* xzcat? */
-        if (applet_name[2] == 'c')
+        if (ENABLE_XZCAT && applet_name[2] == 'c')
                 option_mask32 |= OPT_STDOUT;
 
         argv += optind;
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 0285273fe..86850469d 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -16,29 +16,20 @@
 //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 [DIR]"
 //usage:#define dpkg_deb_full_usage "\n\n"
-//usage:       "Perform actions on Debian packages (.debs)\n"
-//usage:     "\n        -c      List contents of filesystem tree"
-//usage:     "\n        -e      Extract control files to [argument] directory"
-//usage:     "\n        -f      Display control field name starting with [argument]"
-//usage:     "\n        -x      Extract packages filesystem tree to directory"
-//usage:     "\n        -X      Verbose extract"
+//usage:       "Perform actions on Debian packages (.deb)\n"
+//usage:     "\n        -c      List files"
+//usage:     "\n        -f      Print control fields"
+//usage:     "\n        -e      Extract control files to DIR (default: ./DEBIAN)"
+//usage:     "\n        -x      Extract files to DIR (no default)"
+//usage:     "\n        -X      Verbose -x"
 //usage:
 //usage:#define dpkg_deb_example_usage
 //usage:       "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
@@ -49,18 +40,17 @@
 #define DPKG_DEB_OPT_CONTENTS         1
 #define DPKG_DEB_OPT_CONTROL          2
 #define DPKG_DEB_OPT_FIELD            4
-#define DPKG_DEB_OPT_EXTRACT          8
-#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16
+#define DPKG_DEB_OPT_EXTRACT_VERBOSE  8
+#define DPKG_DEB_OPT_EXTRACT         16
 
 int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dpkg_deb_main(int argc, char **argv)
+int dpkg_deb_main(int argc UNUSED_PARAM, char **argv)
 {
         archive_handle_t *ar_archive;
         archive_handle_t *tar_archive;
         llist_t *control_tar_llist = NULL;
         unsigned opt;
         const char *extract_dir;
-        int need_args;
 
         /* Setup the tar archive handle */
         tar_archive = init_handle();
@@ -89,53 +79,45 @@ int dpkg_deb_main(int argc, char **argv)
         llist_add_to(&control_tar_llist, (char*)"control.tar.xz");
 #endif
 
-        opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
+        /* Must have 1 or 2 args */
+        opt_complementary = "-1:?2:c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
         opt = getopt32(argv, "cefXx");
         argv += optind;
-        argc -= optind;
+        //argc -= optind;
 
-        if (opt & DPKG_DEB_OPT_CONTENTS) {
+        extract_dir = argv[1];
+        if (opt & DPKG_DEB_OPT_CONTENTS) { // -c
                 tar_archive->action_header = header_verbose_list;
+                if (extract_dir)
+                        bb_show_usage();
         }
-        extract_dir = NULL;
-        need_args = 1;
-        if (opt & DPKG_DEB_OPT_CONTROL) {
-                ar_archive->accept = control_tar_llist;
-                tar_archive->action_data = data_extract_all;
-                if (1 == argc) {
-                        extract_dir = "./DEBIAN";
-                } else {
-                        need_args++;
-                }
-        }
-        if (opt & DPKG_DEB_OPT_FIELD) {
-                /* Print the entire control file
-                 * it should accept a second argument which specifies a
-                 * specific field to print */
+        if (opt & DPKG_DEB_OPT_FIELD) { // -f
+                /* Print the entire control file */
+//TODO: standard tool accepts an optional list of fields to print
                 ar_archive->accept = control_tar_llist;
                 llist_add_to(&(tar_archive->accept), (char*)"./control");
                 tar_archive->filter = filter_accept_list;
                 tar_archive->action_data = data_extract_to_stdout;
+                if (extract_dir)
+                        bb_show_usage();
         }
-        if (opt & DPKG_DEB_OPT_EXTRACT) {
-                tar_archive->action_header = header_list;
-        }
-        if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
+        if (opt & DPKG_DEB_OPT_CONTROL) { // -e
+                ar_archive->accept = control_tar_llist;
                 tar_archive->action_data = data_extract_all;
-                need_args = 2;
+                if (!extract_dir)
+                        extract_dir = "./DEBIAN";
         }
-
-        if (need_args != argc) {
-                bb_show_usage();
+        if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) { // -Xx
+                if (opt & DPKG_DEB_OPT_EXTRACT_VERBOSE)
+                        tar_archive->action_header = header_list;
+                tar_archive->action_data = data_extract_all;
+                if (!extract_dir)
+                        bb_show_usage();
         }
 
-        tar_archive->src_fd = ar_archive->src_fd = xopen(argv[0], O_RDONLY);
+        /* Standard tool supports "-" */
+        tar_archive->src_fd = ar_archive->src_fd = xopen_stdin(argv[0]);
 
-        /* Work out where to extract the files */
-        /* 2nd argument is a dir name */
-        if (argv[1]) {
-                extract_dir = argv[1];
-        }
         if (extract_dir) {
                 mkdir(extract_dir, 0777); /* bb_make_directory(extract_dir, 0777, 0) */
                 xchdir(extract_dir);
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index ea91a883e..c7e3bc16e 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -113,11 +113,19 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                 value = end + 1;
 
 # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
-                if (!global && is_prefixed_with(value, "path=")) {
-                        value += sizeof("path=") - 1;
-                        free(archive_handle->tar__longname);
-                        archive_handle->tar__longname = xstrdup(value);
-                        continue;
+                if (!global) {
+                        if (is_prefixed_with(value, "path=")) {
+                                value += sizeof("path=") - 1;
+                                free(archive_handle->tar__longname);
+                                archive_handle->tar__longname = xstrdup(value);
+                                continue;
+                        }
+                        if (is_prefixed_with(value, "linkpath=")) {
+                                value += sizeof("linkpath=") - 1;
+                                free(archive_handle->tar__linkname);
+                                archive_handle->tar__linkname = xstrdup(value);
+                                continue;
+                        }
                 }
 # endif
 
@@ -179,7 +187,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) {
-                bb_error_msg("short read");
+                /* GNU tar 1.29 will be silent if tar archive ends abruptly
+                 * (if there are no zero blocks at all, and last read returns zero,
+                 * not short read 0 < len < 512). Complain only if
+                 * the very first read fails. Grrr.
+                 */
+                if (archive_handle->offset == 0)
+                        bb_error_msg("short read");
                 /* this merely signals end of archive, not exit(1): */
                 return EXIT_FAILURE;
         }
@@ -195,7 +209,11 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         archive_handle->offset += i;
 
         /* If there is no filename its an empty header */
-        if (tar.name[0] == 0 && tar.prefix[0] == 0) {
+        if (tar.name[0] == 0 && tar.prefix[0] == 0
+        /* Have seen a tar archive with pax 'x' header supplying UTF8 filename,
+         * with actual file having all name fields NUL-filled. Check this: */
+         && !p_longname
+        ) {
                 if (archive_handle->tar__end) {
                         /* Second consecutive empty header - end of archive.
                          * Read until the end to empty the pipe from gz or bz2
diff --git a/archival/lzop.c b/archival/lzop.c
index 202de4d03..e0e90ac6c 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -31,19 +31,33 @@
 //config:       help
 //config:         Lzop compression/decompresion.
 //config:
+//config:config UNLZOP
+//config:       bool "unlzop"
+//config:       default y
+//config:       help
+//config:         Lzop decompresion.
+//config:
+//config:config LZOPCAT
+//config:       bool "lzopcat"
+//config:       default y
+//config:       help
+//config:         Alias to "unlzop -c".
+//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:       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.
 
 //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))
+//applet:IF_UNLZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop))
+//applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat))
 //kbuild:lib-$(CONFIG_LZOP) += lzop.o
+//kbuild:lib-$(CONFIG_UNLZOP) += lzop.o
+//kbuild:lib-$(CONFIG_LZOPCAT) += lzop.o
 
 //usage:#define lzop_trivial_usage
 //usage:       "[-cfvd123456789CF] [FILE]..."
@@ -57,18 +71,18 @@
 //usage:     "\n        -C      Also write checksum of compressed block"
 //usage:
 //usage:#define lzopcat_trivial_usage
-//usage:       "[-vCF] [FILE]..."
+//usage:       "[-vF] [FILE]..."
 //usage:#define lzopcat_full_usage "\n\n"
 //usage:       "        -v      Verbose"
-//usage:     "\n        -F      Don't store or verify checksum"
+//usage:     "\n        -F      Don't verify checksum"
 //usage:
 //usage:#define unlzop_trivial_usage
-//usage:       "[-cfvCF] [FILE]..."
+//usage:       "[-cfvF] [FILE]..."
 //usage:#define unlzop_full_usage "\n\n"
 //usage:       "        -c      Write to stdout"
 //usage:     "\n        -f      Force"
 //usage:     "\n        -v      Verbose"
-//usage:     "\n        -F      Don't store or verify checksum"
+//usage:     "\n        -F      Don't verify checksum"
 
 #include "libbb.h"
 #include "common_bufsiz.h"
@@ -1111,10 +1125,10 @@ int lzop_main(int argc UNUSED_PARAM, char **argv)
         getopt32(argv, OPTION_STRING);
         argv += optind;
         /* lzopcat? */
-        if (applet_name[4] == 'c')
+        if (ENABLE_LZOPCAT && applet_name[4] == 'c')
                 option_mask32 |= (OPT_STDOUT | OPT_DECOMPRESS);
         /* unlzop? */
-        if (applet_name[4] == 'o')
+        if (ENABLE_UNLZOP && applet_name[4] == 'o')
                 option_mask32 |= OPT_DECOMPRESS;
 
         global_crc32_table = crc32_filltable(NULL, 0);