Merge branch 'busybox' into merge

4 files changed, 48 insertions, 36 deletions

diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 94dbd7a95..74d364379 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -1207,7 +1207,7 @@ unpack_gz_stream(transformer_state_t *xstate)
         if (check_signature16(xstate, GZIP_MAGIC))
                 return -1;
 #else
-        if (xstate->check_signature) {
+        if (!xstate->signature_skipped) {
                 uint16_t magic2;
 
                 if (full_read(xstate->src_fd, &magic2, 2) != 2) {
@@ -1216,7 +1216,7 @@ unpack_gz_stream(transformer_state_t *xstate)
                         return -1;
                 }
                 if (magic2 == COMPRESS_MAGIC) {
-                        xstate->check_signature = 0;
+                        xstate->signature_skipped = 2;
                         return unpack_Z_stream(xstate);
                 }
                 if (magic2 != GZIP_MAGIC)
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index 1f408abfd..cd32cc745 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -55,7 +55,7 @@ unpack_xz_stream(transformer_state_t *xstate)
         iobuf.out = membuf + BUFSIZ;
         iobuf.out_size = BUFSIZ;
 
-        if (!xstate || xstate->check_signature == 0) {
+        if (!xstate || xstate->signature_skipped) {
                 /* Preload XZ file signature */
                 strcpy((char*)membuf, HEADER_MAGIC);
                 iobuf.in_size = HEADER_MAGIC_SIZE;
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index ac2be726f..ea91a883e 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -60,13 +60,21 @@ static unsigned long long getOctal(char *str, int len)
 }
 #define GET_OCTAL(a) getOctal((a), sizeof(a))
 
+#define TAR_EXTD (ENABLE_FEATURE_TAR_GNU_EXTENSIONS || ENABLE_FEATURE_TAR_SELINUX)
+#if !TAR_EXTD
+#define process_pax_hdr(archive_handle, sz, global) \
+        process_pax_hdr(archive_handle, sz)
+#endif
 /* "global" is 0 or 1 */
 static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int global)
 {
+#if !TAR_EXTD
+        unsigned blk_sz = (sz + 511) & (~511);
+        seek_by_read(archive_handle->src_fd, blk_sz);
+#else
+        unsigned blk_sz = (sz + 511) & (~511);
         char *buf, *p;
-        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;
@@ -104,30 +112,31 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                 p[-1] = '\0';
                 value = end + 1;
 
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
                 if (!global && is_prefixed_with(value, "path=")) {
                         value += sizeof("path=") - 1;
                         free(archive_handle->tar__longname);
                         archive_handle->tar__longname = xstrdup(value);
                         continue;
                 }
-#endif
+# endif
 
-#if ENABLE_FEATURE_TAR_SELINUX
+# 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"
+#  define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
                 if (is_prefixed_with(value, SELINUX_CONTEXT_KEYWORD"=")) {
                         value += sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1;
                         free(archive_handle->tar__sctx[global]);
                         archive_handle->tar__sctx[global] = xstrdup(value);
                         continue;
                 }
-#endif
+# endif
         }
 
         free(buf);
+#endif
 }
 
 char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 7b18aeff4..641256787 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -13,16 +13,13 @@ void FAST_FUNC init_transformer_state(transformer_state_t *xstate)
 
 int FAST_FUNC check_signature16(transformer_state_t *xstate, unsigned magic16)
 {
-        if (xstate->check_signature) {
+        if (!xstate->signature_skipped) {
                 uint16_t magic2;
                 if (full_read(xstate->src_fd, &magic2, 2) != 2 || magic2 != magic16) {
                         bb_error_msg("invalid magic");
-#if 0 /* possible future extension */
-                        if (xstate->check_signature > 1)
-                                xfunc_die();
-#endif
                         return -1;
                 }
+                xstate->signature_skipped = 2;
         }
         return 0;
 }
@@ -103,7 +100,7 @@ void check_errors_in_children(int signo)
 /* transformer(), more than meets the eye */
 #if BB_MMU
 void FAST_FUNC fork_transformer(int fd,
-        int check_signature,
+        int signature_skipped,
         IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_state_t *xstate)
 )
 #else
@@ -124,7 +121,7 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
                         IF_DESKTOP(long long) int r;
                         transformer_state_t xstate;
                         init_transformer_state(&xstate);
-                        xstate.check_signature = check_signature;
+                        xstate.signature_skipped = signature_skipped;
                         xstate.src_fd = fd;
                         xstate.dst_fd = fd_pipe.wr;
                         r = transformer(&xstate);
@@ -194,12 +191,11 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
                 uint16_t b16[2];
                 uint32_t b32[1];
         } magic;
-        int offset;
         transformer_state_t *xstate;
 
-        offset = -2;
         xstate = xzalloc(sizeof(*xstate));
         xstate->src_fd = fd;
+        xstate->signature_skipped = 2;
 
         /* .gz and .bz2 both have 2-byte signature, and their
          * unpack_XXX_stream wants this header skipped. */
@@ -228,7 +224,7 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
         if (ENABLE_FEATURE_SEAMLESS_XZ
          && magic.b16[0] == XZ_MAGIC1
         ) {
-                offset = -6;
+                xstate->signature_skipped = 6;
                 xread(fd, magic.b32, sizeof(magic.b32[0]));
                 if (magic.b32[0] == XZ_MAGIC2) {
                         xstate->xformer = unpack_xz_stream;
@@ -250,18 +246,8 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp
          */
 //      USE_FOR_MMU(xstate->xformer = copy_stream;)
 //      USE_FOR_NOMMU(xstate->xformer_prog = "cat";)
-        /* fall through to seeking bck over bytes we read earlier */
-
- USE_FOR_NOMMU(found_magic:)
-        /* NOMMU version of fork_transformer execs
-         * an external unzipper that wants
-         * file position at the start of the file.
-         */
-        xlseek(fd, offset, SEEK_CUR);
-
- USE_FOR_MMU(found_magic:)
-        /* In MMU case, if magic was found, seeking back is not necessary */
 
+ found_magic:
         return xstate;
 }
 
@@ -280,6 +266,12 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
 # if BB_MMU
         fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
 # else
+        /* NOMMU version of fork_transformer execs
+         * an external unzipper that wants
+         * file position at the start of the file.
+         */
+        xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+        xstate->signature_skipped = 0;
         fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
 # endif
         free(xstate);
@@ -322,14 +314,22 @@ int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
                 return -1;
 
         fd = xstate->src_fd;
-        if (xstate->xformer) {
 # if BB_MMU
-                fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
+        if (xstate->xformer) {
+                fork_transformer_with_no_sig(fd, xstate->xformer);
+        } else {
+                /* the file is not compressed */
+                xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+                xstate->signature_skipped = 0;
+        }
 # else
-                fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
+        /* NOMMU can't avoid the seek :( */
+        xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+        xstate->signature_skipped = 0;
+        if (xstate->xformer) {
+                fork_transformer_with_sig(fd, xstate->xformer, xstate->xformer_prog);
+        } /* else: the file is not compressed */
 # endif
-        }
-        /* else: the file is not compressed */
 
         free(xstate);
         return fd;
@@ -357,6 +357,9 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
                 }
         } else {
                 /* File is not compressed */
+//FIXME: avoid seek
+                xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
+                xstate->signature_skipped = 0;
                 image = xmalloc_read(xstate->src_fd, maxsz_p);
         }