Merge branch 'busybox' into merge

4 files changed, 36 insertions, 10 deletions

diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index ad5c5c42d..eaf67451f 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -53,12 +53,15 @@ lib-$(CONFIG_LZOPCAT)                   += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
 lib-$(CONFIG_BUNZIP2)                   += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_BZCAT)                     += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_FEATURE_UNZIP_BZIP2)       += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_LZCAT)                     += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_LZMA)                      += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_FEATURE_UNZIP_LZMA)        += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_XZCAT)                     += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_XZ)                        += open_transformer.o decompress_unxz.o
+lib-$(CONFIG_FEATURE_UNZIP_XZ)          += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_ZCAT)                      += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index bd034afdc..1830ffb8d 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -127,8 +127,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         if (hard_link) {
                 res = link(hard_link, dst_name);
                 if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                        /* shared message */
                         bb_perror_msg("can't create %slink "
-                                        "from %s to %s", "hard",
+                                        "%s to %s", "hard",
                                         dst_name,
                                         hard_link);
                 }
@@ -181,8 +182,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 if (res != 0
                  && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                 ) {
+                        /* shared message */
                         bb_perror_msg("can't create %slink "
-                                "from %s to %s", "sym",
+                                "%s to %s", "sym",
                                 dst_name,
                                 file_header->link_target);
                 }
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index fe5953da2..4fb989c29 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -134,7 +134,7 @@ static unsigned get_bits(bunzip_data *bd, int bits_wanted)
 
                 /* Avoid 32-bit overflow (dump bit buffer to top of output) */
                 if (bit_count >= 24) {
-                        bits = bd->inbufBits & ((1 << bit_count) - 1);
+                        bits = bd->inbufBits & ((1U << bit_count) - 1);
                         bits_wanted -= bit_count;
                         bits <<= bits_wanted;
                         bit_count = 0;
@@ -158,11 +158,11 @@ static int get_next_block(bunzip_data *bd)
 {
         struct group_data *hufGroup;
         int dbufCount, dbufSize, groupCount, *base, *limit, selector,
-                i, j, t, runPos, symCount, symTotal, nSelectors, byteCount[256];
+                i, j, runPos, symCount, symTotal, nSelectors, byteCount[256];
         int runCnt = runCnt; /* for compiler */
         uint8_t uc, symToByte[256], mtfSymbol[256], *selectors;
         uint32_t *dbuf;
-        unsigned origPtr;
+        unsigned origPtr, t;
 
         dbuf = bd->dbuf;
         dbufSize = bd->dbufSize;
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index c8622f97b..a9040877e 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -278,9 +278,10 @@ unpack_lzma_stream(transformer_state_t *xstate)
 
                         if (state >= LZMA_NUM_LIT_STATES) {
                                 int match_byte;
-                                uint32_t pos = buffer_pos - rep0;
+                                uint32_t pos;
 
-                                while (pos >= header.dict_size)
+                                pos = buffer_pos - rep0;
+                                if ((int32_t)pos < 0)
                                         pos += header.dict_size;
                                 match_byte = buffer[pos];
                                 do {
@@ -336,9 +337,11 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                         );
                                         if (!rc_is_bit_1(rc, prob2)) {
 #if ENABLE_FEATURE_LZMA_FAST
-                                                uint32_t pos = buffer_pos - rep0;
+                                                uint32_t pos;
                                                 state = state < LZMA_NUM_LIT_STATES ? 9 : 11;
-                                                while (pos >= header.dict_size)
+
+                                                pos = buffer_pos - rep0;
+                                                if ((int32_t)pos < 0)
                                                         pos += header.dict_size;
                                                 previous_byte = buffer[pos];
                                                 goto one_byte1;
@@ -429,10 +432,25 @@ unpack_lzma_stream(transformer_state_t *xstate)
                         }
 
                         len += LZMA_MATCH_MIN_LEN;
+                        /*
+                         * LZMA SDK has this optimized:
+                         * it precalculates size and copies many bytes
+                         * in a loop with simpler checks, a-la:
+                         *      do
+                         *              *(dest) = *(dest + ofs);
+                         *      while (++dest != lim);
+                         * and
+                         *      do {
+                         *              buffer[buffer_pos++] = buffer[pos];
+                         *              if (++pos == header.dict_size)
+                         *                      pos = 0;
+                         *      } while (--cur_len != 0);
+                         * Our code is slower (more checks per byte copy):
+                         */
  IF_NOT_FEATURE_LZMA_FAST(string:)
                         do {
                                 uint32_t pos = buffer_pos - rep0;
-                                while (pos >= header.dict_size)
+                                if ((int32_t)pos < 0)
                                         pos += header.dict_size;
                                 previous_byte = buffer[pos];
  IF_NOT_FEATURE_LZMA_FAST(one_byte2:)
@@ -448,6 +466,9 @@ unpack_lzma_stream(transformer_state_t *xstate)
                         } while (len != 0 && buffer_pos < header.dst_size);
                         /* FIXME: ...........^^^^^
                          * shouldn't it be "global_pos + buffer_pos < header.dst_size"?
+                         * It probably should, but it is a "do we accidentally
+                         * unpack more bytes than expected?" check - which
+                         * never happens for well-formed compression data...
                          */
                 }
         }