X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Ftar.c;h=2f0c83b27e9823c68bf6b558b95b9972f5e47e3b;hb=b79db92a21aee4c003f49eb21f1447b79e0e0c1e;hp=fa1c575121e43a4aaa3498cc54bc5f95ad21070c;hpb=66125c806518f74a54232206d02e30a39b621232;p=oweals%2Fbusybox.git diff --git a/archival/tar.c b/archival/tar.c index fa1c57512..2f0c83b27 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 @@ -278,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); } @@ -295,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); + bb_error_msg(bb_msg_io_error, real_name); return (FALSE); } /* Pad the header up to the tar block size */ @@ -368,7 +367,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, /* 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); } @@ -377,7 +376,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); } @@ -386,14 +385,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); } @@ -419,21 +418,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) { - perror_msg("%s: Cannot open", fileName); + 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); + bb_error_msg(bb_msg_io_error, fileName); return (FALSE); } readSize += size; } if (size == -1) { - error_msg(io_error, fileName); + bb_error_msg(bb_msg_io_error, fileName); return (FALSE); } /* Pad the file up to the tar block size */ @@ -464,7 +463,7 @@ static inline int writeTarFile(const char *tarName, const int verboseFlag, /* Make sure there is at least one file to tar up. */ if (include == NULL) { - error_msg_and_die("Cowardly refusing to create an empty archive"); + bb_error_msg_and_die("Cowardly refusing to create an empty archive"); } /* Open the tar file for writing. */ @@ -472,12 +471,13 @@ static inline int writeTarFile(const char *tarName, const int verboseFlag, tbInfo.tarFd = fileno(stdout); tbInfo.verboseFlag = verboseFlag ? 2 : 0; } else { - tbInfo.tarFd = open(tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644); + unlink(tarName); + tbInfo.tarFd = open(tarName, O_WRONLY | O_CREAT | O_EXCL, 0644); tbInfo.verboseFlag = verboseFlag ? 1 : 0; } if (tbInfo.tarFd < 0) { - perror_msg("%s: Cannot open", tarName); + bb_perror_msg("%s: Cannot open", tarName); freeHardLinkInfo(&tbInfo.hlInfoHead); return (FALSE); } @@ -485,12 +485,12 @@ static inline int writeTarFile(const char *tarName, const int 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); + bb_error_msg_and_die(bb_msg_io_error, tarName); #ifdef CONFIG_FEATURE_TAR_GZIP if (gzip) { if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0) { - perror_msg_and_die("Failed to create gzip pipe"); + bb_perror_msg_and_die("Failed to create gzip pipe"); } signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */ @@ -525,11 +525,11 @@ static inline int writeTarFile(const char *tarName, const int verboseFlag, while (1) { char buf; - int n = read(gzipStatusPipe[0], &buf, 1); + int n = bb_full_read(gzipStatusPipe[0], &buf, 1); if (n == 0 && vfork_exec_errno != 0) { errno = vfork_exec_errno; - perror_msg_and_die("Could not exec gzip process"); + bb_perror_msg_and_die("Could not exec gzip process"); } else if ((n < 0) && (errno == EAGAIN || errno == EINTR)) continue; /* try it again */ break; @@ -538,7 +538,7 @@ static inline int writeTarFile(const char *tarName, const int verboseFlag, tbInfo.tarFd = gzipDataPipe[1]; } else { - perror_msg_and_die("Failed to vfork gzip process"); + bb_perror_msg_and_die("Failed to vfork gzip process"); } } #endif @@ -567,7 +567,7 @@ static inline int writeTarFile(const char *tarName, const 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); @@ -583,23 +583,42 @@ static inline int writeTarFile(const char *tarName, const int verboseFlag, #endif /* tar_create */ #ifdef CONFIG_FEATURE_TAR_EXCLUDE -static llist_t *append_file_list_to_list(const char *filename, llist_t *list) +static llist_t *append_file_list_to_list(llist_t *list) { - FILE *src_stream = xfopen(filename, "r"); + FILE *src_stream; + llist_t *cur = list; + llist_t *tmp; char *line; - while((line = get_line_from_file(src_stream)) != NULL) { - chomp(line); - list = llist_add_to(list, line); + llist_t *newlist = NULL; + + 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 (list); + } + return newlist; } #endif + +static const char tar_options[]="ctxjT:X:C:f:Opvz"; #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 int tar_main(int argc, char **argv) { @@ -611,94 +630,72 @@ int tar_main(int argc, char **argv) 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); - tmp[0] = '-'; - strcpy(tmp + 1, argv[1]); + char *tmp; + + bb_xasprintf(&tmp, "-%s", argv[1]); argv[1] = tmp; } /* Initialise default values */ tar_handle = init_handle(); - tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS; - - while ((opt = getopt(argc, argv, "cjtxT:X:C:f:Opvz")) != -1) { - switch (opt) { - /* One and only one of these is required */ -#ifdef CONFIG_FEATURE_TAR_CREATE - case 'c': - ctx_flag |= CTX_CREATE; - break; -#endif - case 't': - ctx_flag |= CTX_TEST; + tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE; + + 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; } - break; - case 'x': - ctx_flag |= CTX_EXTRACT; - tar_handle->action_data = data_extract_all; - break; - - /* These are optional */ - /* Exclude or Include files listed in */ -#ifdef CONFIG_FEATURE_TAR_EXCLUDE - case 'X': - tar_handle->reject = - append_file_list_to_list(optarg, tar_handle->reject); - break; -#endif - case 'T': - /* by default a list is an include list */ - break; - case 'C': /* Change to dir */ - base_dir = optarg; - break; - case 'f': /* archive filename */ - tar_filename = optarg; - break; - case 'O': /* To stdout */ + } + 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; - break; - case 'p': - tar_handle->flags |= ARCHIVE_PRESERVE_DATE; - break; - case 'v': + } + 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)) + { tar_handle->action_header = header_verbose_list; } else { tar_handle->action_header = header_list; } - break; + } #ifdef CONFIG_FEATURE_TAR_GZIP - case 'z': + if(opt & TAR_OPT_GZIP) { get_header_ptr = get_header_tar_gz; - break; + } #endif #ifdef CONFIG_FEATURE_TAR_BZIP2 - case 'j': + if(opt & TAR_OPT_BZIP2) { get_header_ptr = get_header_tar_bz2; - break; -#endif - default: - show_usage(); - } } - - /* Check one and only one context option was given */ - if ((ctx_flag != CTX_CREATE) && (ctx_flag != CTX_TEST) && (ctx_flag != CTX_EXTRACT)) { - show_usage(); +#endif +#ifdef CONFIG_FEATURE_TAR_EXCLUDE + if(opt & TAR_OPT_EXCLUDE) { + tar_handle->reject = append_file_list_to_list(tar_handle->reject); } - +#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 */ @@ -727,8 +724,14 @@ int tar_main(int argc, char **argv) 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 */ - if (tar_handle->action_header == header_verbose_list) { + if ((tar_handle->action_header == header_list) || + (tar_handle->action_header == header_verbose_list)) { verboseFlag = TRUE; } writeTarFile(tar_filename, verboseFlag, tar_handle->accept, @@ -740,11 +743,11 @@ int tar_main(int argc, char **argv) tar_handle->src_fd = fileno(stdin); tar_handle->seek = seek_by_char; } else { - tar_handle->src_fd = xopen(tar_filename, O_RDONLY); + tar_handle->src_fd = bb_xopen(tar_filename, O_RDONLY); } if ((base_dir) && (chdir(base_dir))) { - perror_msg_and_die("Couldnt chdir"); + bb_perror_msg_and_die("Couldnt chdir"); } while (get_header_ptr(tar_handle) == EXIT_SUCCESS); @@ -753,7 +756,7 @@ int tar_main(int argc, char **argv) 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) { - error_msg_and_die("%s: Not found in archive\n", tar_handle->accept->data); + bb_error_msg_and_die("%s: Not found in archive\n", tar_handle->accept->data); } } tar_handle->accept = tar_handle->accept->link;