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

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

@@ -29 +29 @@
 
         /* Modify the subarchive handler based on the extension */
+        if (strcmp(name_ptr, "tar") == 0) {
+            archive_handle->dpkg__action_data_subarchive = get_header_tar;
+            return EXIT_SUCCESS;
+        }
         if (ENABLE_FEATURE_SEAMLESS_GZ
          && strcmp(name_ptr, "gz") == 0
@@ -47 +51 @@
             return EXIT_SUCCESS;
         }
+        if (ENABLE_FEATURE_SEAMLESS_XZ
+         && strcmp(name_ptr, "xz") == 0
+        ) {
+            archive_handle->dpkg__action_data_subarchive = get_header_tar_xz;
+            return EXIT_SUCCESS;
+        }
     }
     return EXIT_FAILURE;