Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/get_header_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/libarchive/get_header_cpio.c (modified) (3 diffs)

branches/3.3/mindi-busybox/archival/libarchive/get_header_cpio.c

@@ -38 +38 @@
     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')
     ) {
@@ -53 +53 @@
         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;
@@ -76 +81 @@
     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;