Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/archival/libarchive

Files:

• Kbuild.src (modified) (2 diffs)
• bz/blocksort.c (modified) (4 diffs)
• bz/bzlib_private.h (modified) (1 diff)
• bz/compress.c (modified) (9 diffs)
• bz/huffman.c (modified) (1 diff)
• data_align.c (modified) (1 diff)
• data_extract_all.c (modified) (2 diffs)
• data_extract_to_command.c (modified) (3 diffs)
• data_extract_to_stdout.c (modified) (1 diff)
• data_skip.c (modified) (1 diff)
• decompress_bunzip2.c (modified) (6 diffs)
• decompress_uncompress.c (modified) (13 diffs)
• decompress_unlzma.c (modified) (2 diffs)
• decompress_unxz.c (modified) (7 diffs)
• filter_accept_all.c (modified) (1 diff)
• filter_accept_list.c (modified) (1 diff)
• filter_accept_list_reassign.c (modified) (1 diff)
• filter_accept_reject_list.c (modified) (2 diffs)
• find_list_entry.c (modified) (1 diff)
• get_header_ar.c (modified) (1 diff)
• get_header_cpio.c (modified) (1 diff)
• get_header_tar.c (modified) (11 diffs)
• get_header_tar_bz2.c (modified) (2 diffs)
• get_header_tar_gz.c (modified) (1 diff)
• get_header_tar_lzma.c (modified) (2 diffs)
• header_list.c (modified) (1 diff)
• header_skip.c (modified) (1 diff)
• header_verbose_list.c (modified) (1 diff)
• init_handle.c (modified) (1 diff)
• lzo1x_9x.c (modified) (3 diffs)
• lzo1x_c.c (modified) (1 diff)
• lzo1x_d.c (modified) (1 diff)
• open_transformer.c (modified) (3 diffs)
• seek_by_jump.c (modified) (1 diff)
• seek_by_read.c (modified) (1 diff)
• unpack_ar_archive.c (modified) (1 diff)

branches/3.2/mindi-busybox/archival/libarchive/Kbuild.src

@@ -29 +29 @@
 
 DPKG_FILES:= \
+    unpack_ar_archive.o \
+    filter_accept_list_reassign.o \
     get_header_ar.o \
-    unpack_ar_archive.o \
     get_header_tar.o \
-    filter_accept_list_reassign.o
+    get_header_tar_gz.o \
+    get_header_tar_bz2.o \
+    get_header_tar_lzma.o \
 
 INSERT
@@ -43 +46 @@
 lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
 lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
-lib-$(CONFIG_GUNZIP)                    += decompress_unzip.o
-lib-$(CONFIG_RPM2CPIO)                  += decompress_unzip.o get_header_cpio.o
-lib-$(CONFIG_RPM)                       += open_transformer.o decompress_unzip.o get_header_cpio.o
+lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
+lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
 lib-$(CONFIG_TAR)                       += get_header_tar.o
 lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
-lib-$(CONFIG_UNZIP)                     += decompress_unzip.o
+lib-$(CONFIG_UNZIP)                     += decompress_gunzip.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
+lib-$(CONFIG_MODINFO)                   += open_transformer.o
+lib-$(CONFIG_INSMOD)                    += open_transformer.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
-lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o get_header_tar_lzma.o
+lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o
 lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
-lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += decompress_bunzip2.o
+lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o

branches/3.2/mindi-busybox/archival/libarchive/bz/blocksort.c

@@ -386 +386 @@
  */
 
-#if CONFIG_BZIP2_FEATURE_SPEED >= 1
+#if CONFIG_BZIP2_FAST >= 1
 
 #define TIMES_8(code) \
@@ -497 +497 @@
 
 /* 1.5% overall speedup, +290 bytes */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 3
+#if CONFIG_BZIP2_FAST >= 3
             /*-- copy 2 --*/
             if (i > hi) break;
@@ -751 +751 @@
     i = nblock - 1;
 /* 3%, +300 bytes */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 2
