Ignore:
Timestamp:
Jan 1, 2014, 12:47:38 AM (6 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.21.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi-busybox/archival/libarchive/data_extract_to_command.c

    r2725 r3232  
    55
    66#include "libbb.h"
    7 #include "archive.h"
     7#include "bb_archive.h"
    88
    99enum {
     
    6565
    6666#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];
    6868    if (!sctx)
    69         sctx = archive_handle->tar__global_sctx;
     69        sctx = archive_handle->tar__sctx[PAX_GLOBAL];
    7070    if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */
    7171        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;
    7474    }
    7575#endif
     
    100100            xdup2(p[0], STDIN_FILENO);
    101101            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);
    104108        }
    105109        close(p[0]);
Note: See TracChangeset for help on using the changeset viewer.