Merge branch 'busybox' into merge

4 files changed, 18 insertions, 5 deletions

diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index b7faaf77f..b159a786a 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -4,7 +4,7 @@
 #
 # Licensed under GPLv2 or later, see file LICENSE in this source tree.
 
-lib-y:=
+lib-y:= common.o
 
 COMMON_FILES:= \
 \
diff --git a/archival/libarchive/common.c b/archival/libarchive/common.c
new file mode 100644
index 000000000..dd69d2222
--- /dev/null
+++ b/archival/libarchive/common.c
@@ -0,0 +1,9 @@
+/* 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 cpio_TRAILER[] = "TRAILER!!!";
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index dced609e5..b6ae7f738 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -1121,9 +1121,8 @@ static int check_header_gzip(STATE_PARAM transformer_state_t *xstate)
                         uint8_t os_flags_UNUSED;
                 } PACKED formatted;
         } header;
-        struct BUG_header {
-                char BUG_header[sizeof(header) == 8 ? 1 : -1];
-        };
+
+        BUILD_BUG_ON(sizeof(header) != 8);
 
         /*
          * Rewind bytebuffer. We use the beginning because the header has 8
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 7861d1f6f..badd4a841 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -52,6 +52,11 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
                         &major, &minor, &namesize) != 10)
                 bb_error_msg_and_die("damaged cpio file");
         file_header->mode = mode;
+        /* "cpio -R USER:GRP" support: */
+        if (archive_handle->cpio__owner.uid != (uid_t)-1L)
+                uid = archive_handle->cpio__owner.uid;
+        if (archive_handle->cpio__owner.gid != (gid_t)-1L)
+                gid = archive_handle->cpio__owner.gid;
         file_header->uid = uid;
         file_header->gid = gid;
         file_header->mtime = mtime;
@@ -75,7 +80,7 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
         /* Update offset amount and skip padding before file contents */
         data_align(archive_handle, 4);
 
-        if (strcmp(file_header->name, "TRAILER!!!") == 0) {
+        if (strcmp(file_header->name, cpio_TRAILER) == 0) {
                 /* Always round up. ">> 9" divides by 512 */
                 archive_handle->cpio__blocks = (uoff_t)(archive_handle->offset + 511) >> 9;
                 goto create_hardlinks;