summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-12-04 18:51:09 +0000
committerEric Andersen2000-12-04 18:51:09 +0000
commit8cede00b9eccb077232030723867566ad5685c6f (patch)
treea4f6d4889d8b3e779477ccbabb7de29d80fe0a6f
parentf484e7e65c80e39ec7d9e14bbb1cc2fc2a62ae25 (diff)
downloadbusybox-8cede00b9eccb077232030723867566ad5685c6f.zip
busybox-8cede00b9eccb077232030723867566ad5685c6f.tar.gz
Patch to add in the -X option and fix the --exclude bug, originally by
Sebastien Huet, and now ported to the latest and greatest by both Arne Bernin <ab@netropol.de> and kent robotti <robotti@metconnect.com>.
-rw-r--r--Config.h2
-rw-r--r--applets/usage.c2
-rw-r--r--archival/tar.c29
-rw-r--r--tar.c29
-rw-r--r--usage.c2
5 files changed, 61 insertions, 3 deletions
diff --git a/Config.h b/Config.h
index 0f31ae1..e070446 100644
--- a/Config.h
+++ b/Config.h
@@ -222,7 +222,7 @@
// Enable support for creation of tar files.
#define BB_FEATURE_TAR_CREATE
//
-// Enable support for "--exclude" for excluding files
+// Enable support for "--exclude" and "-X" for excluding files
#define BB_FEATURE_TAR_EXCLUDE
//
//// Enable reverse sort
diff --git a/applets/usage.c b/applets/usage.c
index bab6d21..bd2321f 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1218,6 +1218,7 @@ const char tar_usage[] =
#endif
#if defined BB_FEATURE_TAR_EXCLUDE
"[--exclude File] "
+ "[-X File]"
#endif
"[-f tarFile] [FILE(s)] ...\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
@@ -1234,6 +1235,7 @@ const char tar_usage[] =
"\tO\t\textract to stdout\n"
#if defined BB_FEATURE_TAR_EXCLUDE
"\texclude\t\tfile to exclude\n"
+ "\tX\t\tfile with names to exclude\n"
#endif
"\nInformative output:\n"
"\tv\t\tverbosely list files processed\n"
diff --git a/archival/tar.c b/archival/tar.c
index 6d8e633..7e56fb9 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -147,6 +147,9 @@ extern int tar_main(int argc, char **argv)
char** extractList=NULL;
#if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0;
+ char *excludeFileName ="-";
+ FILE *fileList;
+ char file[256];
#endif
const char *tarName="-";
int listFlag = FALSE;
@@ -198,7 +201,7 @@ extern int tar_main(int argc, char **argv)
break;
#if defined BB_FEATURE_TAR_EXCLUDE
case 'e':
- if (strcmp(*argv, "exclude")==0) {
+ if (strcmp(*argv, "xclude")==0) {
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv);
if (excludeList[excludeListSize] == NULL)
@@ -211,6 +214,30 @@ extern int tar_main(int argc, char **argv)
stopIt=TRUE;
break;
}
+ case 'X':
+ if (*excludeFileName != '-')
+ fatalError("Only one 'X' option allowed\n");
+ excludeFileName = *(++argv);
+ if (excludeFileName == NULL)
+ fatalError("Option requires an argument: No file specified\n");
+ fileList = fopen (excludeFileName, "rt");
+ if (! fileList)
+ fatalError("Exclude file: file not found\n");
+ while (!feof(fileList)) {
+ fscanf(fileList, "%s", file);
+ excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
+ excludeList[excludeListSize] = malloc(sizeof(char) * (strlen(file)+1));
+ strcpy(excludeList[excludeListSize],file);
+ /* Remove leading "/"s */
+ if (*excludeList[excludeListSize] == '/')
+ excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
+ /* Tack a NULL onto the end of the list */
+ excludeList[++excludeListSize] = NULL;
+ }
+
+ fclose(fileList);
+ stopIt=TRUE;
+ break;
#endif
case '-':
break;
diff --git a/tar.c b/tar.c
index 6d8e633..7e56fb9 100644
--- a/tar.c
+++ b/tar.c
@@ -147,6 +147,9 @@ extern int tar_main(int argc, char **argv)
char** extractList=NULL;
#if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0;
+ char *excludeFileName ="-";
+ FILE *fileList;
+ char file[256];
#endif
const char *tarName="-";
int listFlag = FALSE;
@@ -198,7 +201,7 @@ extern int tar_main(int argc, char **argv)
break;
#if defined BB_FEATURE_TAR_EXCLUDE
case 'e':
- if (strcmp(*argv, "exclude")==0) {
+ if (strcmp(*argv, "xclude")==0) {
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv);
if (excludeList[excludeListSize] == NULL)
@@ -211,6 +214,30 @@ extern int tar_main(int argc, char **argv)
stopIt=TRUE;
break;
}
+ case 'X':
+ if (*excludeFileName != '-')
+ fatalError("Only one 'X' option allowed\n");
+ excludeFileName = *(++argv);
+ if (excludeFileName == NULL)
+ fatalError("Option requires an argument: No file specified\n");
+ fileList = fopen (excludeFileName, "rt");
+ if (! fileList)
+ fatalError("Exclude file: file not found\n");
+ while (!feof(fileList)) {
+ fscanf(fileList, "%s", file);
+ excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
+ excludeList[excludeListSize] = malloc(sizeof(char) * (strlen(file)+1));
+ strcpy(excludeList[excludeListSize],file);
+ /* Remove leading "/"s */
+ if (*excludeList[excludeListSize] == '/')
+ excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
+ /* Tack a NULL onto the end of the list */
+ excludeList[++excludeListSize] = NULL;
+ }
+
+ fclose(fileList);
+ stopIt=TRUE;
+ break;
#endif
case '-':
break;
diff --git a/usage.c b/usage.c
index bab6d21..bd2321f 100644
--- a/usage.c
+++ b/usage.c
@@ -1218,6 +1218,7 @@ const char tar_usage[] =
#endif
#if defined BB_FEATURE_TAR_EXCLUDE
"[--exclude File] "
+ "[-X File]"
#endif
"[-f tarFile] [FILE(s)] ...\n"
#ifndef BB_FEATURE_TRIVIAL_HELP
@@ -1234,6 +1235,7 @@ const char tar_usage[] =
"\tO\t\textract to stdout\n"
#if defined BB_FEATURE_TAR_EXCLUDE
"\texclude\t\tfile to exclude\n"
+ "\tX\t\tfile with names to exclude\n"
#endif
"\nInformative output:\n"
"\tv\t\tverbosely list files processed\n"