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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_command.c
r2725 r3232 5 5 6 6 #include "libbb.h" 7 #include " archive.h"7 #include "bb_archive.h" 8 8 9 9 enum { … … 65 65 66 66 #if 0 /* do we need this? ENABLE_FEATURE_TAR_SELINUX */ 67 char *sctx = archive_handle->tar__ next_file_sctx;67 char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE]; 68 68 if (!sctx) 69 sctx = archive_handle->tar__ global_sctx;69 sctx = archive_handle->tar__sctx[PAX_GLOBAL]; 70 70 if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */ 71 71 setfscreatecon(sctx); 72 free(archive_handle->tar__ next_file_sctx);73 archive_handle->tar__ next_file_sctx= NULL;72 free(archive_handle->tar__sctx[PAX_NEXT_FILE]); 73 archive_handle->tar__sctx[PAX_NEXT_FILE] = NULL; 74 74 } 75 75 #endif … … 100 100 xdup2(p[0], STDIN_FILENO); 101 101 signal(SIGPIPE, SIG_DFL); 102 execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", archive_handle->tar__to_command, NULL); 103 bb_perror_msg_and_die("can't execute '%s'", DEFAULT_SHELL); 102 execl(archive_handle->tar__to_command_shell, 103 archive_handle->tar__to_command_shell, 104 "-c", 105 archive_handle->tar__to_command, 106 NULL); 107 bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell); 104 108 } 105 109 close(p[0]);
Note:
See TracChangeset
for help on using the changeset viewer.