* 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 <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
*
* Based in part in the tar implementation in sash
* Copyright (c) 1999 by David I. Bell
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)
}
/* 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;
}
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);
}
/* 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 */
*/
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);
}
* 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);
}
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);
}
/* 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 */
int gzipDataPipe[2] = { -1, -1 };
int gzipStatusPipe[2] = { -1, -1 };
pid_t gzipPid = 0;
+ volatile int vfork_exec_errno = 0;
#endif
int errorFlag = FALSE;
/* 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. */
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);
}
/* 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 (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);
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]);
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;
}
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
/* 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);
#endif /* tar_create */
#ifdef CONFIG_FEATURE_TAR_EXCLUDE
-static const llist_t *append_file_list_to_list(const char *filename, const 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 = add_to_list(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)
{
-#ifdef CONFIG_FEATURE_TAR_GZIP
char (*get_header_ptr)(archive_handle_t *) = get_header_tar;
-#endif
archive_handle_t *tar_handle;
int opt;
char *base_dir = NULL;
- char *tar_filename = "-";
+ const char *tar_filename = "-";
+ unsigned char ctx_flag = 0;
-#ifdef CONFIG_FEATURE_TAR_CREATE
- unsigned char tar_create = FALSE;
-#endif
+ if (argc < 2) {
+ 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]);
- argv[1] = tmp;
- }
+ char *tmp;
- if (argc < 2) {
- show_usage();
+ 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':
- tar_create = TRUE;
- break;
-#endif
- case 't':
+ 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 <optarg> */
+ &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':
- tar_handle->action_data = data_extract_all;
- break;
-
- /* These are optional */
- /* Exclude or Include files listed in <filename> */
-#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 <optarg> */
- 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':
- tar_handle->read = read_bz2;
- break;
+ if(opt & TAR_OPT_BZIP2) {
+ get_header_ptr = get_header_tar_bz2;
+ }
#endif
- default:
- show_usage();
- }
+#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 */
/* Setup an array of filenames to work with */
/* TODO: This is the same as in ar, seperate function ? */
while (optind < argc) {
- tar_handle->accept = add_to_list(tar_handle->accept, argv[optind]);
+ tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
optind++;
}
tar_handle->filter = filter_accept_reject_list;
}
- if ((base_dir) && (chdir(base_dir))) {
- perror_msg_and_die("Couldnt chdir");
- }
-
#ifdef CONFIG_FEATURE_TAR_CREATE
/* create an archive */
- if (tar_create == TRUE) {
+ if (ctx_flag == CTX_CREATE) {
int verboseFlag = FALSE;
int gzipFlag = FALSE;
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,
{
if ((tar_filename[0] == '-') && (tar_filename[1] == '\0')) {
tar_handle->src_fd = fileno(stdin);
+ tar_handle->seek = seek_by_char;
} else {
- tar_handle->seek = seek_by_jump;
- 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))) {
+ bb_perror_msg_and_die("Couldnt chdir");
}
-#ifdef CONFIG_FEATURE_TAR_GZIP
- if (get_header_ptr == get_header_tar_gz) {
- tar_handle->seek = seek_by_char;
- get_header_tar_gz(tar_handle);
- } else
-#endif /* CONFIG_FEATURE_TAR_GZIP */
-#ifdef CONFIG_FEATURE_TAR_BZIP2
- if (tar_handle->read == read_bz2) {
- BZ2_bzReadOpen(tar_handle->src_fd, NULL, 0);
- while (get_header_tar(tar_handle) == EXIT_SUCCESS);
- } else
-#endif /* CONFIG_FEATURE_TAR_BZIP2 */
- while (get_header_tar(tar_handle) == EXIT_SUCCESS);
+ 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) {
- 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;
projects / oweals / busybox.git / blobdiff