Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_command.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_command.c (modified) (3 diffs)

branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_command.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 enum {
@@ -65 +65 @@
 
 #if 0 /* do we need this? ENABLE_FEATURE_TAR_SELINUX */
-    char *sctx = archive_handle->tar__next_file_sctx;
+    char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE];
     if (!sctx)
-        sctx = archive_handle->tar__global_sctx;
+        sctx = archive_handle->tar__sctx[PAX_GLOBAL];
     if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */
         setfscreatecon(sctx);
-        free(archive_handle->tar__next_file_sctx);
-        archive_handle->tar__next_file_sctx = NULL;
+        free(archive_handle->tar__sctx[PAX_NEXT_FILE]);
+        archive_handle->tar__sctx[PAX_NEXT_FILE] = NULL;
     }
 #endif
@@ -100 +100 @@
             xdup2(p[0], STDIN_FILENO);
             signal(SIGPIPE, SIG_DFL);
-            execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", archive_handle->tar__to_command, NULL);
-            bb_perror_msg_and_die("can't execute '%s'", DEFAULT_SHELL);
+            execl(archive_handle->tar__to_command_shell,
+                archive_handle->tar__to_command_shell,
+                "-c",
+                archive_handle->tar__to_command,
+                NULL);
+            bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
         }
         close(p[0]);