Merge remote-tracking branch 'upstream/master'

author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 2011-01-04 19:56:15 +0700
committer: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 2011-01-04 19:56:15 +0700
commit: 5f6f2162512106adf120d4b528bb125e93e34429 (patch)
tree: 7d7449f755633c263be7125ad58d21cc3ca5b8a7 /archival
parent: 9db69882bee2d528d706d61d34ef7741122330be (diff)
parent: a116552869db5e7793ae10968eb3c962c69b3d8c (diff)
download: busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz
busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2
busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip
67 files changed, 427 insertions, 354 deletions
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index a0edb123d..3466452f7 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -4,7 +4,7 @@
 #
 # Licensed under GPLv2, see file LICENSE in this source tree.
-libs-y                          += libunarchive/
+libs-y                          += libarchive/
 lib-y:=
@@ -19,8 +19,7 @@ lib-$(CONFIG_RPM)		+= rpm.o
 lib-$(CONFIG_TAR)               += tar.o
 lib-$(CONFIG_UNZIP)             += unzip.o
-lib-$(CONFIG_LZOP)              += lzop.o lzo1x_1.o lzo1x_1o.o lzo1x_d.o bbunzip.o
+lib-$(CONFIG_LZOP)              += lzop.o bbunzip.o
-lib-$(CONFIG_LZOP_COMPR_HIGH)   += lzo1x_9x.o
 lib-$(CONFIG_GZIP)              += gzip.o bbunzip.o
 lib-$(CONFIG_BZIP2)             += bzip2.o bbunzip.o
diff --git a/archival/ar.c b/archival/ar.c
index 05556c6cb..a2e3306ac 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -18,7 +18,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 #if ENABLE_FEATURE_AR_CREATE
@@ -179,17 +179,17 @@ static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
        );
 }
-#define AR_OPT_VERBOSE          (1 << 0)
+#define AR_OPT_VERBOSE          (1 << 0)
-#define AR_OPT_PRESERVE_DATE    (1 << 1)
+#define AR_OPT_PRESERVE_DATE    (1 << 1)
 /* "ar r" implies create, but warns about it. c suppresses warning.
 * bbox accepts but ignores it: */
-#define AR_OPT_CREATE           (1 << 2)
+#define AR_OPT_CREATE           (1 << 2)
-#define AR_CMD_PRINT            (1 << 3)
+#define AR_CMD_PRINT            (1 << 3)
-#define FIRST_CMD AR_CMD_PRINT
+#define FIRST_CMD               AR_CMD_PRINT
-#define AR_CMD_LIST             (1 << 4)
+#define AR_CMD_LIST             (1 << 4)
-#define AR_CMD_EXTRACT          (1 << 5)
+#define AR_CMD_EXTRACT          (1 << 5)
-#define AR_CMD_INSERT           (1 << 6)
+#define AR_CMD_INSERT           (1 << 6)
 int ar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ar_main(int argc UNUSED_PARAM, char **argv)
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index a195434e4..0f89443e0 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -5,7 +5,7 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 enum {
        OPT_STDOUT     = 1 << 0,
diff --git a/archival/bzip2.c b/archival/bzip2.c
index fdb8b9306..ab08ffc1a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -8,7 +8,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #define CONFIG_BZIP2_FEATURE_SPEED 1
@@ -33,14 +33,14 @@
 /* Takes ~300 bytes, detects corruption caused by bad RAM etc */
 #define BZ_LIGHT_DEBUG 0
-#include "bz/bzlib.h"
+#include "libarchive/bz/bzlib.h"
-#include "bz/bzlib_private.h"
+#include "libarchive/bz/bzlib_private.h"
-#include "bz/blocksort.c"
+#include "libarchive/bz/blocksort.c"
-#include "bz/bzlib.c"
+#include "libarchive/bz/bzlib.c"
-#include "bz/compress.c"
+#include "libarchive/bz/compress.c"
-#include "bz/huffman.c"
+#include "libarchive/bz/huffman.c"
 /* No point in being shy and having very small buffer here.
 * bzip2 internal buffers are much bigger anyway, hundreds of kbytes.
@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC compressStream(unpack_info_t *info UNUSED_PA
                        break;
        }
-#if ENABLE_FEATURE_CLEAN_UP
+        /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
+         * we are called repeatedly
+         */
        BZ2_bzCompressEnd(strm);
        free(iobuf);
-#endif
        return total;
 }
diff --git a/archival/cpio.c b/archival/cpio.c
index a2d74dc79..c746a71fa 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -12,7 +12,37 @@
 *
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
+//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]")
+//usage:       " [EXTR_FILE]..."
+//usage:#define cpio_full_usage "\n\n"
+//usage:       "Extract or list files from a cpio archive"
+//usage:        IF_FEATURE_CPIO_O(", or"
+//usage:     "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)")
+//usage:                " using file list on stdin"
+//usage:        )
+//usage:     "\n"
+//usage:     "\nMain operation mode:"
+//usage:     "\n        -t      List"
+//usage:     "\n        -i      Extract EXTR_FILEs (or all)"
+//usage:        IF_FEATURE_CPIO_O(
+//usage:     "\n        -o      Create (requires -H newc)"
+//usage:        )
+//usage:        IF_FEATURE_CPIO_P(
+//usage:     "\n        -p DIR  Copy files to DIR"
+//usage:        )
+//usage:     "\nOptions:"
+//usage:     "\n        -d      Make leading directories"
+//usage:     "\n        -m      Preserve mtime"
+//usage:     "\n        -v      Verbose"
+//usage:     "\n        -u      Overwrite"
+//usage:     "\n        -F FILE Input (-t,-i,-p) or output (-o) file"
+//usage:        IF_FEATURE_CPIO_O(
+//usage:     "\n        -H newc Archive format"
+//usage:        )
 /* GNU cpio 2.9 --help (abridged):
@@ -20,7 +50,7 @@
  -t, --list                 List the archive
  -i, --extract              Extract files from an archive
  -o, --create               Create the archive
-  -p, --pass-through         Copy-pass mode [was ist das?!]
+  -p, --pass-through         Copy-pass mode
 Options valid in any mode:
      --block-size=SIZE      I/O block size = SIZE * 512 bytes
@@ -78,27 +108,28 @@
      --sparse               Write files with blocks of zeros as sparse files
  -u, --unconditional        Replace all files unconditionally
 */
 enum {
-        CPIO_OPT_EXTRACT            = (1 << 0),
+        OPT_EXTRACT            = (1 << 0),
-        CPIO_OPT_TEST               = (1 << 1),
+        OPT_TEST               = (1 << 1),
-        CPIO_OPT_NUL_TERMINATED     = (1 << 2),
+        OPT_NUL_TERMINATED     = (1 << 2),
-        CPIO_OPT_UNCONDITIONAL      = (1 << 3),
+        OPT_UNCONDITIONAL      = (1 << 3),
-        CPIO_OPT_VERBOSE            = (1 << 4),
+        OPT_VERBOSE            = (1 << 4),
-        CPIO_OPT_CREATE_LEADING_DIR = (1 << 5),
+        OPT_CREATE_LEADING_DIR = (1 << 5),
-        CPIO_OPT_PRESERVE_MTIME     = (1 << 6),
+        OPT_PRESERVE_MTIME     = (1 << 6),
-        CPIO_OPT_DEREF              = (1 << 7),
+        OPT_DEREF              = (1 << 7),
-        CPIO_OPT_FILE               = (1 << 8),
+        OPT_FILE               = (1 << 8),
        OPTBIT_FILE = 8,
        IF_FEATURE_CPIO_O(OPTBIT_CREATE     ,)
        IF_FEATURE_CPIO_O(OPTBIT_FORMAT     ,)
        IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
        IF_LONG_OPTS(     OPTBIT_QUIET      ,)
        IF_LONG_OPTS(     OPTBIT_2STDOUT    ,)
-        CPIO_OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
+        OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
-        CPIO_OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
+        OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
-        CPIO_OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
+        OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
-        CPIO_OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
+        OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
-        CPIO_OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
+        OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
 };
 #define OPTION_STR "it0uvdmLF:"
@@ -138,7 +169,7 @@ static NOINLINE int cpio_o(void)
                char *line;
                struct stat st;
