Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

7 files changed, 76 insertions, 37 deletions

diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 968fdf8ab..b7faaf77f 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -30,11 +30,13 @@ COMMON_FILES:= \
 DPKG_FILES:= \
         unpack_ar_archive.o \
         filter_accept_list_reassign.o \
+        unsafe_prefix.o \
         get_header_ar.o \
         get_header_tar.o \
         get_header_tar_gz.o \
         get_header_tar_bz2.o \
         get_header_tar_lzma.o \
+        get_header_tar_xz.o \
 
 INSERT
 
@@ -43,7 +45,7 @@ lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
 
 lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
 lib-$(CONFIG_CPIO)                      += get_header_cpio.o
-lib-$(CONFIG_TAR)                       += get_header_tar.o
+lib-$(CONFIG_TAR)                       += get_header_tar.o unsafe_prefix.o
 lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
@@ -52,7 +54,7 @@ lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.
 lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
-lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o unsafe_prefix.o
 lib-$(CONFIG_RPM2CPIO)                  += open_transformer.o decompress_gunzip.o get_header_cpio.o
 lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
 
diff --git a/archival/libarchive/filter_accept_list_reassign.c b/archival/libarchive/filter_accept_list_reassign.c
index 3d19abe44..b9acfbc05 100644
--- a/archival/libarchive/filter_accept_list_reassign.c
+++ b/archival/libarchive/filter_accept_list_reassign.c
@@ -28,6 +28,10 @@ char FAST_FUNC filter_accept_list_reassign(archive_handle_t *archive_handle)
                 name_ptr++;
 
                 /* Modify the subarchive handler based on the extension */
+                if (strcmp(name_ptr, "tar") == 0) {
+                        archive_handle->dpkg__action_data_subarchive = get_header_tar;
+                        return EXIT_SUCCESS;
+                }
                 if (ENABLE_FEATURE_SEAMLESS_GZ
                  && strcmp(name_ptr, "gz") == 0
                 ) {
@@ -46,6 +50,12 @@ char FAST_FUNC filter_accept_list_reassign(archive_handle_t *archive_handle)
                         archive_handle->dpkg__action_data_subarchive = get_header_tar_lzma;
                         return EXIT_SUCCESS;
                 }
+                if (ENABLE_FEATURE_SEAMLESS_XZ
+                 && strcmp(name_ptr, "xz") == 0
+                ) {
+                        archive_handle->dpkg__action_data_subarchive = get_header_tar_xz;
+                        return EXIT_SUCCESS;
+                }
         }
         return EXIT_FAILURE;
 }
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 1a0058b63..7861d1f6f 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -37,7 +37,7 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
         }
         archive_handle->offset += 110;
 
-        if (strncmp(&cpio_header[0], "07070", 5) != 0
+        if (!is_prefixed_with(&cpio_header[0], "07070")
          || (cpio_header[5] != '1' && cpio_header[5] != '2')
         ) {
                 bb_error_msg_and_die("unsupported cpio format, use newc or crc");
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index ba43bb073..2dbcdb50c 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -17,36 +17,6 @@
 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! */
 static unsigned long long getOctal(char *str, int len)
 {
@@ -135,7 +105,7 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                 value = end + 1;
 
 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
-                if (!global && strncmp(value, "path=", sizeof("path=") - 1) == 0) {
+                if (!global && is_prefixed_with(value, "path=")) {
                         value += sizeof("path=") - 1;
                         free(archive_handle->tar__longname);
                         archive_handle->tar__longname = xstrdup(value);
@@ -148,7 +118,7 @@ static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int g
                  * 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) {
+                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);
@@ -232,7 +202,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 
         /* Check header has valid magic, "ustar" is for the proper tar,
          * five NULs are for the old tar format  */
-        if (strncmp(tar.magic, "ustar", 5) != 0
+        if (!is_prefixed_with(tar.magic, "ustar")
          && (!ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
              || memcmp(tar.magic, "\0\0\0\0", 5) != 0)
         ) {
diff --git a/archival/libarchive/get_header_tar_xz.c b/archival/libarchive/get_header_tar_xz.c
new file mode 100644
index 000000000..7bf3b3b56
--- /dev/null
+++ b/archival/libarchive/get_header_tar_xz.c
@@ -0,0 +1,21 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
+#include "libbb.h"
+#include "bb_archive.h"
+
+char FAST_FUNC get_header_tar_xz(archive_handle_t *archive_handle)
+{
+        /* Can't lseek over pipes */
+        archive_handle->seek = seek_by_read;
+
+        fork_transformer_with_sig(archive_handle->src_fd, unpack_xz_stream, "unxz");
+        archive_handle->offset = 0;
+        while (get_header_tar(archive_handle) == EXIT_SUCCESS)
+                continue;
+
+        /* Can only do one file at a time */
+        return EXIT_FAILURE;
+}
diff --git a/archival/libarchive/unpack_ar_archive.c b/archival/libarchive/unpack_ar_archive.c
index 214d17e23..0bc030349 100644
--- a/archival/libarchive/unpack_ar_archive.c
+++ b/archival/libarchive/unpack_ar_archive.c
@@ -12,7 +12,7 @@ void FAST_FUNC unpack_ar_archive(archive_handle_t *ar_archive)
         char magic[7];
 
         xread(ar_archive->src_fd, magic, AR_MAGIC_LEN);
-        if (strncmp(magic, AR_MAGIC, AR_MAGIC_LEN) != 0) {
+        if (!is_prefixed_with(magic, AR_MAGIC)) {
                 bb_error_msg_and_die("invalid ar magic");
         }
         ar_archive->offset += AR_MAGIC_LEN;
diff --git a/archival/libarchive/unsafe_prefix.c b/archival/libarchive/unsafe_prefix.c
new file mode 100644
index 000000000..9994f4d94
--- /dev/null
+++ b/archival/libarchive/unsafe_prefix.c
@@ -0,0 +1,36 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+
+#include "libbb.h"
+#include "bb_archive.h"
+
+const char* FAST_FUNC strip_unsafe_prefix(const char *str)
+{
+        const char *cp = str;
+        while (1) {
+                char *cp2;
+                if (*cp == '/') {
+                        cp++;
+                        continue;
+                }
+                if (is_prefixed_with(cp, "/../"+1)) {
+                        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;
+}