mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Patch from Matt Kraai:
The following patch makes the -X option to tar behave like GNU, which reads one file per line. It also prevents the last file from being appended to the list twice (though that has no noticeable impact).
This commit is contained in:
parent
bd193a42a5
commit
4836fd44f0
@ -246,7 +246,8 @@ extern int tar_main(int argc, char **argv)
|
||||
#if defined BB_FEATURE_TAR_EXCLUDE
|
||||
case 'e':
|
||||
if (strcmp(*argv, "xclude")==0) {
|
||||
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
|
||||
excludeList=xrealloc( excludeList,
|
||||
sizeof(char *) * (excludeListSize+2));
|
||||
excludeList[excludeListSize] = *(++argv);
|
||||
if (excludeList[excludeListSize] == NULL)
|
||||
error_msg_and_die( "Option requires an argument: No file specified\n");
|
||||
@ -258,30 +259,30 @@ extern int tar_main(int argc, char **argv)
|
||||
stopIt=TRUE;
|
||||
break;
|
||||
}
|
||||
case 'X':
|
||||
if (*excludeFileName != '-')
|
||||
error_msg_and_die("Only one 'X' option allowed\n");
|
||||
excludeFileName = *(++argv);
|
||||
if (excludeFileName == NULL)
|
||||
error_msg_and_die("Option requires an argument: No file specified\n");
|
||||
fileList = fopen (excludeFileName, "rt");
|
||||
if (! fileList)
|
||||
error_msg_and_die("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;
|
||||
case 'X':
|
||||
if (*excludeFileName != '-')
|
||||
error_msg_and_die("Only one 'X' option allowed\n");
|
||||
excludeFileName = *(++argv);
|
||||
if (excludeFileName == NULL)
|
||||
error_msg_and_die("Option requires an argument: No file specified\n");
|
||||
fileList = fopen (excludeFileName, "r");
|
||||
if (! fileList)
|
||||
error_msg_and_die("Exclude file: file not found\n");
|
||||
while (fgets(file, sizeof(file), fileList) != NULL) {
|
||||
excludeList = xrealloc(excludeList,
|
||||
sizeof(char *) * (excludeListSize+2));
|
||||
if (file[strlen(file)-1] == '\n')
|
||||
file[strlen(file)-1] = '\0';
|
||||
excludeList[excludeListSize] = xstrdup(file);
|
||||
/* Remove leading "/"s */
|
||||
while (*excludeList[excludeListSize] == '/')
|
||||
excludeList[excludeListSize]++;
|
||||
/* Tack a NULL onto the end of the list */
|
||||
excludeList[++excludeListSize] = NULL;
|
||||
}
|
||||
fclose(fileList);
|
||||
stopIt=TRUE;
|
||||
break;
|
||||
#endif
|
||||
case '-':
|
||||
break;
|
||||
|
51
tar.c
51
tar.c
@ -246,7 +246,8 @@ extern int tar_main(int argc, char **argv)
|
||||
#if defined BB_FEATURE_TAR_EXCLUDE
|
||||
case 'e':
|
||||
if (strcmp(*argv, "xclude")==0) {
|
||||
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
|
||||
excludeList=xrealloc( excludeList,
|
||||
sizeof(char *) * (excludeListSize+2));
|
||||
excludeList[excludeListSize] = *(++argv);
|
||||
if (excludeList[excludeListSize] == NULL)
|
||||
error_msg_and_die( "Option requires an argument: No file specified\n");
|
||||
@ -258,30 +259,30 @@ extern int tar_main(int argc, char **argv)
|
||||
stopIt=TRUE;
|
||||
break;
|
||||
}
|
||||
case 'X':
|
||||
if (*excludeFileName != '-')
|
||||
error_msg_and_die("Only one 'X' option allowed\n");
|
||||
excludeFileName = *(++argv);
|
||||
if (excludeFileName == NULL)
|
||||
error_msg_and_die("Option requires an argument: No file specified\n");
|
||||
fileList = fopen (excludeFileName, "rt");
|
||||
if (! fileList)
|
||||
error_msg_and_die("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;
|
||||
case 'X':
|
||||
if (*excludeFileName != '-')
|
||||
error_msg_and_die("Only one 'X' option allowed\n");
|
||||
excludeFileName = *(++argv);
|
||||
if (excludeFileName == NULL)
|
||||
error_msg_and_die("Option requires an argument: No file specified\n");
|
||||
fileList = fopen (excludeFileName, "r");
|
||||
if (! fileList)
|
||||
error_msg_and_die("Exclude file: file not found\n");
|
||||
while (fgets(file, sizeof(file), fileList) != NULL) {
|
||||
excludeList = xrealloc(excludeList,
|
||||
sizeof(char *) * (excludeListSize+2));
|
||||
if (file[strlen(file)-1] == '\n')
|
||||
file[strlen(file)-1] = '\0';
|
||||
excludeList[excludeListSize] = xstrdup(file);
|
||||
/* Remove leading "/"s */
|
||||
while (*excludeList[excludeListSize] == '/')
|
||||
excludeList[excludeListSize]++;
|
||||
/* Tack a NULL onto the end of the list */
|
||||
excludeList[++excludeListSize] = NULL;
|
||||
}
|
||||
fclose(fileList);
|
||||
stopIt=TRUE;
|
||||
break;
|
||||
#endif
|
||||
case '-':
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user