2 files changed, 57 insertions, 1 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index f525419b8..7149782d7 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -38,6 +38,20 @@
 //config:       depends on FEATURE_CPIO_O
 //config:       help
 //config:       Passthrough mode. Rarely used.
+//config:
+//config:config FEATURE_CPIO_IGNORE_DEVNO
+//config:       bool "Support --ignore-devno like GNU cpio"
+//config:       default y
+//config:       depends on FEATURE_CPIO_O && LONG_OPTS
+//config:       help
+//config:       Optionally ignore device numbers when creating archives.
+//config:
+//config:config FEATURE_CPIO_RENUMBER_INODES
+//config:       bool "Support --renumber-inodes like GNU cpio"
+//config:       default y
+//config:       depends on FEATURE_CPIO_O && LONG_OPTS
+//config:       help
+//config:       Optionally renumber inodes when creating archives.
 
 //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
 
@@ -75,6 +89,12 @@
 //usage:     "\n        -R USER[:GRP]   Set owner of created files"
 //usage:     "\n        -L      Dereference symlinks"
 //usage:     "\n        -0      NUL terminated input"
+//usage:        IF_FEATURE_CPIO_IGNORE_DEVNO(
+//usage:     "\n        --ignore-devno"
+//usage:        )
+//usage:        IF_FEATURE_CPIO_RENUMBER_INODES(
+//usage:     "\n        --renumber-inodes"
+//usage:        )
 
 /* GNU cpio 2.9 --help (abridged):
 
@@ -162,17 +182,22 @@ enum {
         IF_FEATURE_CPIO_P(OPTBIT_PASSTHROUGH,)
         IF_LONG_OPTS(     OPTBIT_QUIET      ,)
         IF_LONG_OPTS(     OPTBIT_2STDOUT    ,)
+        IF_FEATURE_CPIO_IGNORE_DEVNO(OPTBIT_IGNORE_DEVNO,)
+        IF_FEATURE_CPIO_RENUMBER_INODES(OPTBIT_RENUMBER_INODES,)
         OPT_CREATE             = IF_FEATURE_CPIO_O((1 << OPTBIT_CREATE     )) + 0,
         OPT_FORMAT             = IF_FEATURE_CPIO_O((1 << OPTBIT_FORMAT     )) + 0,
         OPT_PASSTHROUGH        = IF_FEATURE_CPIO_P((1 << OPTBIT_PASSTHROUGH)) + 0,
         OPT_QUIET              = IF_LONG_OPTS(     (1 << OPTBIT_QUIET      )) + 0,
         OPT_2STDOUT            = IF_LONG_OPTS(     (1 << OPTBIT_2STDOUT    )) + 0,
+        OPT_IGNORE_DEVNO       = IF_FEATURE_CPIO_IGNORE_DEVNO((1 << OPTBIT_IGNORE_DEVNO)) + 0,
+        OPT_RENUMBER_INODES    = IF_FEATURE_CPIO_RENUMBER_INODES((1 << OPTBIT_RENUMBER_INODES)) + 0,
 };
 
 #define OPTION_STR "it0uvdmLF:R:"
 
 struct globals {
         struct bb_uidgid_t owner_ugid;
+        ino_t next_inode;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 void BUG_cpio_globals_too_big(void);
@@ -206,6 +231,9 @@ static NOINLINE int cpio_o(void)
                 struct inodes_s *next;
                 struct name_s *names;
                 struct stat st;
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+                ino_t mapped_inode;
+#endif
         };
 
         struct inodes_s *links = NULL;
@@ -260,6 +288,10 @@ static NOINLINE int cpio_o(void)
                                                 l = xzalloc(sizeof(*l));
                                                 l->st = st;
                                                 l->next = links;
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+                                                if (option_mask32 & OPT_RENUMBER_INODES)
+                                                        l->mapped_inode = ++G.next_inode;
+#endif
                                                 links = l;
                                                 break;
                                         }
@@ -278,6 +310,11 @@ static NOINLINE int cpio_o(void)
                                 free(line);
                                 continue;
                         }
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+                        else if (option_mask32 & OPT_RENUMBER_INODES) {
+                                st.st_ino = ++G.next_inode;
+                        }
+#endif
                 } else { /* line == NULL: EOF */
  next_link:
                         if (links) {
@@ -285,6 +322,10 @@ static NOINLINE int cpio_o(void)
                                 st = links->st;
                                 name = links->names->name;
                                 links->names = links->names->next;
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+                                if (links->mapped_inode)
+                                        st.st_ino = links->mapped_inode;
+#endif
                                 /* GNU cpio is reported to emit file data
                                  * only for the last instance. Mimic that. */
                                 if (links->names == NULL)
@@ -304,6 +345,11 @@ static NOINLINE int cpio_o(void)
                         }
                 }
 
+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
+                if (option_mask32 & OPT_IGNORE_DEVNO)
+                        st.st_dev = st.st_rdev = 0;
+#endif
+
                 bytes += printf("070701"
                                 "%08X%08X%08X%08X%08X%08X%08X"
                                 "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
@@ -379,6 +425,12 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                 "null\0"         No_argument       "0"
                 "quiet\0"        No_argument       "\xff"
                 "to-stdout\0"    No_argument       "\xfe"
+#if ENABLE_FEATURE_CPIO_IGNORE_DEVNO
+                "ignore-devno\0" No_argument       "\xfd"
+#endif
+#if ENABLE_FEATURE_CPIO_RENUMBER_INODES
+                "renumber-inodes\0" No_argument    "\xfc"
+#endif
                 ;
 #endif
 
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 3a19d6ff7..6bd897392 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -92,8 +92,12 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
         /* Only size is always present, the rest may be missing in
          * long filename pseudo file. Thus we decode the rest
          * after dealing with long filename pseudo file.
+         *
+         * GNU binutils in deterministic mode hard codes mode to 0644 (NOT
+         * 0100644). AR archives can only contain files, so force file
+         * mode.
          */
-        typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode));
+        typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode)) | S_IFREG;
         typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid));
         typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid));
         typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date));