X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Ftar.c;h=4e763a404476118ab884f87971e2df5ecc81dcc4;hb=56f16b42c93af18fbb984e8d6384c03e5405e3ae;hp=2ab022954b7fa95ad83e2b8d7313b0b532d80a02;hpb=a0ee881ba446ceab5f6b3dcb51429091ecd22ff8;p=oweals%2Fbusybox.git diff --git a/archival/tar.c b/archival/tar.c index 2ab022954..4e763a404 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -9,8 +9,7 @@ * ground up. It still has remnents of the old code lying about, but it is * very different now (i.e., cleaner, less global variables, etc.) * - * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen - * Copyright (C) 1999-2002 by Erik Andersen + * Copyright (C) 1999-2003 by Erik Andersen * * Based in part in the tar implementation in sash * Copyright (c) 1999 by David I. Bell @@ -115,7 +114,7 @@ struct TarBallInfo { tarball lives, so we can avoid trying to include the tarball into itself */ int verboseFlag; /* Whether to print extra stuff or not */ - char **excludeList; /* List of files to not include */ + const llist_t *excludeList; /* List of files to not include */ HardLinkInfo *hlInfoHead; /* Hard Link Tracking Information */ HardLinkInfo *hlInfo; /* Hard Link Info for the current file */ }; @@ -138,24 +137,20 @@ enum TarFileType { typedef enum TarFileType TarFileType; /* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */ -static inline void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr, dev_t dev, - ino_t ino, short linkCount, - const char *name) +static inline void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr, + struct stat *statbuf, + const char *name) { /* Note: hlInfoHeadPtr can never be NULL! */ HardLinkInfo *hlInfo; - hlInfo = - (HardLinkInfo *) xmalloc(sizeof(HardLinkInfo) + strlen(name) + 1); - if (hlInfo) { - hlInfo->next = *hlInfoHeadPtr; - *hlInfoHeadPtr = hlInfo; - hlInfo->dev = dev; - hlInfo->ino = ino; - hlInfo->linkCount = linkCount; - strcpy(hlInfo->name, name); - } - return; + hlInfo = (HardLinkInfo *) xmalloc(sizeof(HardLinkInfo) + strlen(name)); + hlInfo->next = *hlInfoHeadPtr; + *hlInfoHeadPtr = hlInfo; + hlInfo->dev = statbuf->st_dev; + hlInfo->ino = statbuf->st_ino; + hlInfo->linkCount = statbuf->st_nlink; + strcpy(hlInfo->name, name); } static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr) @@ -176,11 +171,10 @@ static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr) } /* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */ -static inline HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, dev_t dev, - ino_t ino) +static inline HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, struct stat *statbuf) { while (hlInfo) { - if ((ino == hlInfo->ino) && (dev == hlInfo->dev)) + if ((statbuf->st_ino == hlInfo->ino) && (statbuf->st_dev == hlInfo->dev)) break; hlInfo = hlInfo->next; } @@ -244,12 +238,10 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo, TAR_MAGIC_LEN + TAR_VERSION_LEN); /* Enter the user and group names (default to root if it fails) */ - my_getpwuid(header.uname, statbuf->st_uid); - if (!*header.uname) - strcpy(header.uname, "root"); - my_getgrgid(header.gname, statbuf->st_gid); - if (!*header.uname) + if (my_getpwuid(header.uname, statbuf->st_uid) == NULL) strcpy(header.uname, "root"); + if (my_getgrgid(header.gname, statbuf->st_gid) == NULL) + strcpy(header.gname, "root"); if (tbInfo->hlInfo) { /* This is a hard link */ @@ -285,7 +277,7 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo, header.typeflag = REGTYPE; putOctal(header.size, sizeof(header.size), statbuf->st_size); } else { - error_msg("%s: Unknown file type", real_name); + bb_error_msg("%s: Unknown file type", real_name); return (FALSE); } @@ -302,9 +294,9 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo, /* Now write the header out to disk */ if ((size = - full_write(tbInfo->tarFd, (char *) &header, + bb_full_write(tbInfo->tarFd, (char *) &header, sizeof(struct TarHeader))) < 0) { - error_msg(io_error, real_name, strerror(errno)); + bb_error_msg(bb_msg_io_error, real_name); return (FALSE); } /* Pad the header up to the tar block size */ @@ -316,8 +308,9 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo, if (tbInfo->verboseFlag) { FILE *vbFd = stdout; - if (tbInfo->verboseFlag == 2) /* If the archive goes to stdout, verbose to stderr */ + if (tbInfo->tarFd == fileno(stdout)) /* If the archive goes to stdout, verbose to stderr */ vbFd = stderr; + fprintf(vbFd, "%s\n", header.name); } @@ -325,16 +318,15 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo, } # if defined CONFIG_FEATURE_TAR_EXCLUDE -static inline int exclude_file(char **excluded_files, const char *file) +static inline int exclude_file(const llist_t *excluded_files, const char *file) { - int i; - - if (excluded_files == NULL) + if (excluded_files == NULL) { return 0; + } - for (i = 0; excluded_files[i] != NULL; i++) { - if (excluded_files[i][0] == '/') { - if (fnmatch(excluded_files[i], file, + while (excluded_files) { + if (excluded_files->data[0] == '/') { + if (fnmatch(excluded_files->data, file, FNM_PATHNAME | FNM_LEADING_DIR) == 0) return 1; } else { @@ -342,11 +334,12 @@ static inline int exclude_file(char **excluded_files, const char *file) for (p = file; p[0] != '\0'; p++) { if ((p == file || p[-1] == '/') && p[0] != '/' && - fnmatch(excluded_files[i], p, + fnmatch(excluded_files->data, p, FNM_PATHNAME | FNM_LEADING_DIR) == 0) return 1; } } + excluded_files = excluded_files->link; } return 0; @@ -368,16 +361,14 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, */ tbInfo->hlInfo = NULL; if (statbuf->st_nlink > 1) { - tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf->st_dev, - statbuf->st_ino); + tbInfo->hlInfo = findHardLinkInfo(tbInfo->hlInfoHead, statbuf); if (tbInfo->hlInfo == NULL) - addHardLinkInfo(&tbInfo->hlInfoHead, statbuf->st_dev, - statbuf->st_ino, statbuf->st_nlink, fileName); + addHardLinkInfo(&tbInfo->hlInfoHead, statbuf, fileName); } /* It is against the rules to archive a socket */ if (S_ISSOCK(statbuf->st_mode)) { - error_msg("%s: socket ignored", fileName); + bb_error_msg("%s: socket ignored", fileName); return (TRUE); } @@ -386,7 +377,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, * the new tarball */ if (tbInfo->statBuf.st_dev == statbuf->st_dev && tbInfo->statBuf.st_ino == statbuf->st_ino) { - error_msg("%s: file is the archive; skipping", fileName); + bb_error_msg("%s: file is the archive; skipping", fileName); return (TRUE); } @@ -395,14 +386,14 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, static int alreadyWarned = FALSE; if (alreadyWarned == FALSE) { - error_msg("Removing leading '/' from member names"); + bb_error_msg("Removing leading '/' from member names"); alreadyWarned = TRUE; } header_name++; } if (strlen(fileName) >= NAME_SIZE) { - error_msg(name_longer_than_foo, NAME_SIZE); + bb_error_msg(bb_msg_name_longer_than_foo, NAME_SIZE); return (TRUE); } @@ -428,21 +419,21 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, /* open the file we want to archive, and make sure all is well */ if ((inputFileFd = open(fileName, O_RDONLY)) < 0) { - error_msg("%s: Cannot open: %s", fileName, strerror(errno)); + bb_perror_msg("%s: Cannot open", fileName); return (FALSE); } /* write the file to the archive */ - while ((size = full_read(inputFileFd, buffer, sizeof(buffer))) > 0) { - if (full_write(tbInfo->tarFd, buffer, size) != size) { + while ((size = bb_full_read(inputFileFd, buffer, sizeof(buffer))) > 0) { + if (bb_full_write(tbInfo->tarFd, buffer, size) != size) { /* Output file seems to have a problem */ - error_msg(io_error, fileName, strerror(errno)); + bb_error_msg(bb_msg_io_error, fileName); return (FALSE); } readSize += size; } if (size == -1) { - error_msg(io_error, fileName, strerror(errno)); + bb_error_msg(bb_msg_io_error, fileName); return (FALSE); } /* Pad the file up to the tar block size */ @@ -455,13 +446,14 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, return (TRUE); } -static inline int writeTarFile(const char *tarName, int verboseFlag, - char **argv, char **excludeList, int gzip) +static inline int writeTarFile(const int tar_fd, const int verboseFlag, + const llist_t *include, const llist_t *exclude, const int gzip) { #ifdef CONFIG_FEATURE_TAR_GZIP int gzipDataPipe[2] = { -1, -1 }; int gzipStatusPipe[2] = { -1, -1 }; pid_t gzipPid = 0; + volatile int vfork_exec_errno = 0; #endif int errorFlag = FALSE; @@ -471,38 +463,34 @@ static inline int writeTarFile(const char *tarName, int verboseFlag, tbInfo.hlInfoHead = NULL; /* Make sure there is at least one file to tar up. */ - if (*argv == NULL) - error_msg_and_die("Cowardly refusing to create an empty archive"); - - /* Open the tar file for writing. */ - if (tarName == NULL) { - tbInfo.tarFd = fileno(stdout); - tbInfo.verboseFlag = verboseFlag ? 2 : 0; - } else { - tbInfo.tarFd = open(tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644); - tbInfo.verboseFlag = verboseFlag ? 1 : 0; + if (include == NULL) { + bb_error_msg_and_die("Cowardly refusing to create an empty archive"); } - if (tbInfo.tarFd < 0) { - perror_msg("Error opening '%s'", tarName); - freeHardLinkInfo(&tbInfo.hlInfoHead); - return (FALSE); - } + fchmod(tar_fd, 0644); + tbInfo.tarFd = tar_fd; + tbInfo.verboseFlag = verboseFlag; /* Store the stat info for the tarball's file, so * can avoid including the tarball into itself.... */ if (fstat(tbInfo.tarFd, &tbInfo.statBuf) < 0) - error_msg_and_die(io_error, tarName, strerror(errno)); + bb_perror_msg_and_die("Couldnt stat tar file"); #ifdef CONFIG_FEATURE_TAR_GZIP if (gzip) { - if (socketpair(AF_UNIX, SOCK_STREAM, 0, gzipDataPipe) < 0 - || pipe(gzipStatusPipe) < 0) - perror_msg_and_die("Failed to create gzip pipe"); + if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0) { + bb_perror_msg_and_die("Failed to create gzip pipe"); + } signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */ - gzipPid = fork(); +# if __GNUC__ + /* Avoid vfork clobbering */ + (void) &include; + (void) &errorFlag; +# endif + + gzipPid = vfork(); if (gzipPid == 0) { dup2(gzipDataPipe[0], 0); @@ -515,10 +503,9 @@ static inline int writeTarFile(const char *tarName, int verboseFlag, fcntl(gzipStatusPipe[1], F_SETFD, FD_CLOEXEC); /* close on exec shows sucess */ execl("/bin/gzip", "gzip", "-f", 0); + vfork_exec_errno = errno; - write(gzipStatusPipe[1], "", 1); close(gzipStatusPipe[1]); - exit(-1); } else if (gzipPid > 0) { close(gzipDataPipe[0]); @@ -527,11 +514,12 @@ static inline int writeTarFile(const char *tarName, int verboseFlag, while (1) { char buf; - int n = read(gzipStatusPipe[0], &buf, 1); + int n = bb_full_read(gzipStatusPipe[0], &buf, 1); - if (n == 1) - error_msg_and_die("Could not exec gzip process"); /* socket was not closed => error */ - else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) + if (n == 0 && vfork_exec_errno != 0) { + errno = vfork_exec_errno; + bb_perror_msg_and_die("Could not exec gzip process"); + } else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) continue; /* try it again */ break; } @@ -539,20 +527,21 @@ static inline int writeTarFile(const char *tarName, int verboseFlag, tbInfo.tarFd = gzipDataPipe[1]; } else { - perror_msg_and_die("Failed to fork gzip process"); + bb_perror_msg_and_die("Failed to vfork gzip process"); } } #endif - tbInfo.excludeList = excludeList; + tbInfo.excludeList = exclude; /* Read the directory/files and iterate over them one at a time */ - while (*argv != NULL) { - if (!recursive_action(*argv++, TRUE, FALSE, FALSE, + while (include) { + if (!recursive_action(include->data, TRUE, FALSE, FALSE, writeFileToTarball, writeFileToTarball, (void *) &tbInfo)) { errorFlag = TRUE; } + include = include->link; } /* Write two empty blocks to the end of the archive */ for (size = 0; size < (2 * TAR_BLOCK_SIZE); size++) { @@ -567,7 +556,7 @@ static inline int writeTarFile(const char *tarName, int verboseFlag, /* Hang up the tools, close up shop, head home */ close(tbInfo.tarFd); if (errorFlag) - error_msg("Error exit delayed from previous errors"); + bb_error_msg("Error exit delayed from previous errors"); freeHardLinkInfo(&tbInfo.hlInfoHead); @@ -582,205 +571,249 @@ static inline int writeTarFile(const char *tarName, int verboseFlag, } #endif /* tar_create */ -void append_file_to_list(const char *new_name, char ***list, int *list_count) -{ - *list = realloc(*list, sizeof(char *) * (*list_count + 2)); - (*list)[*list_count] = xstrdup(new_name); - (*list_count)++; - (*list)[*list_count] = NULL; -} - -void append_file_list_to_list(char *filename, char ***name_list, - int *num_of_entries) +#ifdef CONFIG_FEATURE_TAR_EXCLUDE +static llist_t *append_file_list_to_list(llist_t *list) { FILE *src_stream; + llist_t *cur = list; + llist_t *tmp; char *line; + llist_t *newlist = NULL; - src_stream = xfopen(filename, "r"); - while ((line = get_line_from_file(src_stream)) != NULL) { - chomp(line); - append_file_to_list(line, name_list, num_of_entries); - free(line); + while(cur) { + src_stream = bb_xfopen(cur->data, "r"); + tmp = cur; + cur = cur->link; + free(tmp); + while((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { + newlist = llist_add_to(newlist, line); } fclose(src_stream); + } + return newlist; } +#endif -int tar_main(int argc, char **argv) +#ifdef CONFIG_FEATURE_TAR_COMPRESS +static char get_header_tar_Z(archive_handle_t *archive_handle) { - enum untar_funct_e { - /* This is optional */ - untar_unzip = 1, - /* Require one and only one of these */ - untar_list = 2, - untar_create = 4, - untar_extract = 8 - }; - - FILE *src_stream = NULL; - FILE *uncompressed_stream = NULL; - char **include_list = NULL; - char **exclude_list = NULL; - char *src_filename = NULL; - char *dst_prefix = NULL; - int opt; - unsigned short untar_funct = 0; - unsigned short untar_funct_required = 0; - unsigned short extract_function = 0; - int include_list_count = 0; + /* Cant lseek over pipe's */ + archive_handle->seek = seek_by_char; -#ifdef CONFIG_FEATURE_TAR_EXCLUDE - int exclude_list_count = 0; -#endif -#ifdef CONFIG_FEATURE_TAR_GZIP - int gunzip_pid; - int gz_fd = 0; + /* do the decompression, and cleanup */ + if ((bb_xread_char(archive_handle->src_fd) != 0x1f) || (bb_xread_char(archive_handle->src_fd) != 0x9d)) { + bb_error_msg_and_die("Invalid magic"); + } + + archive_handle->src_fd = open_transformer(archive_handle->src_fd, uncompress); + archive_handle->offset = 0; + while (get_header_tar(archive_handle) == EXIT_SUCCESS); + + /* Can only do one file at a time */ + return(EXIT_FAILURE); +} #endif +static const char tar_options[]="ctxjT:X:C:f:OpvzkZ"; + +#define CTX_CREATE 1 +#define CTX_TEST 2 +#define CTX_EXTRACT 4 +#define TAR_OPT_BZIP2 8 +#define TAR_OPT_INCLUDE 16 +#define TAR_OPT_EXCLUDE 32 +#define TAR_OPT_BASEDIR 64 +#define TAR_OPT_ARNAME 128 +#define TAR_OPT_2STDOUT 256 +#define TAR_OPT_P 512 +#define TAR_OPT_VERBOSE 1024 +#define TAR_OPT_GZIP 2048 +#define TAR_OPT_KEEP_OLD 4096 +#define TAR_OPT_UNCOMPRESS 8192 + +int tar_main(int argc, char **argv) +{ + char (*get_header_ptr)(archive_handle_t *) = get_header_tar; + archive_handle_t *tar_handle; + int opt; + char *base_dir = NULL; + const char *tar_filename = "-"; + unsigned char ctx_flag = 0; + if (argc < 2) { - show_usage(); + bb_show_usage(); } /* Prepend '-' to the first argument if required */ if (argv[1][0] != '-') { - char *tmp = xmalloc(strlen(argv[1]) + 2); + char *tmp; - tmp[0] = '-'; - strcpy(tmp + 1, argv[1]); + bb_xasprintf(&tmp, "-%s", argv[1]); argv[1] = tmp; } - while ((opt = getopt(argc, argv, "ctxT:X:C:f:Opvz")) != -1) { - switch (opt) { - - /* One and only one of these is required */ - case 'c': - untar_funct_required |= untar_create; - break; - case 't': - untar_funct_required |= untar_list; - extract_function |= extract_list | extract_unconditional; - break; - case 'x': - untar_funct_required |= untar_extract; - extract_function |= - (extract_all_to_fs | extract_unconditional | - extract_create_leading_dirs); - break; - - /* These are optional */ - /* Exclude or Include files listed in */ -#ifdef CONFIG_FEATURE_TAR_EXCLUDE - case 'X': - append_file_list_to_list(optarg, &exclude_list, - &exclude_list_count); - break; -#endif - case 'T': - /* by default a list is an include list */ - append_file_list_to_list(optarg, &include_list, - &include_list_count); - break; + /* Initialise default values */ + tar_handle = init_handle(); + tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; + + bb_opt_complementaly = "c~tx:t~cx:x~ct:X*"; + opt = bb_getopt_ulflags(argc, argv, tar_options, + NULL, /* T: arg is ignored by default + a list is an include list */ + &(tar_handle->reject), + &base_dir, /* Change to dir */ + &tar_filename); /* archive filename */ + /* Check one and only one context option was given */ + if(opt & 0x80000000UL) + bb_show_usage(); + ctx_flag = opt & (CTX_CREATE | CTX_TEST | CTX_EXTRACT); + if(ctx_flag & CTX_TEST) { + if ((tar_handle->action_header == header_list) || + (tar_handle->action_header == header_verbose_list)) { + tar_handle->action_header = header_verbose_list; + } else { + tar_handle->action_header = header_list; + } + } + if(ctx_flag & CTX_EXTRACT) { + if (tar_handle->action_data != data_extract_to_stdout) + tar_handle->action_data = data_extract_all; + } + if(opt & TAR_OPT_2STDOUT) { + /* To stdout */ + tar_handle->action_data = data_extract_to_stdout; + } + if(opt & TAR_OPT_VERBOSE) { + if ((tar_handle->action_header == header_list) || + (tar_handle->action_header == header_verbose_list)) + { + tar_handle->action_header = header_verbose_list; + } else { + tar_handle->action_header = header_list; + } + } + if (opt & TAR_OPT_KEEP_OLD) { + tar_handle->flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL; + } - case 'C': /* Change to dir */ - /* Make sure dst_prefix ends in a '/' */ - dst_prefix = concat_path_file(optarg, "/"); - break; - case 'f': /* archive filename */ - if (strcmp(optarg, "-") == 0) { - src_filename = NULL; - } else { - src_filename = xstrdup(optarg); - } - break; - case 'O': - extract_function |= extract_to_stdout; - break; - case 'p': - break; - case 'v': - extract_function |= extract_verbose_list; - break; + if(opt & TAR_OPT_GZIP) { #ifdef CONFIG_FEATURE_TAR_GZIP - case 'z': - untar_funct |= untar_unzip; - break; + get_header_ptr = get_header_tar_gz; +#else + bb_show_usage(); #endif - default: - show_usage(); - } } - - /* Make sure the valid arguments were passed */ - if (untar_funct_required == 0) { - error_msg_and_die("You must specify one of the `-ctx' options"); + if(opt & TAR_OPT_BZIP2) { +#ifdef CONFIG_FEATURE_TAR_BZIP2 + get_header_ptr = get_header_tar_bz2; +#else + bb_show_usage(); +#endif } - if ((untar_funct_required != untar_create) && - (untar_funct_required != untar_extract) && - (untar_funct_required != untar_list)) { - error_msg_and_die("You may not specify more than one `ctx' option."); + if(opt & TAR_OPT_UNCOMPRESS) { +#ifdef CONFIG_FEATURE_TAR_COMPRESS + get_header_ptr = get_header_tar_Z; +#else + bb_show_usage(); +#endif + } + if(opt & TAR_OPT_EXCLUDE) { +#ifdef CONFIG_FEATURE_TAR_EXCLUDE + tar_handle->reject = append_file_list_to_list(tar_handle->reject); +#else + bb_show_usage(); +#endif + } + /* Check if we are reading from stdin */ + if ((argv[optind]) && (*argv[optind] == '-')) { + /* Default is to read from stdin, so just skip to next arg */ + optind++; } - untar_funct |= untar_funct_required; /* Setup an array of filenames to work with */ + /* TODO: This is the same as in ar, seperate function ? */ while (optind < argc) { - append_file_to_list(argv[optind], &include_list, &include_list_count); + tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]); optind++; } - if (extract_function & (extract_list | extract_all_to_fs)) { - if (dst_prefix == NULL) { - dst_prefix = xstrdup("./"); + + if ((tar_handle->accept) || (tar_handle->reject)) { + tar_handle->filter = filter_accept_reject_list; + } + + /* Open the tar file */ + { + FILE *tar_stream; + int flags; + +#ifdef CONFIG_FEATURE_TAR_CREATE + if (ctx_flag == CTX_CREATE) { + tar_stream = stdout; + flags = O_WRONLY | O_CREAT | O_EXCL; + unlink(tar_filename); + } else +#endif + { + tar_stream = stdin; + flags = O_RDONLY; } - /* Setup the source of the tar data */ - if (src_filename != NULL) { - src_stream = xfopen(src_filename, "r"); + if ((tar_filename[0] == '-') && (tar_filename[1] == '\0')) { + tar_handle->src_fd = fileno(tar_stream); + tar_handle->seek = seek_by_char; } else { - src_stream = stdin; + tar_handle->src_fd = bb_xopen(tar_filename, flags); } -#ifdef CONFIG_FEATURE_TAR_GZIP - /* Get a binary tree of all the tar file headers */ - if (untar_funct & untar_unzip) { - uncompressed_stream = gz_open(src_stream, &gunzip_pid); - } else -#endif /* CONFIG_FEATURE_TAR_GZIP */ - uncompressed_stream = src_stream; + } - /* extract or list archive */ - unarchive(uncompressed_stream, stdout, &get_header_tar, - extract_function, dst_prefix, include_list, exclude_list); - fclose(uncompressed_stream); + if ((base_dir) && (chdir(base_dir))) { + bb_perror_msg_and_die("Couldnt chdir to %s", base_dir); } + #ifdef CONFIG_FEATURE_TAR_CREATE /* create an archive */ - else if (untar_funct & untar_create) { + if (ctx_flag == CTX_CREATE) { int verboseFlag = FALSE; int gzipFlag = FALSE; -#ifdef CONFIG_FEATURE_TAR_GZIP - if (untar_funct & untar_unzip) +# ifdef CONFIG_FEATURE_TAR_GZIP + if (get_header_ptr == get_header_tar_gz) { gzipFlag = TRUE; + } +# endif /* CONFIG_FEATURE_TAR_GZIP */ +# ifdef CONFIG_FEATURE_TAR_BZIP2 + if (get_header_ptr == get_header_tar_bz2) { + bb_error_msg_and_die("Creating bzip2 compressed archives is not currently supported."); + } +# endif /* CONFIG_FEATURE_TAR_BZIP2 */ -#endif /* CONFIG_FEATURE_TAR_GZIP */ - if (extract_function & extract_verbose_list) + if ((tar_handle->action_header == header_list) || + (tar_handle->action_header == header_verbose_list)) { verboseFlag = TRUE; - - writeTarFile(src_filename, verboseFlag, include_list, exclude_list, - gzipFlag); + } + writeTarFile(tar_handle->src_fd, verboseFlag, tar_handle->accept, + tar_handle->reject, gzipFlag); + } else +#endif /* CONFIG_FEATURE_TAR_CREATE */ + { + while (get_header_ptr(tar_handle) == EXIT_SUCCESS); + + /* Ckeck that every file that should have been extracted was */ + while (tar_handle->accept) { + if (find_list_entry(tar_handle->reject, tar_handle->accept->data) == NULL) { + if (find_list_entry(tar_handle->passed, tar_handle->accept->data) == NULL) { + bb_error_msg_and_die("%s: Not found in archive\n", tar_handle->accept->data); + } + } + tar_handle->accept = tar_handle->accept->link; + } } -#endif /* CONFIG_FEATURE_TAR_CREATE */ - /* Cleanups */ -#ifdef CONFIG_FEATURE_TAR_GZIP - if (!(untar_funct & untar_create) && (untar_funct & untar_unzip)) { - fclose(src_stream); - close(gz_fd); - gz_close(gunzip_pid); - } -#endif /* CONFIG_FEATURE_TAR_GZIP */ #ifdef CONFIG_FEATURE_CLEAN_UP - if (src_filename) { - free(src_filename); + if (tar_handle->src_fd != fileno(stdin)) { + close(tar_handle->src_fd); } -#endif - return (EXIT_SUCCESS); +#endif /* CONFIG_FEATURE_CLEAN_UP */ + + return(EXIT_SUCCESS); }