Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Write files when extracting an archive from standard input.

Browse Source
This commit is contained in:
Matt Kraai 2001-12-20 22:09:31 +00:00
parent c5b5cab37d
commit 2b1effdbbc
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
archival/tar.c
View File

@ -459,7 +459,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
error_msg_and_die("Cowardly refusing to create an empty archive"); error_msg_and_die("Cowardly refusing to create an empty archive");
/* Open the tar file for writing. */ /* Open the tar file for writing. */
if (tarName == NULL || !strcmp(tarName, "-")) if (tarName == NULL)
tbInfo.tarFd = fileno(stdout); tbInfo.tarFd = fileno(stdout);
else else
tbInfo.tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644); tbInfo.tarFd = open (tarName, O_WRONLY | O_CREAT | O_TRUNC, 0644);
@ -573,14 +573,12 @@ char **list_and_not_list(char **include_list, char **exclude_list)
int tar_main(int argc, char **argv) int tar_main(int argc, char **argv)
{ {
enum untar_funct_e { enum untar_funct_e {
/* These are optional */ /* This is optional */
untar_from_file = 1, untar_unzip = 1,
untar_from_stdin = 2,
untar_unzip = 4,
/* Require one and only one of these */ /* Require one and only one of these */
untar_list = 8, untar_list = 2,
untar_create = 16, untar_create = 4,
untar_extract = 32 untar_extract = 8
}; };
FILE *src_stream = NULL; FILE *src_stream = NULL;
@ -649,10 +647,8 @@ int tar_main(int argc, char **argv)
break; break;
case 'f': // archive filename case 'f': // archive filename
if (strcmp(optarg, "-") == 0) { if (strcmp(optarg, "-") == 0) {
// Untar from stdin to stdout src_filename = NULL;
untar_funct |= untar_from_stdin;
} else { } else {
untar_funct |= untar_from_file;
src_filename = xstrdup(optarg); src_filename = xstrdup(optarg);
} }
break; break;
@ -694,17 +690,13 @@ int tar_main(int argc, char **argv)
optind++; optind++;
} }
if (src_filename == NULL) {
extract_function |= extract_to_stdout;
}
if (extract_function & (extract_list | extract_all_to_fs)) { if (extract_function & (extract_list | extract_all_to_fs)) {
if (dst_prefix == NULL) { if (dst_prefix == NULL) {
dst_prefix = xstrdup("./"); dst_prefix = xstrdup("./");
} }
/* Setup the source of the tar data */ /* Setup the source of the tar data */
if (untar_funct & untar_from_file) { if (src_filename != NULL) {
src_stream = xfopen(src_filename, "r"); src_stream = xfopen(src_filename, "r");
} else { } else {
src_stream = stdin; src_stream = stdin;

5
testsuite/tar/tar-extracts-from-standard-input Normal file
View File

@ -0,0 +1,5 @@
touch foo
tar cf foo.tar foo
rm foo
cat foo.tar | busybox tar x
test -f foo