Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/data_extract_all.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_all.c (modified) (2 diffs)

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

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
@@ -14 +14 @@
 
 #if 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