+#if CONFIG_BZIP2_FAST >= 2
     for (; i >= 3; i -= 4) {
         quadrant[i] = 0;
@@ -788 +788 @@
     s = block[0] << 8;
     i = nblock - 1;
-#if CONFIG_BZIP2_FEATURE_SPEED >= 2
+#if CONFIG_BZIP2_FAST >= 2
     for (; i >= 3; i -= 4) {
         s = (s >> 8) | (block[i] << 8);

branches/3.2/mindi-busybox/archival/libarchive/bz/bzlib_private.h

@@ -184 +184 @@
     int32_t  sendMTFValues__code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
     int32_t  sendMTFValues__rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
     /* second dimension: only 3 needed; 4 makes index calculations faster */
     uint32_t sendMTFValues__len_pack[BZ_MAX_ALPHA_SIZE][4];

branches/3.2/mindi-busybox/archival/libarchive/bz/compress.c

@@ -62 +62 @@
 static
 /* Helps only on level 5, on other levels hurts. ? */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
 ALWAYS_INLINE
 #endif
@@ -252 +252 @@
     int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
     int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
-    int32_t nGroups, nBytes;
+    int32_t nGroups;
 
     /*
@@ -332 +332 @@
                 s->rfreq[t][v] = 0;
 
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
         /*
          * Set up an auxiliary length table which is used to fast-track
@@ -362 +362 @@
             for (t = 0; t < nGroups; t++)
                 cost[t] = 0;
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
             if (nGroups == 6 && 50 == ge-gs+1) {
                 /*--- fast track the common case ---*/
@@ -421 +421 @@
              */
 /* 1% faster compress. +800 bytes */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 4
+#if CONFIG_BZIP2_FAST >= 4
             if (nGroups == 6 && 50 == ge-gs+1) {
                 /*--- fast track the common case ---*/
@@ -513 +513 @@
         }
 
-        nBytes = s->numZ;
         bsW(s, 16, inUse16);
 
@@ -529 +528 @@
 
     /*--- Now the selectors. ---*/
-    nBytes = s->numZ;
     bsW(s, 3, nGroups);
     bsW(s, 15, nSelectors);
@@ -539 +537 @@
 
     /*--- Now the coding tables. ---*/
-    nBytes = s->numZ;
-
     for (t = 0; t < nGroups; t++) {
         int32_t curr = s->len[t][0];
@@ -552 +548 @@
 
     /*--- And finally, the block data proper ---*/
-    nBytes = s->numZ;
     selCtr = 0;
     gs = 0;

branches/3.2/mindi-busybox/archival/libarchive/bz/huffman.c

@@ -49 +49 @@
 
 /* 90 bytes, 0.3% of overall compress speed */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 1
+#if CONFIG_BZIP2_FAST >= 1
 
 /* macro works better than inline (gcc 4.2.1) */

branches/3.2/mindi-busybox/archival/libarchive/data_align.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC data_align(archive_handle_t *archive_handle, unsigned boundary)

branches/3.2/mindi-busybox/archival/libarchive/data_extract_all.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
@@ -14 +14 @@
 
 #if ENABLE_FEATURE_TAR_SELINUX
-    char *sctx = archive_handle->tar__next_file_sctx;
+    char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE];
     if (!sctx)
-        sctx = archive_handle->tar__global_sctx;
+        sctx = archive_handle->tar__sctx[PAX_GLOBAL];
     if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */
         setfscreatecon(sctx);
-        free(archive_handle->tar__next_file_sctx);
-        archive_handle->tar__next_file_sctx = NULL;
+        free(archive_handle->tar__sctx[PAX_NEXT_FILE]);
+        archive_handle->tar__sctx[PAX_NEXT_FILE] = NULL;
     }
 #endif

branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_command.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 enum {
@@ -65 +65 @@
 
 #if 0 /* do we need this? ENABLE_FEATURE_TAR_SELINUX */
-    char *sctx = archive_handle->tar__next_file_sctx;
+    char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE];
     if (!sctx)
-        sctx = archive_handle->tar__global_sctx;
+        sctx = archive_handle->tar__sctx[PAX_GLOBAL];
     if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */
         setfscreatecon(sctx);
-        free(archive_handle->tar__next_file_sctx);
-        archive_handle->tar__next_file_sctx = NULL;
+        free(archive_handle->tar__sctx[PAX_NEXT_FILE]);
+        archive_handle->tar__sctx[PAX_NEXT_FILE] = NULL;
     }
 #endif
@@ -100 +100 @@
             xdup2(p[0], STDIN_FILENO);
             signal(SIGPIPE, SIG_DFL);
-            execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", archive_handle->tar__to_command, NULL);
-            bb_perror_msg_and_die("can't execute '%s'", DEFAULT_SHELL);
+            execl(archive_handle->tar__to_command_shell,
+                archive_handle->tar__to_command_shell,
+                "-c",
+                archive_handle->tar__to_command,
+                NULL);
+            bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
         }
         close(p[0]);

branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_stdout.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC data_extract_to_stdout(archive_handle_t *archive_handle)

branches/3.2/mindi-busybox/archival/libarchive/data_skip.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC data_skip(archive_handle_t *archive_handle)

branches/3.2/mindi-busybox/archival/libarchive/decompress_bunzip2.c

@@ -41 +41 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Constants for Huffman coding */
@@ -722 +722 @@
 /* Decompress src_fd to dst_fd.  Stops at end of bzip data, not end of file. */
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_bz2_stream(int src_fd, int dst_fd)
+unpack_bz2_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -729 +729 @@
     int i;
     unsigned len;
+
+    if (check_signature16(aux, src_fd, BZIP2_MAGIC))
+        return -1;
 
     outbuf = xmalloc(IOBUF_SIZE);
@@ -753 +756 @@
         }
 
