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

Patch to add in the -X option and fix the --exclude bug, originally by

Browse Source 
Sebastien Huet, and now ported to the latest and greatest by both Arne Bernin
<ab@netropol.de> and kent robotti <robotti@metconnect.com>.
This commit is contained in:
Eric Andersen
2000-12-04 18:51:09 +00:00
parent f484e7e65c
commit 8cede00b9e
5 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Config.h
View File

@@ -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

2
applets/usage.c
View File

@@ -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"

29
archival/tar.c
View File

@@ -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;

29
tar.c
View File

@@ -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;

2
usage.c
View File

@@ -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"