-                line = (option_mask32 & CPIO_OPT_NUL_TERMINATED)
+                line = (option_mask32 & OPT_NUL_TERMINATED)
                                ? bb_get_chunk_from_file(stdin, NULL)
                                : xmalloc_fgetline(stdin);
@@ -153,7 +184,7 @@ static NOINLINE int cpio_o(void)
                                free(line);
                                continue;
                        }
-                        if ((option_mask32 & CPIO_OPT_DEREF)
+                        if ((option_mask32 & OPT_DEREF)
                                        ? stat(name, &st)
                                        : lstat(name, &st)
                        ) {
@@ -308,28 +339,24 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
        /* -L makes sense only with -o or -p */
 #if !ENABLE_FEATURE_CPIO_O
-        /* no parameters */
-        opt_complementary = "=0";
        opt = getopt32(argv, OPTION_STR, &cpio_filename);
        argv += optind;
-        if (opt & CPIO_OPT_FILE) { /* -F */
+        if (opt & OPT_FILE) { /* -F */
                xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
        }
 #else
-        /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
-        opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
        opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
        argv += optind;
-        if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */
+        if ((opt & (OPT_FILE|OPT_CREATE)) == OPT_FILE) { /* -F without -o */
                xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
        }
-        if (opt & CPIO_OPT_PASSTHROUGH) {
+        if (opt & OPT_PASSTHROUGH) {
                pid_t pid;
                struct fd_pair pp;
                if (argv[0] == NULL)
                        bb_show_usage();
-                if (opt & CPIO_OPT_CREATE_LEADING_DIR)
+                if (opt & OPT_CREATE_LEADING_DIR)
                        mkdir(argv[0], 0777);
                /* Crude existence check:
                 * close(xopen(argv[0], O_RDONLY | O_DIRECTORY));
@@ -361,15 +388,15 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                xchdir(*argv++);
                close(pp.wr);
                xmove_fd(pp.rd, STDIN_FILENO);
-                //opt &= ~CPIO_OPT_PASSTHROUGH;
+                //opt &= ~OPT_PASSTHROUGH;
-                opt |= CPIO_OPT_EXTRACT;
+                opt |= OPT_EXTRACT;
                goto skip;
        }
        /* -o */
-        if (opt & CPIO_OPT_CREATE) {
+        if (opt & OPT_CREATE) {
                if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
                        bb_show_usage();
-                if (opt & CPIO_OPT_FILE) {
+                if (opt & OPT_FILE) {
                        xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
                }
 dump:
@@ -379,35 +406,35 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
        /* One of either extract or test options must be given */
-        if ((opt & (CPIO_OPT_TEST | CPIO_OPT_EXTRACT)) == 0) {
+        if ((opt & (OPT_TEST | OPT_EXTRACT)) == 0) {
                bb_show_usage();
        }
-        if (opt & CPIO_OPT_TEST) {
+        if (opt & OPT_TEST) {
                /* if both extract and test options are given, ignore extract option */
-                opt &= ~CPIO_OPT_EXTRACT;
+                opt &= ~OPT_EXTRACT;
                archive_handle->action_header = header_list;
        }
-        if (opt & CPIO_OPT_EXTRACT) {
+        if (opt & OPT_EXTRACT) {
                archive_handle->action_data = data_extract_all;
-                if (opt & CPIO_OPT_2STDOUT)
+                if (opt & OPT_2STDOUT)
                        archive_handle->action_data = data_extract_to_stdout;
        }
-        if (opt & CPIO_OPT_UNCONDITIONAL) {
+        if (opt & OPT_UNCONDITIONAL) {
                archive_handle->ah_flags |= ARCHIVE_UNLINK_OLD;
                archive_handle->ah_flags &= ~ARCHIVE_EXTRACT_NEWER;
        }
-        if (opt & CPIO_OPT_VERBOSE) {
+        if (opt & OPT_VERBOSE) {
                if (archive_handle->action_header == header_list) {
                        archive_handle->action_header = header_verbose_list;
                } else {
                        archive_handle->action_header = header_list;
                }
        }
-        if (opt & CPIO_OPT_CREATE_LEADING_DIR) {
+        if (opt & OPT_CREATE_LEADING_DIR) {
                archive_handle->ah_flags |= ARCHIVE_CREATE_LEADING_DIRS;
        }
-        if (opt & CPIO_OPT_PRESERVE_MTIME) {
+        if (opt & OPT_PRESERVE_MTIME) {
                archive_handle->ah_flags |= ARCHIVE_RESTORE_DATE;
        }
@@ -423,7 +450,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                continue;
        if (archive_handle->cpio__blocks != (off_t)-1
-         && !(opt & CPIO_OPT_QUIET)
+         && !(opt & OPT_QUIET)
        ) {
                fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
        }
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 508b4297b..c37ae3349 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -30,7 +30,7 @@
 #include "libbb.h"
 #include <fnmatch.h>
-#include "unarchive.h"
+#include "archive.h"
 /* note: if you vary hash_prime sizes be aware,
 * 1) tweaking these will have a big effect on how much memory this program uses.
@@ -939,8 +939,8 @@ static int package_satisfies_dependency(int package, int depend_type)
                return 0;
        switch (depend_type) {
-        case EDGE_PRE_DEPENDS:  return get_status(status_num, 3) == search_name_hashtable("installed");
+        case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed");
-        case EDGE_DEPENDS:      return get_status(status_num, 1) == search_name_hashtable("install");
+        case EDGE_DEPENDS:     return get_status(status_num, 1) == search_name_hashtable("install");
        }
        return 0;
 }
@@ -967,7 +967,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                conflicts[conflicts_num] = package_num;
                conflicts_num++;
                /* add provides to conflicts list */
-                for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
+                for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
                        if (package_hashtable[package_num]->edge[j]->type == EDGE_PROVIDES) {
                                const int conflicts_package_num = search_package_hashtable(
                                        package_hashtable[package_num]->edge[j]->name,
@@ -1067,12 +1067,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                        if (package_edge->type == EDGE_OR_PRE_DEPENDS
                         || package_edge->type == EDGE_OR_DEPENDS
-                        ) {     /* start an EDGE_OR_ list */
+                        ) {
+                                /* start an EDGE_OR_ list */
                                number_of_alternatives = package_edge->version;
                                root_of_alternatives = package_edge;
                                continue;
                        }
-                        if (number_of_alternatives == 0) {      /* not in the middle of an EDGE_OR_ list */
+                        if (number_of_alternatives == 0) {  /* not in the middle of an EDGE_OR_ list */
                                number_of_alternatives = 1;
                                root_of_alternatives = NULL;
                        }
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 4c627e890..aee7b4cf5 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -5,13 +5,13 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
-#define DPKG_DEB_OPT_CONTENTS   1
+#define DPKG_DEB_OPT_CONTENTS         1
-#define DPKG_DEB_OPT_CONTROL    2
+#define DPKG_DEB_OPT_CONTROL          2
-#define DPKG_DEB_OPT_FIELD      4
+#define DPKG_DEB_OPT_FIELD            4
-#define DPKG_DEB_OPT_EXTRACT    8
+#define DPKG_DEB_OPT_EXTRACT          8
-#define DPKG_DEB_OPT_EXTRACT_VERBOSE    16
+#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16
 int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dpkg_deb_main(int argc, char **argv)
diff --git a/archival/gzip.c b/archival/gzip.c
index b573ed6ab..feeddf58f 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -40,7 +40,7 @@ aa:      85.1% -- replaced with aa.gz
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* ===========================================================================
diff --git a/archival/libunarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index e92b4aad2..b0bc4e5aa 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -48,6 +48,8 @@ lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
 lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += decompress_unzip.o
+lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
+lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_unzip.o get_header_tar_gz.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o get_header_tar_bz2.o
diff --git a/archival/bz/LICENSE b/archival/libarchive/bz/LICENSE
index da4346520..da4346520 100644
--- a/archival/bz/LICENSE
+++ b/archival/libarchive/bz/LICENSE
diff --git a/archival/bz/README b/archival/libarchive/bz/README
index fffd47b8a..fffd47b8a 100644
--- a/archival/bz/README
+++ b/archival/libarchive/bz/README
diff --git a/archival/bz/blocksort.c b/archival/libarchive/bz/blocksort.c
index f70c3701d..f70c3701d 100644
--- a/archival/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
diff --git a/archival/bz/bzlib.c b/archival/libarchive/bz/bzlib.c
index 834179403..5f7db747a 100644
--- a/archival/bz/bzlib.c
+++ b/archival/libarchive/bz/bzlib.c
@@ -28,7 +28,7 @@ in the file LICENSE.
 * 0.9.0a/b -- no changes in this file.
 * 0.9.0c   -- made zero-length BZ_FLUSH work correctly in bzCompress().
 *             fixed bzWrite/bzRead to ignore zero-length requests.
- *             fixed bzread to correctly handle read requests after EOF.
+ *             fixed bzread to correctly handle read requests after EOF.
 *             wrong parameter order in call to bzDecompressInit in
 *             bzBuffToBuffDecompress.  Fixed.
 */
@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int action)
 /*---------------------------------------------------*/
-#if ENABLE_FEATURE_CLEAN_UP
 static
 void BZ2_bzCompressEnd(bz_stream *strm)
 {
@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
        free(s->arr2);
        free(s->ftab);
        free(s->crc32table);
-        free(strm->state);
+        free(s);
 }
-#endif
 /*---------------------------------------------------*/
diff --git a/archival/bz/bzlib.h b/archival/libarchive/bz/bzlib.h
index 1bb811c4a..1bb811c4a 100644
--- a/archival/bz/bzlib.h
+++ b/archival/libarchive/bz/bzlib.h
diff --git a/archival/bz/bzlib_private.h b/archival/libarchive/bz/bzlib_private.h
index 6430ce407..6430ce407 100644
--- a/archival/bz/bzlib_private.h
+++ b/archival/libarchive/bz/bzlib_private.h
diff --git a/archival/bz/compress.c b/archival/libarchive/bz/compress.c
index b9b0949a9..6f1c70a08 100644
--- a/archival/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -134,15 +134,14 @@ void generateMTFValues(EState* s)
         * holds the original block data.
         *
         * The first thing to do is generate the MTF values,
-         * and put them in
+         * and put them in ((uint16_t*)s->arr1)[0 .. s->nblock-1].
-         *      ((uint16_t*)s->arr1)[0 .. s->nblock-1].
+         *
         * Because there are strictly fewer or equal MTF values
         * than block values, ptr values in this area are overwritten
         * with MTF values only when they are no longer needed.
         *
         * The final compressed bitstream is generated into the
-         * area starting at
+         * area starting at &((uint8_t*)s->arr2)[s->nblock]
-         *      &((uint8_t*)s->arr2)[s->nblock]
         *
         * These storage aliases are set up in bzCompressInit(),
         * except for the last one, which is arranged in
@@ -459,7 +458,7 @@ void sendMTFValues(EState* s)
        }
        AssertH(nGroups < 8, 3002);
-        AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003);
+        AssertH(nSelectors < 32768 && nSelectors <= (2 + (900000 / BZ_G_SIZE)), 3003);
        /*--- Compute MTF values for the selectors. ---*/
        {
diff --git a/archival/bz/huffman.c b/archival/libarchive/bz/huffman.c
index 676b1af66..676b1af66 100644
--- a/archival/bz/huffman.c
+++ b/archival/libarchive/bz/huffman.c
diff --git a/archival/libunarchive/data_align.c b/archival/libarchive/data_align.c
index 4e21a36b3..2e56fa8ff 100644
--- a/archival/libunarchive/data_align.c
+++ b/archival/libarchive/data_align.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)
 {
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 5fb1ab2ae..1b25c8bd6 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index b54f7f215..2bbab7641 100644
--- a/archival/libunarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 enum {
        //TAR_FILETYPE,
diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libarchive/data_extract_to_stdout.c
index ce0713ac4..91f3f3539 100644
--- a/archival/libunarchive/data_extract_to_stdout.c
+++ b/archival/libarchive/data_extract_to_stdout.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/data_skip.c b/archival/libarchive/data_skip.c
index 06b74399d..a055424e2 100644
--- a/archival/libunarchive/data_skip.c
+++ b/archival/libarchive/data_skip.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC data_skip(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 22015683c..4e46e6849 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -16,10 +16,21 @@
        function, and various other tweaks.  In (limited) tests, approximately
        20% faster than bzcat on x86 and about 10% faster on arm.
-        Note that about 2/3 of the time is spent in read_unzip() reversing
+        Note that about 2/3 of the time is spent in read_bunzip() reversing
        the Burrows-Wheeler transformation.  Much of that time is delay
        resulting from cache misses.
+        (2010 update by vda: profiled "bzcat <84mbyte.bz2 >/dev/null"
+        on x86-64 CPU with L2 > 1M: get_next_block is hotter than read_bunzip:
+        %time seconds   calls function
+        71.01   12.69     444 get_next_block
+        28.65    5.12   93065 read_bunzip
+        00.22    0.04 7736490 get_bits
+        00.11    0.02      47 dealloc_bunzip
+        00.00    0.00   93018 full_write
+        ...)
        I would ask that anyone benefiting from this work, especially those
        using it in commercial products, consider making a donation to my local
        non-profit hospice organization (www.hospiceacadiana.com) in the name of
@@ -29,7 +40,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
@@ -70,38 +81,41 @@ struct bunzip_data {
        /* I/O tracking data (file handles, buffers, positions, etc.) */
        unsigned inbufBitCount, inbufBits;
        int in_fd, out_fd, inbufCount, inbufPos /*, outbufPos*/;
-        unsigned char *inbuf /*,*outbuf*/;
+        uint8_t *inbuf /*,*outbuf*/;
        /* State for interrupting output loop */
-        int writeCopies, writePos, writeRunCountdown, writeCount, writeCurrent;
+        int writeCopies, writePos, writeRunCountdown, writeCount;
+        int writeCurrent; /* actually a uint8_t */
        /* The CRC values stored in the block header and calculated from the data */
        uint32_t headerCRC, totalCRC, writeCRC;
        /* Intermediate buffer and its size (in bytes) */
-        unsigned *dbuf, dbufSize;
+        uint32_t *dbuf;
+        unsigned dbufSize;
        /* For I/O error handling */
        jmp_buf jmpbuf;
        /* Big things go last (register-relative addressing can be larger for big offsets) */
        uint32_t crc32Table[256];
-        unsigned char selectors[32768];                 /* nSelectors=15 bits */
+        uint8_t selectors[32768];  /* nSelectors=15 bits */
-        struct group_data groups[MAX_GROUPS];   /* Huffman coding tables */
+        struct group_data groups[MAX_GROUPS];  /* Huffman coding tables */
 };
 /* typedef struct bunzip_data bunzip_data; -- done in .h file */
 /* Return the next nnn bits of input.  All reads from the compressed input
   are done through this function.  All reads are big endian */
 static unsigned get_bits(bunzip_data *bd, int bits_wanted)
 {
        unsigned bits = 0;
+        /* Cache bd->inbufBitCount in a CPU register (hopefully): */
+        int bit_count = bd->inbufBitCount;
        /* If we need to get more data from the byte buffer, do so.  (Loop getting
           one byte at a time to enforce endianness and avoid unaligned access.) */
-        while ((int)(bd->inbufBitCount) < bits_wanted) {
+        while (bit_count < bits_wanted) {
                /* If we need to read more data from file into byte buffer, do so */
                if (bd->inbufPos == bd->inbufCount) {
@@ -113,41 +127,47 @@ static unsigned get_bits(bunzip_data *bd, int bits_wanted)
                }
                /* Avoid 32-bit overflow (dump bit buffer to top of output) */
-                if (bd->inbufBitCount >= 24) {
+                if (bit_count >= 24) {
-                        bits = bd->inbufBits & ((1 << bd->inbufBitCount) - 1);
+                        bits = bd->inbufBits & ((1 << bit_count) - 1);
-                        bits_wanted -= bd->inbufBitCount;
+                        bits_wanted -= bit_count;
                        bits <<= bits_wanted;
-                        bd->inbufBitCount = 0;
+                        bit_count = 0;
                }
                /* Grab next 8 bits of input from buffer. */
                bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
-                bd->inbufBitCount += 8;
+                bit_count += 8;
        }
        /* Calculate result */
-        bd->inbufBitCount -= bits_wanted;
+        bit_count -= bits_wanted;
-        bits |= (bd->inbufBits >> bd->inbufBitCount) & ((1 << bits_wanted) - 1);
+        bd->inbufBitCount = bit_count;
+        bits |= (bd->inbufBits >> bit_count) & ((1 << bits_wanted) - 1);
        return bits;
 }
-/* Unpacks the next block and sets up for the inverse burrows-wheeler step. */
+/* Unpacks the next block and sets up for the inverse Burrows-Wheeler step. */
 static int get_next_block(bunzip_data *bd)
 {
        struct group_data *hufGroup;
-        int dbufCount, nextSym, dbufSize, groupCount, *base, *limit, selector,
+        int dbufCount, dbufSize, groupCount, *base, *limit, selector,
-                i, j, k, t, runPos, symCount, symTotal, nSelectors, byteCount[256];
+                i, j, t, runPos, symCount, symTotal, nSelectors, byteCount[256];
-        unsigned char uc, symToByte[256], mtfSymbol[256], *selectors;
+        int runCnt = runCnt; /* for compiler */
-        unsigned *dbuf, origPtr;
+        uint8_t uc, symToByte[256], mtfSymbol[256], *selectors;
+        uint32_t *dbuf;
+        unsigned origPtr;
        dbuf = bd->dbuf;
        dbufSize = bd->dbufSize;
        selectors = bd->selectors;
+/* In bbox, we are ok with aborting through setjmp which is set up in start_bunzip */
+#if 0
        /* Reset longjmp I/O error handling */
        i = setjmp(bd->jmpbuf);
        if (i) return i;
+#endif
        /* Read in header signature and CRC, then validate signature.
           (last block signature means CRC is for whole file, return now) */
@@ -169,16 +189,23 @@ static int get_next_block(bunzip_data *bd)
           symbols to deal with, and writes a sparse bitfield indicating which
           values were present.  We make a translation table to convert the symbols
           back to the corresponding bytes. */
-        t = get_bits(bd, 16);
        symTotal = 0;
-        for (i = 0; i < 16; i++) {
+        i = 0;
-                if (t & (1 << (15-i))) {
+        t = get_bits(bd, 16);
-                        k = get_bits(bd, 16);
+        do {
-                        for (j = 0; j < 16; j++)
+                if (t & (1 << 15)) {
-                                if (k & (1 << (15-j)))
+                        unsigned inner_map = get_bits(bd, 16);
-                                        symToByte[symTotal++] = (16*i) + j;
+                        do {
+                                if (inner_map & (1 << 15))
+                                        symToByte[symTotal++] = i;
+                                inner_map <<= 1;
+                                i++;
+                        } while (i & 15);
+                        i -= 16;
                }
-        }
+                t <<= 1;
+                i += 16;
+        } while (i < 256);
        /* How many different Huffman coding groups does this block use? */
        groupCount = get_bits(bd, 3);
@@ -189,57 +216,63 @@ static int get_next_block(bunzip_data *bd)
           group.  Read in the group selector list, which is stored as MTF encoded
           bit runs.  (MTF=Move To Front, as each value is used it's moved to the
           start of the list.) */
+        for (i = 0; i < groupCount; i++)
+                mtfSymbol[i] = i;
        nSelectors = get_bits(bd, 15);
-        if (!nSelectors) return RETVAL_DATA_ERROR;
+        if (!nSelectors)
-        for (i = 0; i < groupCount; i++) mtfSymbol[i] = i;
+                return RETVAL_DATA_ERROR;
        for (i = 0; i < nSelectors; i++) {
+                uint8_t tmp_byte;
                /* Get next value */
-                for (j = 0; get_bits(bd, 1); j++)
+                int n = 0;
-                        if (j >= groupCount) return RETVAL_DATA_ERROR;
+                while (get_bits(bd, 1)) {
+                        if (n >= groupCount) return RETVAL_DATA_ERROR;
+                        n++;
+                }
                /* Decode MTF to get the next selector */
-                uc = mtfSymbol[j];
+                tmp_byte = mtfSymbol[n];
-                for (;j;j--) mtfSymbol[j] = mtfSymbol[j-1];
+                while (--n >= 0)
-                mtfSymbol[0] = selectors[i] = uc;
+                        mtfSymbol[n + 1] = mtfSymbol[n];
+                mtfSymbol[0] = selectors[i] = tmp_byte;
        }
        /* Read the Huffman coding tables for each group, which code for symTotal
           literal symbols, plus two run symbols (RUNA, RUNB) */
        symCount = symTotal + 2;
        for (j = 0; j < groupCount; j++) {
-                unsigned char length[MAX_SYMBOLS];
+                uint8_t length[MAX_SYMBOLS];
                /* 8 bits is ALMOST enough for temp[], see below */
                unsigned temp[MAX_HUFCODE_BITS+1];
-                int minLen, maxLen, pp;
+                int minLen, maxLen, pp, len_m1;
                /* Read Huffman code lengths for each symbol.  They're stored in
                   a way similar to mtf; record a starting value for the first symbol,
-                   and an offset from the previous value for everys symbol after that.
+                   and an offset from the previous value for every symbol after that.
                   (Subtracting 1 before the loop and then adding it back at the end is
                   an optimization that makes the test inside the loop simpler: symbol
                   length 0 becomes negative, so an unsigned inequality catches it.) */
-                t = get_bits(bd, 5) - 1;
+                len_m1 = get_bits(bd, 5) - 1;
                for (i = 0; i < symCount; i++) {
                        for (;;) {
-                                if ((unsigned)t > (MAX_HUFCODE_BITS-1))
+                                int two_bits;
+                                if ((unsigned)len_m1 > (MAX_HUFCODE_BITS-1))
                                        return RETVAL_DATA_ERROR;
                                /* If first bit is 0, stop.  Else second bit indicates whether
                                   to increment or decrement the value.  Optimization: grab 2
                                   bits and unget the second if the first was 0. */
-                                k = get_bits(bd, 2);
+                                two_bits = get_bits(bd, 2);
-                                if (k < 2) {
+                                if (two_bits < 2) {
                                        bd->inbufBitCount++;
                                        break;
                                }
                                /* Add one if second bit 1, else subtract 1.  Avoids if/else */
-                                t += (((k+1) & 2) - 1);
+                                len_m1 += (((two_bits+1) & 2) - 1);
                        }
                        /* Correct for the initial -1, to get the final symbol length */
-                        length[i] = t + 1;
+                        length[i] = len_m1 + 1;
                }
                /* Find largest and smallest lengths in this group */
@@ -265,17 +298,18 @@ static int get_next_block(bunzip_data *bd)
                /* Note that minLen can't be smaller than 1, so we adjust the base
                   and limit array pointers so we're not always wasting the first
-                   entry.  We do this again when using them (during symbol decoding).*/
+                   entry.  We do this again when using them (during symbol decoding). */
                base = hufGroup->base - 1;
                limit = hufGroup->limit - 1;
                /* Calculate permute[].  Concurently, initialize temp[] and limit[]. */
                pp = 0;
                for (i = minLen; i <= maxLen; i++) {
+                        int k;
                        temp[i] = limit[i] = 0;
-                        for (t = 0; t < symCount; t++)
+                        for (k = 0; k < symCount; k++)
-                                if (length[t] == i)
+                                if (length[k] == i)
-                                        hufGroup->permute[pp++] = t;
+                                        hufGroup->permute[pp++] = k;
                }
                /* Count symbols coded for at each bit length */
@@ -288,8 +322,10 @@ static int get_next_block(bunzip_data *bd)
                 * base[] (number of symbols to ignore at each bit length, which is
                 * limit minus the cumulative count of symbols coded for already). */
                pp = t = 0;
-                for (i = minLen; i < maxLen; i++) {
+                for (i = minLen; i < maxLen;) {
-                        pp += temp[i];
+                        unsigned temp_i = temp[i];
+                        pp += temp_i;
                        /* We read the largest possible symbol size and then unget bits
                           after determining how many we need, and those extra bits could
@@ -299,11 +335,11 @@ static int get_next_block(bunzip_data *bd)
                           don't affect the value>limit[length] comparison. */
                        limit[i] = (pp << (maxLen - i)) - 1;
                        pp <<= 1;
-                        t += temp[i];
+                        t += temp_i;
-                        base[i+1] = pp - t;
+                        base[++i] = pp - t;
                }
-                limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */
                limit[maxLen] = pp + temp[maxLen] - 1;
+                limit[maxLen+1] = INT_MAX; /* Sentinel value for reading next sym. */
                base[minLen] = 0;
        }
@@ -312,16 +348,17 @@ static int get_next_block(bunzip_data *bd)
           and run length encoding, saving the result into dbuf[dbufCount++] = uc */
        /* Initialize symbol occurrence counters and symbol Move To Front table */
-        memset(byteCount, 0, sizeof(byteCount)); /* smaller, maybe slower? */
+        /*memset(byteCount, 0, sizeof(byteCount)); - smaller, but slower */
        for (i = 0; i < 256; i++) {
-                //byteCount[i] = 0;
+                byteCount[i] = 0;
-                mtfSymbol[i] = (unsigned char)i;
+                mtfSymbol[i] = (uint8_t)i;
        }
        /* Loop through compressed symbols. */
        runPos = dbufCount = selector = 0;
        for (;;) {
+                int nextSym;
                /* Fetch next Huffman coding group from list. */
                symCount = GROUP_SIZE - 1;
@@ -329,44 +366,49 @@ static int get_next_block(bunzip_data *bd)
                hufGroup = bd->groups + selectors[selector++];
                base = hufGroup->base - 1;
                limit = hufGroup->limit - 1;
- continue_this_group:
+ continue_this_group:
                /* Read next Huffman-coded symbol. */
                /* Note: It is far cheaper to read maxLen bits and back up than it is
-                   to read minLen bits and then an additional bit at a time, testing
+                   to read minLen bits and then add additional bit at a time, testing
                   as we go.  Because there is a trailing last block (with file CRC),
                   there is no danger of the overread causing an unexpected EOF for a
-                   valid compressed file.  As a further optimization, we do the read
+                   valid compressed file.
-                   inline (falling back to a call to get_bits if the buffer runs
-                   dry).  The following (up to got_huff_bits:) is equivalent to
-                   j = get_bits(bd, hufGroup->maxLen);
                 */
-                while ((int)(bd->inbufBitCount) < hufGroup->maxLen) {
+                if (1) {
-                        if (bd->inbufPos == bd->inbufCount) {
+                        /* As a further optimization, we do the read inline
-                                j = get_bits(bd, hufGroup->maxLen);
+                           (falling back to a call to get_bits if the buffer runs dry).
-                                goto got_huff_bits;
+                         */
-                        }
+                        int new_cnt;
-                        bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
+                        while ((new_cnt = bd->inbufBitCount - hufGroup->maxLen) < 0) {
-                        bd->inbufBitCount += 8;
+                                /* bd->inbufBitCount < hufGroup->maxLen */
-                };
+                                if (bd->inbufPos == bd->inbufCount) {
-                bd->inbufBitCount -= hufGroup->maxLen;
+                                        nextSym = get_bits(bd, hufGroup->maxLen);
-                j = (bd->inbufBits >> bd->inbufBitCount) & ((1 << hufGroup->maxLen) - 1);
+                                        goto got_huff_bits;
+                                }
- got_huff_bits:
+                                bd->inbufBits = (bd->inbufBits << 8) | bd->inbuf[bd->inbufPos++];
+                                bd->inbufBitCount += 8;
-                /* Figure how how many bits are in next symbol and unget extras */
+                        };
+                        bd->inbufBitCount = new_cnt; /* "bd->inbufBitCount -= hufGroup->maxLen;" */
+                        nextSym = (bd->inbufBits >> new_cnt) & ((1 << hufGroup->maxLen) - 1);
+ got_huff_bits: ;
+                } else { /* unoptimized equivalent */
+                        nextSym = get_bits(bd, hufGroup->maxLen);
+                }
+                /* Figure how many bits are in next symbol and unget extras */
                i = hufGroup->minLen;
-                while (j > limit[i]) ++i;
+                while (nextSym > limit[i]) ++i;
-                bd->inbufBitCount += (hufGroup->maxLen - i);
+                j = hufGroup->maxLen - i;
+                if (j < 0)
+                        return RETVAL_DATA_ERROR;
+                bd->inbufBitCount += j;
                /* Huffman decode value to get nextSym (with bounds checking) */
-                if (i > hufGroup->maxLen)
+                nextSym = (nextSym >> j) - base[i];
+                if ((unsigned)nextSym >= MAX_SYMBOLS)
                        return RETVAL_DATA_ERROR;
-                j = (j >> (hufGroup->maxLen - i)) - base[i];
+                nextSym = hufGroup->permute[nextSym];
-                if ((unsigned)j >= MAX_SYMBOLS)
-                        return RETVAL_DATA_ERROR;
-                nextSym = hufGroup->permute[j];
                /* We have now decoded the symbol, which indicates either a new literal
                   byte, or a repeated run of the most recent literal byte.  First,
@@ -375,9 +417,9 @@ static int get_next_block(bunzip_data *bd)
                if ((unsigned)nextSym <= SYMBOL_RUNB) { /* RUNA or RUNB */
                        /* If this is the start of a new run, zero out counter */
-                        if (!runPos) {
+                        if (runPos == 0) {
                                runPos = 1;
-                                t = 0;
+                                runCnt = 0;
                        }
                        /* Neat trick that saves 1 symbol: instead of or-ing 0 or 1 at
@@ -387,7 +429,7 @@ static int get_next_block(bunzip_data *bd)
                           the basic or 0/1 method (except all bits 0, which would use no
                           symbols, but a run of length 0 doesn't mean anything in this
                           context).  Thus space is saved. */
-                        t += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
+                        runCnt += (runPos << nextSym); /* +runPos if RUNA; +2*runPos if RUNB */
                        if (runPos < dbufSize) runPos <<= 1;
                        goto end_of_huffman_loop;
                }
@@ -396,13 +438,13 @@ static int get_next_block(bunzip_data *bd)
                   how many times to repeat the last literal, so append that many
                   copies to our buffer of decoded symbols (dbuf) now.  (The last
                   literal used is the one at the head of the mtfSymbol array.) */
-                if (runPos) {
+                if (runPos != 0) {
+                        uint8_t tmp_byte;
+                        if (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;
                        runPos = 0;
-                        if (dbufCount + t >= dbufSize) return RETVAL_DATA_ERROR;
-                        uc = symToByte[mtfSymbol[0]];
-                        byteCount[uc] += t;
-                        while (t--) dbuf[dbufCount++] = uc;
                }
                /* Is this the terminating symbol? */
@@ -431,12 +473,12 @@ static int get_next_block(bunzip_data *bd)
                /* We have our literal byte.  Save it into dbuf. */
                byteCount[uc]++;
-                dbuf[dbufCount++] = (unsigned)uc;
+                dbuf[dbufCount++] = (uint32_t)uc;
                /* Skip group initialization if we're not done with this group.  Done
                 * this way to avoid compiler warning. */
 end_of_huffman_loop:
-                if (symCount--) goto continue_this_group;
+                if (--symCount >= 0) goto continue_this_group;
        }
        /* At this point, we've read all the Huffman-coded symbols (and repeated
@@ -449,26 +491,28 @@ static int get_next_block(bunzip_data *bd)
        /* Turn byteCount into cumulative occurrence counts of 0 to n-1. */
        j = 0;
        for (i = 0; i < 256; i++) {
-                k = j + byteCount[i];
+                int tmp_count = j + byteCount[i];
                byteCount[i] = j;
-                j = k;
+                j = tmp_count;
        }
        /* Figure out what order dbuf would be in if we sorted it. */
        for (i = 0; i < dbufCount; i++) {
-                uc = (unsigned char)(dbuf[i] & 0xff);
+                uint8_t tmp_byte = (uint8_t)dbuf[i];
-                dbuf[byteCount[uc]] |= (i << 8);
+                int tmp_count = byteCount[tmp_byte];
-                byteCount[uc]++;
+                dbuf[tmp_count] |= (i << 8);
+                byteCount[tmp_byte] = tmp_count + 1;
        }
        /* Decode first byte by hand to initialize "previous" byte.  Note that it
           doesn't get output, and if the first three characters are identical
           it doesn't qualify as a run (hence writeRunCountdown=5). */
        if (dbufCount) {
+                uint32_t tmp;
                if ((int)origPtr >= dbufCount) return RETVAL_DATA_ERROR;
-                bd->writePos = dbuf[origPtr];
+                tmp = dbuf[origPtr];
-                bd->writeCurrent = (unsigned char)(bd->writePos & 0xff);
+                bd->writeCurrent = (uint8_t)tmp;
-                bd->writePos >>= 8;
+                bd->writePos = (tmp >> 8);
                bd->writeRunCountdown = 5;
        }
        bd->writeCount = dbufCount;
@@ -476,70 +520,84 @@ static int get_next_block(bunzip_data *bd)
        return RETVAL_OK;
 }
-/* Undo burrows-wheeler transform on intermediate buffer to produce output.
+/* Undo Burrows-Wheeler transform on intermediate buffer to produce output.
   If start_bunzip was initialized with out_fd=-1, then up to len bytes of
   data are written to outbuf.  Return value is number of bytes written or
   error (all errors are negative numbers).  If out_fd!=-1, outbuf and len
   are ignored, data is written to out_fd and return is RETVAL_OK or error.
+   NB: read_bunzip returns < 0 on error, or the number of *unfilled* bytes
+   in outbuf. IOW: on EOF returns len ("all bytes are not filled"), not 0.
+   (Why? This allows to get rid of one local variable)
 */
 int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
 {
-        const unsigned *dbuf;
+        const uint32_t *dbuf;
-        int pos, current, previous, gotcount;
+        int pos, current, previous;
+        uint32_t CRC;
-        /* If last read was short due to end of file, return last block now */
+        /* If we already have error/end indicator, return it */
-        if (bd->writeCount < 0) return bd->writeCount;
+        if (bd->writeCount < 0)
+                return bd->writeCount;
-        gotcount = 0;
        dbuf = bd->dbuf;
+        /* Register-cached state (hopefully): */
        pos = bd->writePos;
        current = bd->writeCurrent;
+        CRC = bd->writeCRC; /* small loss on x86-32 (not enough regs), win on x86-64 */
        /* We will always have pending decoded data to write into the output
           buffer unless this is the very first call (in which case we haven't
           Huffman-decoded a block into the intermediate buffer yet). */
        if (bd->writeCopies) {
+ dec_writeCopies:
                /* Inside the loop, writeCopies means extra copies (beyond 1) */
                --bd->writeCopies;
                /* Loop outputting bytes */
                for (;;) {
-                        /* If the output buffer is full, snapshot state and return */
+                        /* If the output buffer is full, save cached state and return */
-                        if (gotcount >= len) {
+                        if (--len < 0) {
-                                bd->writePos = pos;
+                                /* Unlikely branch.
-                                bd->writeCurrent = current;
+                                 * Use of "goto" instead of keeping code here
-                                bd->writeCopies++;
+                                 * helps compiler to realize this. */
-                                return len;
+                                goto outbuf_full;
                        }
                        /* Write next byte into output buffer, updating CRC */
-                        outbuf[gotcount++] = current;
+                        *outbuf++ = current;
-                        bd->writeCRC = (bd->writeCRC << 8)
+                        CRC = (CRC << 8) ^ bd->crc32Table[(CRC >> 24) ^ current];
-                                ^ bd->crc32Table[(bd->writeCRC >> 24) ^ current];
                        /* Loop now if we're outputting multiple copies of this byte */
                        if (bd->writeCopies) {
-                                --bd->writeCopies;
+                                /* Unlikely branch */
-                                continue;
+                                /*--bd->writeCopies;*/
+                                /*continue;*/
+                                /* Same, but (ab)using other existing --writeCopies operation
+                                 * (and this if() compiles into just test+branch pair): */
+                                goto dec_writeCopies;
                        }
 decode_next_byte:
-                        if (!bd->writeCount--) break;
+                        if (--bd->writeCount < 0)
+                                break; /* input block is fully consumed, need next one */
                        /* Follow sequence vector to undo Burrows-Wheeler transform */
                        previous = current;
                        pos = dbuf[pos];
-                        current = pos & 0xff;
+                        current = (uint8_t)pos;
                        pos >>= 8;
                        /* After 3 consecutive copies of the same byte, the 4th
                         * is a repeat count.  We count down from 4 instead
                         * of counting up because testing for non-zero is faster */
-                        if (--bd->writeRunCountdown) {
+                        if (--bd->writeRunCountdown != 0) {
                                if (current != previous)
                                        bd->writeRunCountdown = 4;
                        } else {
+                                /* Unlikely branch */
                                /* We have a repeated run, this byte indicates the count */
                                bd->writeCopies = current;
                                current = previous;
@@ -551,30 +609,42 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
                                /* Subtract the 1 copy we'd output anyway to get extras */
                                --bd->writeCopies;
                        }
-                }
+                } /* for(;;) */
-                /* Decompression of this block completed successfully */
+                /* Decompression of this input block completed successfully */
-                bd->writeCRC = ~bd->writeCRC;
+                bd->writeCRC = CRC = ~CRC;
-                bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ bd->writeCRC;
+                bd->totalCRC = ((bd->totalCRC << 1) | (bd->totalCRC >> 31)) ^ CRC;
-                /* If this block had a CRC error, force file level CRC error. */
+                /* If this block had a CRC error, force file level CRC error */
-                if (bd->writeCRC != bd->headerCRC) {
+                if (CRC != bd->headerCRC) {
                        bd->totalCRC = bd->headerCRC + 1;
                        return RETVAL_LAST_BLOCK;
                }
        }
        /* Refill the intermediate buffer by Huffman-decoding next block of input */
-        /* (previous is just a convenient unused temp variable here) */
+        {
-        previous = get_next_block(bd);
+                int r = get_next_block(bd);
-        if (previous) {
+                if (r) { /* error/end */
-                bd->writeCount = previous;
+                        bd->writeCount = r;
-                return (previous != RETVAL_LAST_BLOCK) ? previous : gotcount;
+                        return (r != RETVAL_LAST_BLOCK) ? r : len;
+                }
        }
-        bd->writeCRC = ~0;
+        CRC = ~0;
        pos = bd->writePos;
        current = bd->writeCurrent;
        goto decode_next_byte;
+ outbuf_full:
+        /* Output buffer is full, save cached state and return */
+        bd->writePos = pos;
+        bd->writeCurrent = current;
+        bd->writeCRC = CRC;
+        bd->writeCopies++;
+        return 0;
 }
 /* Allocate the structure, read file header.  If in_fd==-1, inbuf must contain
@@ -584,8 +654,8 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
 /* Because bunzip2 is used for help text unpacking, and because bb_show_usage()
   should work for NOFORK applets too, we must be extremely careful to not leak
   any allocations! */
-int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf,
+int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd,
-                                                int len)
+                const void *inbuf, int len)
 {
        bunzip_data *bd;
        unsigned i;
@@ -606,9 +676,11 @@ int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *in
        if (-1 == in_fd) {
                /* in this case, bd->inbuf is read-only */
                bd->inbuf = (void*)inbuf; /* cast away const-ness */
-                bd->inbufCount = len;
+        } else {
-        } else
+                bd->inbuf = (uint8_t*)(bd + 1);
-                bd->inbuf = (unsigned char *)(bd + 1);
+                memcpy(bd->inbuf, inbuf, len);
+        }
+        bd->inbufCount = len;
        /* Init the CRC32 table (big endian) */
        crc32_filltable(bd->crc32Table, 1);
@@ -632,7 +704,7 @@ int FAST_FUNC start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *in
        bd->dbufSize = 100000 * (i - h0);
        /* Cannot use xmalloc - may leak bd in NOFORK case! */
-        bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(int));
+        bd->dbuf = malloc_or_warn(bd->dbufSize * sizeof(bd->dbuf[0]));
        if (!bd->dbuf) {
                free(bd);
                xfunc_die();
@@ -652,37 +724,63 @@ IF_DESKTOP(long long) int FAST_FUNC
 unpack_bz2_stream(int src_fd, int dst_fd)
 {
        IF_DESKTOP(long long total_written = 0;)
-        char *outbuf;
        bunzip_data *bd;
+        char *outbuf;
        int i;
+        unsigned len;
        outbuf = xmalloc(IOBUF_SIZE);
-        i = start_bunzip(&bd, src_fd, NULL, 0);
+        len = 0;
-        if (!i) {
+        while (1) { /* "Process one BZ... stream" loop */
-                for (;;) {
-                        i = read_bunzip(bd, outbuf, IOBUF_SIZE);
+                i = start_bunzip(&bd, src_fd, outbuf + 2, len);
-                        if (i <= 0) break;
-                        if (i != full_write(dst_fd, outbuf, i)) {
+                if (i == 0) {
-                                i = RETVAL_SHORT_WRITE;
+                        while (1) { /* "Produce some output bytes" loop */
-                                break;
+                                i = read_bunzip(bd, outbuf, IOBUF_SIZE);
+                                if (i < 0) /* error? */
+                                        break;
+                                i = IOBUF_SIZE - i; /* number of bytes produced */
+                                if (i == 0) /* EOF? */
+                                        break;
+                                if (i != full_write(dst_fd, outbuf, i)) {
+                                        bb_error_msg("short write");
+                                        i = RETVAL_SHORT_WRITE;
+                                        goto release_mem;
+                                }
+                                IF_DESKTOP(total_written += i;)
                        }
-                        IF_DESKTOP(total_written += i;)
                }
-        }
-        /* Check CRC and release memory */
-        if (i == RETVAL_LAST_BLOCK) {
+                if (i != RETVAL_LAST_BLOCK) {
+                        bb_error_msg("bunzip error %d", i);
+                        break;
+                }
                if (bd->headerCRC != bd->totalCRC) {
                        bb_error_msg("CRC error");
-                } else {
+                        break;
-                        i = RETVAL_OK;
                }
-        } else if (i == RETVAL_SHORT_WRITE) {
-                bb_error_msg("short write");
+                /* Successfully unpacked one BZ stream */
-        } else {
+                i = RETVAL_OK;
-                bb_error_msg("bunzip error %d", i);
+                /* Do we have "BZ..." after last processed byte?
+                 * pbzip2 (parallelized bzip2) produces such files.
+                 */
+                len = bd->inbufCount - bd->inbufPos;
+                memcpy(outbuf, &bd->inbuf[bd->inbufPos], len);
+                if (len < 2) {
+                        if (safe_read(src_fd, outbuf + len, 2 - len) != 2 - len)
+                                break;
+                        len = 2;
+                }
+                if (*(uint16_t*)outbuf != BZIP2_MAGIC) /* "BZ"? */
+                        break;
+                dealloc_bunzip(bd);
+                len -= 2;
        }
+ release_mem:
        dealloc_bunzip(bd);
        free(outbuf);
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index 285b4efeb..44d894244 100644
--- a/archival/libunarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -25,7 +25,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* Default input buffer size */
diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 1a3a8f86b..a04714341 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -9,7 +9,7 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #if ENABLE_FEATURE_LZMA_FAST
 #  define speed_inline ALWAYS_INLINE
diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index ca427231e..e90dfb06f 100644
--- a/archival/libunarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -10,7 +10,7 @@
 * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #define XZ_FUNC FAST_FUNC
 #define XZ_EXTERN static
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libarchive/decompress_unzip.c
index cb8a3d737..a29eef837 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libarchive/decompress_unzip.c
@@ -35,7 +35,7 @@
 #include <setjmp.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 typedef struct huft_t {
        unsigned char e;        /* number of extra bits or operation */
diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libarchive/filter_accept_all.c
index cb1f506c8..e69deb679 100644
--- a/archival/libunarchive/filter_accept_all.c
+++ b/archival/libarchive/filter_accept_all.c
@@ -6,7 +6,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* Accept any non-null name, its not really a filter at all */
 char FAST_FUNC filter_accept_all(archive_handle_t *archive_handle)
diff --git a/archival/libunarchive/filter_accept_list.c b/archival/libarchive/filter_accept_list.c
index fe4414c85..a7640af79 100644
--- a/archival/libunarchive/filter_accept_list.c
+++ b/archival/libarchive/filter_accept_list.c
@@ -6,7 +6,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /*
 * Accept names that are in the accept list, ignoring reject list.
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libarchive/filter_accept_list_reassign.c
index 891f58390..d80f71668 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libarchive/filter_accept_list_reassign.c
@@ -6,7 +6,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */
diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libarchive/filter_accept_reject_list.c
index 89a5502d5..3e86cca65 100644
--- a/archival/libunarchive/filter_accept_reject_list.c
+++ b/archival/libarchive/filter_accept_reject_list.c
@@ -6,7 +6,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /*
 * Accept names that are in the accept list and not in the reject list
diff --git a/archival/libunarchive/find_list_entry.c b/archival/libarchive/find_list_entry.c
index 5c0c85f09..5efd1af2e 100644
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libarchive/find_list_entry.c
@@ -7,7 +7,7 @@
 #include <fnmatch.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* Find a string in a shell pattern list */
 const llist_t* FAST_FUNC find_list_entry(const llist_t *list, const char *filename)
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 6bfc6bc27..df603b111 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -5,7 +5,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 static unsigned read_num(const char *str, int base)
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 8cd1096ba..3d99b492a 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -5,7 +5,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 typedef struct hardlinks_t {
        struct hardlinks_t *next;
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index cf6487207..78b0ae25f 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -12,7 +12,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 typedef uint32_t aliased_uint32_t FIX_ALIASING;
 typedef off_t    aliased_off_t    FIX_ALIASING;
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libarchive/get_header_tar_bz2.c
index 4ffc17086..60d32069f 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libarchive/get_header_tar_bz2.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c
index a9af22e0e..b09f8691c 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libarchive/get_header_tar_gz.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/get_header_tar_lzma.c b/archival/libarchive/get_header_tar_lzma.c
index 9876b3827..da08e0c72 100644
--- a/archival/libunarchive/get_header_tar_lzma.c
+++ b/archival/libarchive/get_header_tar_lzma.c
@@ -7,7 +7,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
 {
diff --git a/archival/libunarchive/header_list.c b/archival/libarchive/header_list.c
index 902d6ebe0..c4fc75f38 100644
--- a/archival/libunarchive/header_list.c
+++ b/archival/libarchive/header_list.c
@@ -3,7 +3,7 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC header_list(const file_header_t *file_header)
 {
diff --git a/archival/libunarchive/header_skip.c b/archival/libarchive/header_skip.c
index 2af36ac9c..2bfc5253c 100644
--- a/archival/libunarchive/header_skip.c
+++ b/archival/libarchive/header_skip.c
@@ -3,7 +3,7 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
 {
diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index d863e6a29..bc4e4154b 100644
--- a/archival/libunarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 {
diff --git a/archival/libunarchive/init_handle.c b/archival/libarchive/init_handle.c
index de7021f78..6644ea13b 100644
--- a/archival/libunarchive/init_handle.c
+++ b/archival/libarchive/init_handle.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 archive_handle_t* FAST_FUNC init_handle(void)
 {
diff --git a/archival/liblzo.h b/archival/libarchive/liblzo.h
index 843997cb9..843997cb9 100644
--- a/archival/liblzo.h
+++ b/archival/libarchive/liblzo.h
diff --git a/archival/lzo1x_1.c b/archival/libarchive/lzo1x_1.c
index a88839846..a88839846 100644
--- a/archival/lzo1x_1.c
+++ b/archival/libarchive/lzo1x_1.c
diff --git a/archival/lzo1x_1o.c b/archival/libarchive/lzo1x_1o.c
index 3c61253e0..3c61253e0 100644
--- a/archival/lzo1x_1o.c
+++ b/archival/libarchive/lzo1x_1o.c
diff --git a/archival/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 483205155..483205155 100644
--- a/archival/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
diff --git a/archival/lzo1x_c.c b/archival/libarchive/lzo1x_c.c
index cc86f74b1..cc86f74b1 100644
--- a/archival/lzo1x_c.c
+++ b/archival/libarchive/lzo1x_c.c
diff --git a/archival/lzo1x_d.c b/archival/libarchive/lzo1x_d.c
index 348a85510..348a85510 100644
--- a/archival/lzo1x_d.c
+++ b/archival/libarchive/lzo1x_d.c
diff --git a/archival/libunarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index ed6a556bb..26ae565f5 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -4,12 +4,12 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* transformer(), more than meets the eye */
 /*
 * On MMU machine, the transform_prog is removed by macro magic
- * in include/unarchive.h. On NOMMU, transformer is removed.
+ * in include/archive.h. On NOMMU, transformer is removed.
 */
 void FAST_FUNC open_transformer(int fd,
        IF_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd),
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libarchive/seek_by_jump.c
index bda55e1b1..7c2c52ae1 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libarchive/seek_by_jump.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 void FAST_FUNC seek_by_jump(int fd, off_t amount)
 {
diff --git a/archival/libunarchive/seek_by_read.c b/archival/libarchive/seek_by_read.c
index 25b31365d..ad931a8de 100644
--- a/archival/libunarchive/seek_by_read.c
+++ b/archival/libarchive/seek_by_read.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /*  If we are reading through a pipe, or from stdin then we can't lseek,
 *  we must read and discard the data to skip over it.
diff --git a/archival/libunarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 4f68ba3d8..18dbfd54d 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -4,7 +4,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "ar.h"
 void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
diff --git a/archival/libunarchive/unxz/README b/archival/libarchive/unxz/README
index c5972f6b8..c5972f6b8 100644
--- a/archival/libunarchive/unxz/README
+++ b/archival/libarchive/unxz/README
diff --git a/archival/libunarchive/unxz/xz.h b/archival/libarchive/unxz/xz.h
index c6c071c4a..c6c071c4a 100644
--- a/archival/libunarchive/unxz/xz.h
+++ b/archival/libarchive/unxz/xz.h
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libarchive/unxz/xz_config.h
index 187e1cbed..187e1cbed 100644
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libarchive/unxz/xz_config.h
diff --git a/archival/libunarchive/unxz/xz_dec_bcj.c b/archival/libarchive/unxz/xz_dec_bcj.c
index 09162b51f..09162b51f 100644
--- a/archival/libunarchive/unxz/xz_dec_bcj.c
+++ b/archival/libarchive/unxz/xz_dec_bcj.c
diff --git a/archival/libunarchive/unxz/xz_dec_lzma2.c b/archival/libarchive/unxz/xz_dec_lzma2.c
index da71cb4d4..da71cb4d4 100644
--- a/archival/libunarchive/unxz/xz_dec_lzma2.c
+++ b/archival/libarchive/unxz/xz_dec_lzma2.c
diff --git a/archival/libunarchive/unxz/xz_dec_stream.c b/archival/libarchive/unxz/xz_dec_stream.c
index bdcbf1ba3..bdcbf1ba3 100644
--- a/archival/libunarchive/unxz/xz_dec_stream.c
+++ b/archival/libarchive/unxz/xz_dec_stream.c
diff --git a/archival/libunarchive/unxz/xz_lzma2.h b/archival/libarchive/unxz/xz_lzma2.h
index 47f21afbc..47f21afbc 100644
--- a/archival/libunarchive/unxz/xz_lzma2.h
+++ b/archival/libarchive/unxz/xz_lzma2.h
diff --git a/archival/libunarchive/unxz/xz_private.h b/archival/libarchive/unxz/xz_private.h
index 145649a83..145649a83 100644
--- a/archival/libunarchive/unxz/xz_private.h
+++ b/archival/libarchive/unxz/xz_private.h
diff --git a/archival/libunarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h
index 36f2a7cbf..36f2a7cbf 100644
--- a/archival/libunarchive/unxz/xz_stream.h
+++ b/archival/libarchive/unxz/xz_stream.h
diff --git a/archival/liblzo_interface.h b/archival/liblzo_interface.h
deleted file mode 100644
index 9a84c0b6b..000000000
--- a/archival/liblzo_interface.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-   This file is part of the LZO real-time data compression library.
-   Copyright (C) 1996..2008 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-   Markus F.X.J. Oberhumer <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-#define LZO1X
-#undef LZO1Y
-#undef assert
-/*
-static void die_at(int line)
-{
-        bb_error_msg_and_die("internal error at %d", line);
-}
-#define assert(v) if (!(v)) die_at(__LINE__)
-*/
-#define assert(v) ((void)0)
-int lzo1x_1_compress(const uint8_t* src, unsigned src_len,
-                uint8_t* dst, unsigned* dst_len,
-                void* wrkmem);
-int lzo1x_1_15_compress(const uint8_t* src, unsigned src_len,
-                uint8_t* dst, unsigned* dst_len,
-                void* wrkmem);
-int lzo1x_999_compress_level(const uint8_t* in, unsigned in_len,
-                uint8_t* out, unsigned* out_len,
-                void* wrkmem,
-                int compression_level);
-/* decompression */
-//int lzo1x_decompress(const uint8_t* src, unsigned src_len,
-//              uint8_t* dst, unsigned* dst_len,
-//              void* wrkmem /* NOT USED */);
-/* safe decompression with overrun testing */
-int lzo1x_decompress_safe(const uint8_t* src, unsigned src_len,
-                uint8_t* dst, unsigned* dst_len,
-                void* wrkmem /* NOT USED */);
-#define LZO_E_OK                    0
-#define LZO_E_ERROR                 (-1)
-#define LZO_E_OUT_OF_MEMORY         (-2)    /* [not used right now] */
-#define LZO_E_NOT_COMPRESSIBLE      (-3)    /* [not used right now] */
-#define LZO_E_INPUT_OVERRUN         (-4)
-#define LZO_E_OUTPUT_OVERRUN        (-5)
-#define LZO_E_LOOKBEHIND_OVERRUN    (-6)
-#define LZO_E_EOF_NOT_FOUND         (-7)
-#define LZO_E_INPUT_NOT_CONSUMED    (-8)
-#define LZO_E_NOT_YET_IMPLEMENTED   (-9)    /* [not used right now] */
-/* lzo-2.03/include/lzo/lzoconf.h */
-#define LZO_VERSION   0x2030
diff --git a/archival/lzop.c b/archival/lzop.c
index acb34fe14..094e78cf9 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -26,7 +26,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "liblzo_interface.h"
 /* lzo-2.03/src/lzo_ptr.h */
diff --git a/archival/rpm.c b/archival/rpm.c
index 7b316a5b8..380226f9b 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -8,7 +8,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 #define RPM_CHAR_TYPE           1
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 70021d539..ce8cd2c2c 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -7,7 +7,7 @@
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 #include "rpm.h"
 enum { rpm_fd = STDIN_FILENO };
diff --git a/archival/tar.c b/archival/tar.c
index 1d6e63da0..150c6f393 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -23,9 +23,28 @@
 * 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
+ * $ ln -s /tmp symlink
+ * $ tar --append -f bug.tar symlink
+ * $ rm symlink
+ * $ mkdir symlink
+ * $ tar --append -f bug.tar symlink/evil.py
+ *
+ * This will result in an archive which contains:
+ * $ tar --list -f bug.tar
+ * anything.txt
+ * symlink
+ * symlink/evil.py
+ *
+ * Untarring it puts evil.py in '/tmp' even if the -C DESTDIR is given.
+ * This doesn't feel right, and IIRC GNU tar doesn't do that.
+ */
 #include <fnmatch.h>
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 /* FIXME: Stop using this non-standard feature */
 #ifndef FNM_LEADING_DIR
 # define FNM_LEADING_DIR 0
@@ -884,7 +903,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
        /* Prepend '-' to the first argument if required */
        opt_complementary = "--:" // first arg is options
                "tt:vv:" // count -t,-v
-                "?:" // bail out with usage instead of error return
                "X::T::" // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
                "\xff::" // cumulative lists for --exclude
diff --git a/archival/unzip.c b/archival/unzip.c
index 204e34952..5d62c08cb 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -20,7 +20,7 @@
 */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 enum {
 #if BB_BIG_ENDIAN
author	Nguyễn Thái Ngọc Duy <pclouds@gmail.com>	2011-01-04 19:56:15 +0700
committer	Nguyễn Thái Ngọc Duy <pclouds@gmail.com>	2011-01-04 19:56:15 +0700
commit	5f6f2162512106adf120d4b528bb125e93e34429 (patch)
tree	7d7449f755633c263be7125ad58d21cc3ca5b8a7 /archival
parent	9db69882bee2d528d706d61d34ef7741122330be (diff)
parent	a116552869db5e7793ae10968eb3c962c69b3d8c (diff)
download	busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.gz busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.tar.bz2 busybox-w32-5f6f2162512106adf120d4b528bb125e93e34429.zip