Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/cpio.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/cpio.c (modified) (15 diffs)

branches/3.3/mindi-busybox/archival/cpio.c

@@ -10 +10 @@
  * Doesn't check CRC's
  * Only supports new ASCII and CRC formats
- *
  */
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "bb_archive.h"
 
+//config:config CPIO
+//config:   bool "cpio"
+//config:   default y
+//config:   help
+//config:     cpio is an archival utility program used to create, modify, and
+//config:     extract contents from archives.
+//config:     cpio has 110 bytes of overheads for every stored file.
+//config:
+//config:     This implementation of cpio can extract cpio archives created in the
+//config:     "newc" or "crc" format, it cannot create or modify them.
+//config:
+//config:     Unless you have a specific application which requires cpio, you
+//config:     should probably say N here.
+//config:
+//config:config FEATURE_CPIO_O
+//config:   bool "Support for archive creation"
+//config:   default y
+//config:   depends on CPIO
+//config:   help
+//config:     This implementation of cpio can create cpio archives in the "newc"
+//config:     format only.
+//config:
+//config:config FEATURE_CPIO_P
+//config:   bool "Support for passthrough mode"
+//config:   default y
+//config:   depends on FEATURE_CPIO_O
+//config:   help
+//config:     Passthrough mode. Rarely used.
+
+//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+//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]..."
@@ -35 +67 @@
 //usage:     "\n    -p DIR  Copy files to DIR"
 //usage:    )
+//usage:     "\nOptions:"
 //usage:     "\n    -d  Make leading directories"
 //usage:     "\n    -m  Preserve mtime"
@@ -40 +73 @@
 //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"
@@ -99 +133 @@
   -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:
@@ -119 +153 @@
     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     ,)
@@ -132 +167 @@
 };
 
-#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 { \
+    setup_common_bufsiz(); \
+    G.owner_ugid.uid = -1L; \
+    G.owner_ugid.gid = -1L; \
+} while (0)
 
 #if ENABLE_FEATURE_CPIO_O
@@ -150 +196 @@
 static NOINLINE int cpio_o(void)
 {
-    static const char trailer[] ALIGN1 = "TRAILER!!!";
     struct name_s {
         struct name_s *next;
@@ -191 +236 @@
                 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)))
@@ -226 +276 @@
                 continue;
             }
-
         } else { /* line == NULL: EOF */
  next_link:
@@ -245 +294 @@
                 /* 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 */
@@ -293 +342 @@
 
         if (!line) {
-            if (name != trailer)
+            if (name != cpio_TRAILER)
                 goto next_link;
             /* TODO: GNU cpio pads trailer to 512 bytes, do we want that? */
@@ -309 +358 @@
     archive_handle_t *archive_handle;
     char *cpio_filename;
+    char *cpio_owner;
     IF_FEATURE_CPIO_O(const char *cpio_fmt = "";)
     unsigned opt;
@@ -323 +373 @@
 #endif
 #endif
+        "owner\0"        Required_argument "R"
         "verbose\0"      No_argument       "v"
         "quiet\0"        No_argument       "\xff"
@@ -329 +380 @@
 #endif
 
+    INIT_G();
     archive_handle = init_handle();
     /* archive_handle->src_fd = STDIN_FILENO; - done by init_handle */
@@ -339 +391 @@
 
 #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);
     }
 #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);