6 files changed, 55 insertions, 16 deletions

diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index a6fd2eac0..b3a7d538f 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -4,7 +4,7 @@
 #
 # Licensed under GPLv2, see file LICENSE in this source tree.
 
-libs-y                          += libarchive/
+libs-y += libarchive/
 
 lib-y:=
 
diff --git a/archival/cpio.c b/archival/cpio.c
index a202069c4..30f66d1f7 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -46,7 +46,7 @@
 //kbuild:lib-$(CONFIG_CPIO) += cpio.o
 
 //usage:#define cpio_trivial_usage
-//usage:       "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]")
+//usage:       "[-dmvu] [-F FILE] [-R USER[:GRP]]" IF_FEATURE_CPIO_O(" [-H newc]")
 //usage:       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
 //usage:       " [EXTR_FILE]..."
 //usage:#define cpio_full_usage "\n\n"
@@ -71,6 +71,7 @@
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -u      Overwrite"
 //usage:     "\n        -F FILE Input (-t,-i,-p) or output (-o) file"
+//usage:     "\n        -R USER[:GRP]   Set owner of created files"
 //usage:        IF_FEATURE_CPIO_O(
 //usage:     "\n        -H newc Archive format"
 //usage:        )
@@ -130,7 +131,7 @@
   -I FILE                    File to use instead of standard input
   -L, --dereference          Dereference symbolic links (copy the files
                              that they point to instead of copying the links)
-  -R, --owner=[USER][:.][GROUP] Set owner of created files
+  -R, --owner=[USER][:.][GRP] Set owner of created files
 
  Options valid in --extract and --pass-through modes:
   -d, --make-directories     Create leading directories where needed
@@ -150,7 +151,8 @@ enum {
         OPT_PRESERVE_MTIME     = (1 << 6),
         OPT_DEREF              = (1 << 7),
         OPT_FILE               = (1 << 8),
-        OPTBIT_FILE = 8,
+        OPT_OWNER              = (1 << 9),
+        OPTBIT_OWNER = 9,
         IF_FEATURE_CPIO_O(OPTBIT_CREATE     ,)
         IF_FEATURE_CPIO_O(OPTBIT_FORMAT     ,)
         IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
@@ -163,7 +165,17 @@ enum {
         OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
 };
 
-#define OPTION_STR "it0uvdmLF:"
+#define OPTION_STR "it0uvdmLF:R:"
+
+struct globals {
+        struct bb_uidgid_t owner_ugid;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+void BUG_cpio_globals_too_big(void);
+#define INIT_G() do { \
+        G.owner_ugid.uid = -1L; \
+        G.owner_ugid.gid = -1L; \
+} while (0)
 
 #if ENABLE_FEATURE_CPIO_O
 static off_t cpio_pad4(off_t size)
@@ -181,7 +193,6 @@ static off_t cpio_pad4(off_t size)
  * It's ok to exit instead of return. */
 static NOINLINE int cpio_o(void)
 {
-        static const char trailer[] ALIGN1 = "TRAILER!!!";
         struct name_s {
                 struct name_s *next;
                 char name[1];
@@ -223,6 +234,11 @@ static NOINLINE int cpio_o(void)
                                 bb_simple_perror_msg_and_die(name);
                         }
 
+                        if (G.owner_ugid.uid != (uid_t)-1L)
+                                st.st_uid = G.owner_ugid.uid;
+                        if (G.owner_ugid.gid != (gid_t)-1L)
+                                st.st_gid = G.owner_ugid.gid;
+
                         if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode)))
                                 st.st_size = 0; /* paranoia */
 
@@ -275,7 +291,7 @@ static NOINLINE int cpio_o(void)
                         } else {
                                 /* If no (more) hardlinks to output,
                                  * output "trailer" entry */
-                                name = trailer;
+                                name = cpio_TRAILER;
                                 /* st.st_size == 0 is a must, but for uniformity
                                  * in the output, we zero out everything */
                                 memset(&st, 0, sizeof(st));
@@ -323,7 +339,7 @@ static NOINLINE int cpio_o(void)
                 }
 
                 if (!line) {
-                        if (name != trailer)
+                        if (name != cpio_TRAILER)
                                 goto next_link;
                         /* TODO: GNU cpio pads trailer to 512 bytes, do we want that? */
                         return EXIT_SUCCESS;
@@ -339,6 +355,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 {
         archive_handle_t *archive_handle;
         char *cpio_filename;
+        char *cpio_owner;
         IF_FEATURE_CPIO_O(const char *cpio_fmt = "";)
         unsigned opt;
 
@@ -353,12 +370,14 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                 "pass-through\0" No_argument       "p"
 #endif
 #endif
+                "owner\0"        Required_argument "R"
                 "verbose\0"      No_argument       "v"
                 "quiet\0"        No_argument       "\xff"
                 "to-stdout\0"    No_argument       "\xfe"
                 ;
 #endif
 
+        INIT_G();
         archive_handle = init_handle();
         /* archive_handle->src_fd = STDIN_FILENO; - done by init_handle */
         archive_handle->ah_flags = ARCHIVE_EXTRACT_NEWER;
@@ -369,8 +388,17 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         /* -L makes sense only with -o or -p */
 
 #if !ENABLE_FEATURE_CPIO_O
-        opt = getopt32(argv, OPTION_STR, &cpio_filename);
+        opt = getopt32(argv, OPTION_STR, &cpio_filename, &cpio_owner);
+#else
+        opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"),
+                       &cpio_filename, &cpio_owner, &cpio_fmt);
+#endif
         argv += optind;
+        if (opt & OPT_OWNER) { /* -R */
+                parse_chown_usergroup_or_die(&G.owner_ugid, cpio_owner);
+                archive_handle->cpio__owner = G.owner_ugid;
+        }
+#if !ENABLE_FEATURE_CPIO_O
         if (opt & OPT_FILE) { /* -F */
                 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
 #if ENABLE_PLATFORM_MINGW32
@@ -379,8 +407,6 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
         }
 #else
-        opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
-        argv += optind;
         if ((opt & (OPT_FILE|OPT_CREATE)) == OPT_FILE) { /* -F without -o */
                 xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
         }
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;