-        if (i != RETVAL_LAST_BLOCK) {
+        if (i != RETVAL_LAST_BLOCK
+        /* Observed case when i == RETVAL_OK:
+         * "bzcat z.bz2", where "z.bz2" is a bzipped zero-length file
+         * (to be exact, z.bz2 is exactly these 14 bytes:
+         * 42 5a 68 39 17 72 45 38  50 90 00 00 00 00).
+         */
+         && i != RETVAL_OK
+        ) {
             bb_error_msg("bunzip error %d", i);
             break;
@@ -788 +798 @@
 }
 
-IF_DESKTOP(long long) int FAST_FUNC
-unpack_bz2_stream_prime(int src_fd, int dst_fd)
-{
-    uint16_t magic2;
-    xread(src_fd, &magic2, 2);
-    if (magic2 != BZIP2_MAGIC) {
-        bb_error_msg_and_die("invalid magic");
-    }
-    return unpack_bz2_stream(src_fd, dst_fd);
-}
-
 #ifdef TESTING
 
@@ -813 +812 @@
     char c;
 
-    int i = unpack_bz2_stream_prime(0, 1);
+    int i = unpack_bz2_stream(0, 1);
     if (i < 0)
         fprintf(stderr, "%s\n", bunzip_errors[-i]);

branches/3.2/mindi-busybox/archival/libarchive/decompress_uncompress.c

@@ -26 +26 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 
@@ -74 +74 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_Z_stream(int fd_in, int fd_out)
+unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
     IF_DESKTOP(long long total_written = 0;)
     IF_DESKTOP(long long) int retval = -1;
     unsigned char *stackp;
-    long code;
     int finchar;
     long oldcode;
@@ -104 +103 @@
     int block_mode; /* = BLOCK_MODE; */
 
+    if (check_signature16(aux, src_fd, COMPRESS_MAGIC))
+        return -1;
+
     inbuf = xzalloc(IBUFSIZ + 64);
     outbuf = xzalloc(OBUFSIZ + 2048);
-    htab = xzalloc(HSIZE);  /* wsn't zeroed out before, maybe can xmalloc? */
+    htab = xzalloc(HSIZE);  /* wasn't zeroed out before, maybe can xmalloc? */
     codetab = xzalloc(HSIZE * sizeof(codetab[0]));
 
@@ -113 +115 @@
     /* xread isn't good here, we have to return - caller may want
      * to do some cleanup (e.g. delete incomplete unpacked file etc) */
-    if (full_read(fd_in, inbuf, 1) != 1) {
+    if (full_read(src_fd, inbuf, 1) != 1) {
         bb_error_msg("short read");
         goto err;
@@ -141 +143 @@
     /*clear_tab_prefixof(); - done by xzalloc */
 
-    for (code = 255; code >= 0; --code) {
-        tab_suffixof(code) = (unsigned char) code;
+    {
+        int i;
+        for (i = 255; i >= 0; --i)
+            tab_suffixof(i) = (unsigned char) i;
     }
 
@@ -163 +167 @@
 
         if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
-            rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ);
-//error check??
+            rsize = safe_read(src_fd, inbuf + insize, IBUFSIZ);
+            if (rsize < 0)
+                bb_error_msg_and_die(bb_msg_read_error);
             insize += rsize;
         }
@@ -172 +177 @@
 
         while (inbits > posbits) {
+            long code;
+
             if (free_ent > maxcode) {
                 posbits =
@@ -188 +195 @@
             {
                 unsigned char *p = &inbuf[posbits >> 3];
-
-                code = ((((long) (p[0])) | ((long) (p[1]) << 8) |
-                         ((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask;
+                code = ((p[0]
+                    | ((long) (p[1]) << 8)
+                    | ((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask;
             }
             posbits += n_bits;
 
-
             if (oldcode == -1) {
+                if (code >= 256)
+                    bb_error_msg_and_die("corrupted data"); /* %ld", code); */
                 oldcode = code;
                 finchar = (int) oldcode;
@@ -221 +229 @@
             if (code >= free_ent) {
                 if (code > free_ent) {
+/*
                     unsigned char *p;
 
                     posbits -= n_bits;
                     p = &inbuf[posbits >> 3];
-
                     bb_error_msg
                         ("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)",
-                         insize, posbits, p[-1], p[0], p[1], p[2], p[3],
-                         (posbits & 07));
+                        insize, posbits, p[-1], p[0], p[1], p[2], p[3],
+                        (posbits & 07));
+*/
                     bb_error_msg("corrupted data");
                     goto err;
@@ -239 +248 @@
 
             /* Generate output characters in reverse order */
-            while ((long) code >= (long) 256) {
+            while (code >= 256) {
+                if (stackp <= &htabof(0))
+                    bb_error_msg_and_die("corrupted data");
                 *--stackp = tab_suffixof(code);
                 code = tab_prefixof(code);
@@ -264 +275 @@
 
                         if (outpos >= OBUFSIZ) {
-                            full_write(fd_out, outbuf, outpos);
-//error check??
+                            xwrite(dst_fd, outbuf, outpos);
                             IF_DESKTOP(total_written += outpos;)
                             outpos = 0;
@@ -279 +289 @@
 
             /* Generate the new entry. */
-            code = free_ent;
-            if (code < maxmaxcode) {
-                tab_prefixof(code) = (unsigned short) oldcode;
-                tab_suffixof(code) = (unsigned char) finchar;
-                free_ent = code + 1;
+            if (free_ent < maxmaxcode) {
+                tab_prefixof(free_ent) = (unsigned short) oldcode;
+                tab_suffixof(free_ent) = (unsigned char) finchar;
+                free_ent++;
             }
 
@@ -293 +302 @@
 
     if (outpos > 0) {
-        full_write(fd_out, outbuf, outpos);
-//error check??
+        xwrite(dst_fd, outbuf, outpos);
         IF_DESKTOP(total_written += outpos;)
     }

branches/3.2/mindi-busybox/archival/libarchive/decompress_unlzma.c

@@ -10 +10 @@
  */
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 #if ENABLE_FEATURE_LZMA_FAST
@@ -214 +214 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_lzma_stream(int src_fd, int dst_fd)
+unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst_fd)
 {
     IF_DESKTOP(long long total_written = 0;)

branches/3.2/mindi-busybox/archival/libarchive/decompress_unxz.c

@@ -11 +11 @@
  */
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 #define XZ_FUNC FAST_FUNC
@@ -31 +31 @@
 #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
 #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
 
 #include "unxz/xz_dec_bcj.c"
@@ -39 +39 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_xz_stream(int src_fd, int dst_fd)
+unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
+    enum xz_ret xz_result;
     struct xz_buf iobuf;
     struct xz_dec *state;
@@ -50 +51 @@
 
     memset(&iobuf, 0, sizeof(iobuf));
-    /* Preload XZ file signature */
-    membuf = (void*) strcpy(xmalloc(2 * BUFSIZ), HEADER_MAGIC);
+    membuf = xmalloc(2 * BUFSIZ);
     iobuf.in = membuf;
-    iobuf.in_size = HEADER_MAGIC_SIZE;
     iobuf.out = membuf + BUFSIZ;
     iobuf.out_size = BUFSIZ;
+
+    if (!aux || aux->check_signature == 0) {
+        /* Preload XZ file signature */
+        strcpy((char*)membuf, HEADER_MAGIC);
+        iobuf.in_size = HEADER_MAGIC_SIZE;
+    } /* else: let xz code read & check it */
 
     /* Limit memory usage to about 64 MiB. */
     state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
 
+    xz_result = X_OK;
     while (1) {
-        enum xz_ret r;
-
         if (iobuf.in_pos == iobuf.in_size) {
             int rd = safe_read(src_fd, membuf, BUFSIZ);
@@ -70 +74 @@
                 break;
             }
+            if (rd == 0 && xz_result == XZ_STREAM_END)
+                break;
             iobuf.in_size = rd;
             iobuf.in_pos = 0;
         }
+        if (xz_result == XZ_STREAM_END) {
+            /*
+             * Try to start decoding next concatenated stream.
+             * Stream padding must always be a multiple of four
+             * bytes to preserve four-byte alignment. To keep the
+             * code slightly smaller, we aren't as strict here as
+             * the .xz spec requires. We just skip all zero-bytes
+             * without checking the alignment and thus can accept
+             * files that aren't valid, e.g. the XZ utils test
+             * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
+             */
+            do {
+                if (membuf[iobuf.in_pos] != 0) {
+                    xz_dec_reset(state);
+                    goto do_run;
+                }
+                iobuf.in_pos++;
+            } while (iobuf.in_pos < iobuf.in_size);
+        }
+ do_run:
 //      bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
 //              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
-        r = xz_dec_run(state, &iobuf);
+        xz_result = xz_dec_run(state, &iobuf);
 //      bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
-//              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
+//              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
         if (iobuf.out_pos) {
             xwrite(dst_fd, iobuf.out, iobuf.out_pos);
@@ -83 +109 @@
             iobuf.out_pos = 0;
         }
-        if (r == XZ_STREAM_END) {
-            break;
+        if (xz_result == XZ_STREAM_END) {
+            /*
+             * Can just "break;" here, if not for concatenated
+             * .xz streams.
+             * Checking for padding may require buffer
+             * replenishment. Can't do it here.
+             */
+            continue;
         }
-        if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
+        if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
             bb_error_msg("corrupted data");
             total = -1;
@@ -92 +124 @@
         }
     }
+
     xz_dec_end(state);
     free(membuf);

branches/3.2/mindi-busybox/archival/libarchive/filter_accept_all.c

@@ -7 +7 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Accept any non-null name, its not really a filter at all */

branches/3.2/mindi-busybox/archival/libarchive/filter_accept_list.c

@@ -7 +7 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /*

branches/3.2/mindi-busybox/archival/libarchive/filter_accept_list_reassign.c

@@ -7 +7 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Built and used only if ENABLE_DPKG || ENABLE_DPKG_DEB */

branches/3.2/mindi-busybox/archival/libarchive/filter_accept_reject_list.c

@@ -7 +7 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /*
@@ -25 +25 @@
         return EXIT_FAILURE;
     }
-    accept_entry = find_list_entry2(archive_handle->accept, key);
 
     /* Fail if an accept list was specified and the key wasnt in there */
-    if ((accept_entry == NULL) && archive_handle->accept) {
-        return EXIT_FAILURE;
+    if (archive_handle->accept) {
+        accept_entry = find_list_entry2(archive_handle->accept, key);
+        if (!accept_entry) {
+            return EXIT_FAILURE;
+        }
     }
 

branches/3.2/mindi-busybox/archival/libarchive/find_list_entry.c

@@ -8 +8 @@
 #include <fnmatch.h>
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Find a string in a shell pattern list */

branches/3.2/mindi-busybox/archival/libarchive/get_header_ar.c

@@ -6 +6 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 #include "ar.h"
 

branches/3.2/mindi-busybox/archival/libarchive/get_header_cpio.c

@@ -6 +6 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 typedef struct hardlinks_t {

branches/3.2/mindi-busybox/archival/libarchive/get_header_tar.c

@@ -13 +13 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 typedef uint32_t aliased_uint32_t FIX_ALIASING;
 typedef off_t    aliased_off_t    FIX_ALIASING;
 
+
+const char* FAST_FUNC strip_unsafe_prefix(const char *str)
+{
+    const char *cp = str;
+    while (1) {
+        char *cp2;
+        if (*cp == '/') {
+            cp++;
+            continue;
+        }
+        if (strncmp(cp, "/../"+1, 3) == 0) {
+            cp += 3;
+            continue;
+        }
+        cp2 = strstr(cp, "/../");
+        if (!cp2)
+            break;
+        cp = cp2 + 4;
+    }
+    if (cp != str) {
+        static smallint warned = 0;
+        if (!warned) {
+            warned = 1;
+            bb_error_msg("removing leading '%.*s' from member names",
+                (int)(cp - str), str);
+        }
+    }
+    return cp;
+}
 
 /* NB: _DESTROYS_ str[len] character! */
@@ -51 +80 @@
          * NB: tarballs with NEGATIVE unix times encoded that way were seen!
          */
-        v = first;
-        /* Sign-extend using 6th bit: */
-        v <<= sizeof(unsigned long long)*8 - 7;
-        v = (long long)v >> (sizeof(unsigned long long)*8 - 7);
+        /* Sign-extend 7bit 'first' to 64bit 'v' (that is, using 6th bit as sign): */
+        first <<= 1;
+        first >>= 1; /* now 7th bit = 6th bit */
+        v = first;   /* sign-extend 8 bits to 64 */
         while (--len != 0)
-            v = (v << 8) + (unsigned char) *str++;
+            v = (v << 8) + (uint8_t) *++str;
     }
     return v;
@@ -62 +91 @@
 #define GET_OCTAL(a) getOctal((a), sizeof(a))
 
-#if ENABLE_FEATURE_TAR_SELINUX
-/* Scan a PAX header for SELinux contexts, via "RHT.security.selinux" keyword.
- * This is what Red Hat's patched version of tar uses.
- */
-# define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
-static char *get_selinux_sctx_from_pax_hdr(archive_handle_t *archive_handle, unsigned sz)
+/* "global" is 0 or 1 */
+static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int global)
 {
     char *buf, *p;
-    char *result;
-
-    p = buf = xmalloc(sz + 1);
+    unsigned blk_sz;
+
+    blk_sz = (sz + 511) & (~511);
+    p = buf = xmalloc(blk_sz + 1);
+    xread(archive_handle->src_fd, buf, blk_sz);
+    archive_handle->offset += blk_sz;
+
     /* prevent bb_strtou from running off the buffer */
     buf[sz] = '\0';
-    xread(archive_handle->src_fd, buf, sz);
-    archive_handle->offset += sz;
-
-    result = NULL;
+
     while (sz != 0) {
         char *end, *value;
@@ -105 +131 @@
          */
         p[-1] = '\0';
-        /* Is it selinux security context? */
         value = end + 1;
+
+#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+        if (!global && strncmp(value, "path=", sizeof("path=") - 1) == 0) {
+            value += sizeof("path=") - 1;
+            free(archive_handle->tar__longname);
+            archive_handle->tar__longname = xstrdup(value);
+            continue;
+        }
+#endif
+
+#if ENABLE_FEATURE_TAR_SELINUX
+        /* Scan for SELinux contexts, via "RHT.security.selinux" keyword.
+         * This is what Red Hat's patched version of tar uses.
+         */
+# define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
         if (strncmp(value, SELINUX_CONTEXT_KEYWORD"=", sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1) == 0) {
             value += sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1;
-            result = xstrdup(value);
-            break;
-        }
+            free(archive_handle->tar__sctx[global]);
+            archive_handle->tar__sctx[global] = xstrdup(value);
+            continue;
+        }
+#endif
     }
 
     free(buf);
-    return result;
 }
-#endif
 
 char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
@@ -196 +236 @@
     ) {
 #if ENABLE_FEATURE_TAR_AUTODETECT
-        char FAST_FUNC (*get_header_ptr)(archive_handle_t *);
-        uint16_t magic2;
-
  autodetect:
-        magic2 = *(uint16_t*)tar.name;
-        /* tar gz/bz autodetect: check for gz/bz2 magic.
-         * If we see the magic, and it is the very first block,
-         * we can switch to get_header_tar_gz/bz2/lzma().
-         * Needs seekable fd. I wish recv(MSG_PEEK) works
-         * on any fd... */
-# if ENABLE_FEATURE_SEAMLESS_GZ
-        if (magic2 == GZIP_MAGIC) {
-            get_header_ptr = get_header_tar_gz;
-        } else
-# endif
-# if ENABLE_FEATURE_SEAMLESS_BZ2
-        if (magic2 == BZIP2_MAGIC
-         && tar.name[2] == 'h' && isdigit(tar.name[3])
-        ) { /* bzip2 */
-            get_header_ptr = get_header_tar_bz2;
-        } else
-# endif
-# if ENABLE_FEATURE_SEAMLESS_XZ
-        //TODO: if (magic2 == XZ_MAGIC1)...
-        //else
-# endif
-            goto err;
         /* Two different causes for lseek() != 0:
          * unseekable fd (would like to support that too, but...),
@@ -228 +242 @@
         if (lseek(archive_handle->src_fd, -i, SEEK_CUR) != 0)
             goto err;
-        while (get_header_ptr(archive_handle) == EXIT_SUCCESS)
-            continue;
-        return EXIT_FAILURE;
+        if (setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_detected:*/ 0) != 0)
  err:
-#endif /* FEATURE_TAR_AUTODETECT */
+            bb_error_msg_and_die("invalid tar magic");
+        archive_handle->offset = 0;
+        goto again_after_align;
+#endif
         bb_error_msg_and_die("invalid tar magic");
     }
@@ -320 +335 @@
     /* (typeflag was not trashed because chksum does not use getOctal) */
     switch (tar.typeflag) {
-    /* busybox identifies hard links as being regular files with 0 size and a link name */
-    case '1':
+    case '1': /* hardlink */
+        /* we mark hardlinks as regular files with zero size and a link name */
         file_header->mode |= S_IFREG;
-        break;
+        /* on size of link fields from star(4)
+         * ... For tar archives written by pre POSIX.1-1988
+         * implementations, the size field usually contains the size of
+         * the file and needs to be ignored as no data may follow this
+         * header type.  For POSIX.1- 1988 compliant archives, the size
+         * field needs to be 0.  For POSIX.1-2001 compliant archives,
+         * the size field may be non zero, indicating that file data is
+         * included in the archive.
+         * i.e; always assume this is zero for safety.
+         */
+        goto size0;
     case '7':
     /* case 0: */
@@ -380 +405 @@
     case 'V':   /* Volume header */
 #endif
-#if !ENABLE_FEATURE_TAR_SELINUX
     case 'g':   /* pax global header */
-    case 'x':   /* pax extended header */
-#else
+    case 'x': { /* pax extended header */
+        if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
+            goto skip_ext_hdr;
+        process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
+        goto again_after_align;
+    }
  skip_ext_hdr:
-#endif
     {
         off_t sz;
@@ -397 +424 @@
         goto again_after_align;
     }
-#if ENABLE_FEATURE_TAR_SELINUX
-    case 'g':   /* pax global header */
-    case 'x': { /* pax extended header */
-        char **pp;
-        if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
-            goto skip_ext_hdr;
-        pp = (tar.typeflag == 'g') ? &archive_handle->tar__global_sctx : &archive_handle->tar__next_file_sctx;
-        free(*pp);
-        *pp = get_selinux_sctx_from_pax_hdr(archive_handle, file_header->size);
-        goto again;
-    }
-#endif
     default:
         bb_error_msg_and_die("unknown typeflag: 0x%x", tar.typeflag);
@@ -423 +438 @@
     }
 #endif
-    if (strncmp(file_header->name, "/../"+1, 3) == 0
-     || strstr(file_header->name, "/../")
-    ) {
-        bb_error_msg_and_die("name with '..' encountered: '%s'",
-                file_header->name);
-    }
+
+    /* Everything up to and including last ".." component is stripped */
+    overlapping_strcpy(file_header->name, strip_unsafe_prefix(file_header->name));
 
     /* Strip trailing '/' in directories */
@@ -441 +453 @@
             *cp = '\0';
         archive_handle->action_data(archive_handle);
-        if (archive_handle->accept || archive_handle->reject)
+        if (archive_handle->accept || archive_handle->reject
+         || (archive_handle->ah_flags & ARCHIVE_REMEMBER_NAMES)
+        ) {
             llist_add_to(&archive_handle->passed, file_header->name);
-        else /* Caller isn't interested in list of unpacked files */
+        } else /* Caller isn't interested in list of unpacked files */
             free(file_header->name);
     } else {

branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_bz2.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 char FAST_FUNC get_header_tar_bz2(archive_handle_t *archive_handle)
@@ -12 +12 @@
     archive_handle->seek = seek_by_read;
 
-    open_transformer(archive_handle->src_fd, unpack_bz2_stream_prime, "bunzip2");
+    open_transformer_with_sig(archive_handle->src_fd, unpack_bz2_stream, "bunzip2");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)

branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_gz.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
 {
-#if BB_MMU
-    unsigned char magic[2];
-#endif
-
     /* Can't lseek over pipes */
     archive_handle->seek = seek_by_read;
 
-    /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case).
-     * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will
-     * need the header. */
-#if BB_MMU
-    xread(archive_handle->src_fd, &magic, 2);
-    /* Can skip this check, but error message will be less clear */
-    if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-        bb_error_msg_and_die("invalid gzip magic");
-    }
-#endif
-
-    open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip");
+    open_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)

branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_lzma.c

@@ -8 +8 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 char FAST_FUNC get_header_tar_lzma(archive_handle_t *archive_handle)
@@ -15 +15 @@
     archive_handle->seek = seek_by_read;
 
-    open_transformer(archive_handle->src_fd, unpack_lzma_stream, "unlzma");
+    open_transformer_with_sig(archive_handle->src_fd, unpack_lzma_stream, "unlzma");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)

branches/3.2/mindi-busybox/archival/libarchive/header_list.c

@@ -4 +4 @@
  */
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC header_list(const file_header_t *file_header)

branches/3.2/mindi-busybox/archival/libarchive/header_skip.c

@@ -4 +4 @@
  */
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)

branches/3.2/mindi-busybox/archival/libarchive/header_verbose_list.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC header_verbose_list(const file_header_t *file_header)

branches/3.2/mindi-busybox/archival/libarchive/init_handle.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 archive_handle_t* FAST_FUNC init_handle(void)

branches/3.2/mindi-busybox/archival/libarchive/lzo1x_9x.c

@@ -645 +645 @@
 
 static int min_gain(unsigned ahead, unsigned lit1,
-            unsigned lit2, int l1, int l2, int l3)
+            unsigned lit2, int l1, int l2, int l3)
 {
     int lazy_match_min_gain = 0;
@@ -674 +674 @@
 
 static void better_match(const lzo_swd_p swd,
-               unsigned *m_len, unsigned *m_off)
+            unsigned *m_len, unsigned *m_off)
 {
     if (*m_len <= M2_MIN_LEN)
@@ -915 +915 @@
     compression_level -= 7;
     return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem,
-                       c[compression_level].good_length,
-                       c[compression_level].max_lazy,
-                       c[compression_level].max_chain,
-                       c[compression_level].use_best_off);
-}
+                    c[compression_level].good_length,
+                    c[compression_level].max_lazy,
+                    c[compression_level].max_chain,
+                    c[compression_level].use_best_off);
+}

branches/3.2/mindi-busybox/archival/libarchive/lzo1x_c.c

@@ -16 +16 @@
    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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 

branches/3.2/mindi-busybox/archival/libarchive/lzo1x_d.c

@@ -16 +16 @@
    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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 

branches/3.2/mindi-busybox/archival/libarchive/open_transformer.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
+
+void FAST_FUNC init_transformer_aux_data(transformer_aux_data_t *aux)
+{
+    memset(aux, 0, sizeof(*aux));
+}
+
+int FAST_FUNC check_signature16(transformer_aux_data_t *aux, int src_fd, unsigned magic16)
+{
+    if (aux && aux->check_signature) {
+        uint16_t magic2;
+        if (full_read(src_fd, &magic2, 2) != 2 || magic2 != magic16) {
+            bb_error_msg("invalid magic");
+#if 0 /* possible future extension */
+            if (aux->check_signature > 1)
+                xfunc_die();
+#endif
+            return -1;
+        }
+    }
+    return 0;
+}
+
+void check_errors_in_children(int signo)
+{
+    int status;
+
+    if (!signo) {
+        /* block waiting for any child */
+        if (wait(&status) < 0)
+            return; /* probably there are no children */
+        goto check_status;
+    }
+
+    /* Wait for any child without blocking */
+    for (;;) {
+        if (wait_any_nohang(&status) < 0)
+            /* wait failed?! I'm confused... */
+            return;
+ check_status:
+        if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+            /* this child exited with 0 */
+            continue;
+        /* Cannot happen?
+        if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; */
+        bb_got_signal = 1;
+    }
+}
 
 /* transformer(), more than meets the eye */
-/*
- * On MMU machine, the transform_prog is removed by macro magic
- * in include/archive.h. On NOMMU, transformer is removed.
- */
+#if BB_MMU
 void FAST_FUNC open_transformer(int fd,
-    IF_DESKTOP(long long) int FAST_FUNC (*transformer)(int src_fd, int dst_fd),
-    const char *transform_prog)
+    int check_signature,
+    IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+)
+#else
+void FAST_FUNC open_transformer(int fd, const char *transform_prog)
+#endif
 {
     struct fd_pair fd_pipe;
@@ -26 +74 @@
         // FIXME: error check?
 #if BB_MMU
-        transformer(fd, fd_pipe.wr);
-        if (ENABLE_FEATURE_CLEAN_UP) {
-            close(fd_pipe.wr); /* send EOF */
-            close(fd);
-        }
-        /* must be _exit! bug was actually seen here */
-        _exit(EXIT_SUCCESS);
+        {
+            transformer_aux_data_t aux;
+            init_transformer_aux_data(&aux);
+            aux.check_signature = check_signature;
+            transformer(&aux, fd, fd_pipe.wr);
+            if (ENABLE_FEATURE_CLEAN_UP) {
+                close(fd_pipe.wr); /* send EOF */
+                close(fd);
+            }
+            /* must be _exit! bug was actually seen here */
+            _exit(EXIT_SUCCESS);
+        }
 #else
         {
@@ -53 +106 @@
     xmove_fd(fd_pipe.rd, fd);
 }
+
+
+#if SEAMLESS_COMPRESSION
+
+/* Used by e.g. rpm which gives us a fd without filename,
+ * thus we can't guess the format from filename's extension.
+ */
+int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected)
+{
+    union {
+        uint8_t b[4];
+        uint16_t b16[2];
+        uint32_t b32[1];
+    } magic;
+    int offset = -2;
+    USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);)
+    USE_FOR_NOMMU(const char *xformer_prog;)
+
+    /* .gz and .bz2 both have 2-byte signature, and their
+     * unpack_XXX_stream wants this header skipped. */
+    xread(fd, magic.b16, sizeof(magic.b16[0]));
+    if (ENABLE_FEATURE_SEAMLESS_GZ
+     && magic.b16[0] == GZIP_MAGIC
+    ) {
+        USE_FOR_MMU(xformer = unpack_gz_stream;)
+        USE_FOR_NOMMU(xformer_prog = "gunzip";)
+        goto found_magic;
+    }
+    if (ENABLE_FEATURE_SEAMLESS_BZ2
+     && magic.b16[0] == BZIP2_MAGIC
+    ) {
+        USE_FOR_MMU(xformer = unpack_bz2_stream;)
+        USE_FOR_NOMMU(xformer_prog = "bunzip2";)
+        goto found_magic;
+    }
+    if (ENABLE_FEATURE_SEAMLESS_XZ
+     && magic.b16[0] == XZ_MAGIC1
+    ) {
+        offset = -6;
+        xread(fd, magic.b32, sizeof(magic.b32[0]));
+        if (magic.b32[0] == XZ_MAGIC2) {
+            USE_FOR_MMU(xformer = unpack_xz_stream;)
+            USE_FOR_NOMMU(xformer_prog = "unxz";)
+            goto found_magic;
+        }
+    }
+
+    /* No known magic seen */
+    if (fail_if_not_detected)
+        bb_error_msg_and_die("no gzip"
+            IF_FEATURE_SEAMLESS_BZ2("/bzip2")
+            IF_FEATURE_SEAMLESS_XZ("/xz")
+            " magic");
+    xlseek(fd, offset, SEEK_CUR);
+    return 1;
+
+ found_magic:
+# if BB_MMU
+    open_transformer_with_no_sig(fd, xformer);
+# else
+    /* NOMMU version of open_transformer execs
+     * an external unzipper that wants
+     * file position at the start of the file */
+    xlseek(fd, offset, SEEK_CUR);
+    open_transformer_with_sig(fd, xformer, xformer_prog);
+# endif
+    return 0;
+}
+
+int FAST_FUNC open_zipped(const char *fname)
+{
+    char *sfx;
+    int fd;
+
+    fd = open(fname, O_RDONLY);
+    if (fd < 0)
+        return fd;
+
+    sfx = strrchr(fname, '.');
+    if (sfx) {
+        sfx++;
+        if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
+            /* .lzma has no header/signature, just trust it */
+            open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma");
+        else
+        if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
+         || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
+         || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
+        ) {
+            setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+        }
+    }
+
+    return fd;
+}
+
+#endif /* SEAMLESS_COMPRESSION */
+
+void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p)
+{
+    int fd;
+    char *image;
+
+    fd = open_zipped(fname);
+    if (fd < 0)
+        return NULL;
+
+    image = xmalloc_read(fd, maxsz_p);
+    if (!image)
+        bb_perror_msg("read error from '%s'", fname);
+    close(fd);
+
+    return image;
+}

branches/3.2/mindi-busybox/archival/libarchive/seek_by_jump.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC seek_by_jump(int fd, off_t amount)

branches/3.2/mindi-busybox/archival/libarchive/seek_by_read.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /*  If we are reading through a pipe, or from stdin then we can't lseek,

branches/3.2/mindi-busybox/archival/libarchive/unpack_ar_archive.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 #include "ar.h"