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;
}
*/
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 */
int gzipDataPipe[2] = { -1, -1 };
int gzipStatusPipe[2] = { -1, -1 };
pid_t gzipPid = 0;
+ volatile int vfork_exec_errno = 0;
#endif
int errorFlag = FALSE;
}
/* Open the tar file for writing. */
- if (tarName == NULL) {
+ if (tarName == NULL || (tarName[0] == '-' && tarName[1] == '\0')) {
tbInfo.tarFd = fileno(stdout);
tbInfo.verboseFlag = verboseFlag ? 2 : 0;
} else {
#ifdef CONFIG_FEATURE_TAR_GZIP
if (gzip) {
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, gzipDataPipe) < 0
- || pipe(gzipStatusPipe) < 0)
+ if (pipe(gzipDataPipe) < 0 || pipe(gzipStatusPipe) < 0) {
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]);
int n = 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;
+ 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");
+ perror_msg_and_die("Failed to vfork gzip process");
}
}
#endif
#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(const char *filename, llist_t *list)
{
FILE *src_stream = xfopen(filename, "r");
char *line;
while((line = get_line_from_file(src_stream)) != NULL) {
chomp(line);
- list = add_to_list(list, line);
+ list = llist_add_to(list, line);
}
fclose(src_stream);
}
#endif
+#define CTX_CREATE 1
+#define CTX_TEST 2
+#define CTX_EXTRACT 4
+
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) {
+ show_usage();
+ }
/* Prepend '-' to the first argument if required */
if (argv[1][0] != '-') {
argv[1] = tmp;
}
- if (argc < 2) {
- show_usage();
- }
-
/* Initialise default values */
tar_handle = init_handle();
tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS;
- while ((opt = getopt(argc, argv, "ctxT:X:C:f:Opvz")) != -1) {
+ 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;
+ ctx_flag |= CTX_CREATE;
break;
#endif
case 't':
+ 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;
}
break;
case 'x':
+ ctx_flag |= CTX_EXTRACT;
tar_handle->action_data = data_extract_all;
break;
break;
#endif
#ifdef CONFIG_FEATURE_TAR_BZIP2
- /* Not enabled yet */
case 'j':
- archive_handle->archive_action = bunzip2;
+ get_header_ptr = get_header_tar_bz2;
break;
#endif
default:
}
}
+ /* Check one and only one context option was given */
+ if ((ctx_flag != CTX_CREATE) && (ctx_flag != CTX_TEST) && (ctx_flag != CTX_EXTRACT)) {
+ show_usage();
+ }
+
/* 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) {
-#if 0
- char absolute_path[PATH_MAX];
- realpath(argv[optind], absolute_path);
- tar_handle->accept = add_to_list(tar_handle->accept, absolute_path);
-#endif
- tar_handle->accept = add_to_list(tar_handle->accept, argv[optind]);
+ tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
optind++;
-
}
if ((tar_handle->accept) || (tar_handle->reject)) {
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;
{
if ((tar_filename[0] == '-') && (tar_filename[1] == '\0')) {
tar_handle->src_fd = fileno(stdin);
+ tar_handle->seek = seek_by_char;
} else {
tar_handle->src_fd = xopen(tar_filename, O_RDONLY);
}
-#ifdef CONFIG_FEATURE_TAR_GZIP
- if (get_header_ptr == get_header_tar_gz) {
- get_header_tar_gz(tar_handle);
- } else
-#endif /* CONFIG_FEATURE_TAR_CREATE */
- while (get_header_tar(tar_handle) == EXIT_SUCCESS);
+ if ((base_dir) && (chdir(base_dir))) {
+ perror_msg_and_die("Couldnt chdir");
+ }
+
+ while (get_header_ptr(tar_handle) == EXIT_SUCCESS);
/* Ckeck that every file that should have been extracted was */
while (tar_handle->accept) {
projects / oweals / busybox.git / blobdiff