emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for using '-' as the filename when reading from stdin

Browse Source
This commit is contained in:
Glenn L McGrath
2002-09-28 02:06:39 +00:00
parent 92052e3945
commit 8132e933e6
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
archival/tar.c
View File

@@ -626,14 +626,6 @@ int tar_main(int argc, char **argv)
tar_handle->src_fd = fileno(stdin); tar_handle->src_fd = fileno(stdin);
tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS; tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS;
/* 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;
}
while ((opt = getopt(argc, argv, "ctxT:X:C:f:Opvz")) != -1) { while ((opt = getopt(argc, argv, "ctxT:X:C:f:Opvz")) != -1) {
switch (opt) { switch (opt) {
/* One and only one of these is required */ /* One and only one of these is required */
@@ -704,6 +696,10 @@ int tar_main(int argc, char **argv)
} }
} }
if (*argv[optind] == '-') {
optind++;
}
/* Setup an array of filenames to work with */ /* Setup an array of filenames to work with */
/* TODO: This is the same as in ar, seperate function ? */ /* TODO: This is the same as in ar, seperate function ? */
while (optind < argc) { while (optind < argc) {
@@ -750,7 +746,9 @@ int tar_main(int argc, char **argv)
while (get_header_tar(tar_handle) == EXIT_SUCCESS); while (get_header_tar(tar_handle) == EXIT_SUCCESS);
#ifdef CONFIG_FEATURE_CLEAN_UP #ifdef CONFIG_FEATURE_CLEAN_UP
if (tar_handle->src_fd != fileno(stdin)) {
close(tar_handle->src_fd); close(tar_handle->src_fd);
}
#endif #endif
return(EXIT_SUCCESS); return(EXIT_SUCCESS);