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

Fix some bugs reported by Jim Gleason <jimg@lineo.com> and others I

Browse Source 
introduced.
This commit is contained in:
Matt Kraai 2000-11-08 02:35:47 +00:00
parent 63a862272c
commit d8ad76cb31
2 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
archival/tar.c
View File

@ -137,8 +137,8 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
#ifdef BB_FEATURE_TAR_CREATE #ifdef BB_FEATURE_TAR_CREATE
/* Local procedures to save files into a tar file. */ /* Local procedures to save files into a tar file. */
static int writeTarFile(const char* tarName, int tostdoutFlag, static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
int verboseFlag, int argc, char **argv, char** excludeList); char** excludeList);
#endif #endif
extern int tar_main(int argc, char **argv) extern int tar_main(int argc, char **argv)
@ -160,13 +160,11 @@ extern int tar_main(int argc, char **argv)
if (argc <= 1) if (argc <= 1)
usage(tar_usage); usage(tar_usage);
/* do normal option parsing */ while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) {
while (--argc > 0 && ((*argv && **(++argv) == '-') ||
(firstOpt==TRUE && strspn(*argv, "-cxt") ))) {
firstOpt=FALSE; firstOpt=FALSE;
stopIt=FALSE; stopIt=FALSE;
while (stopIt==FALSE && *argv && **argv) { while (stopIt==FALSE && **argv) {
switch (**argv) { switch (*((*argv)++)) {
case 'c': case 'c':
if (extractFlag == TRUE || listFlag == TRUE) if (extractFlag == TRUE || listFlag == TRUE)
goto flagError; goto flagError;
@ -187,29 +185,22 @@ extern int tar_main(int argc, char **argv)
break; break;
case 'O': case 'O':
tostdoutFlag = TRUE; tostdoutFlag = TRUE;
tarName = "-";
break; break;
case 'f': case 'f':
if (--argc == 0) {
fatalError( "Option requires an argument: No file specified\n");
}
if (*tarName != '-') if (*tarName != '-')
fatalError( "Only one 'f' option allowed\n"); fatalError( "Only one 'f' option allowed\n");
tarName = *(++argv); tarName = *(++argv);
if (tarName == NULL) if (tarName == NULL)
fatalError( "Option requires an argument: No file specified\n"); fatalError( "Option requires an argument: No file specified\n");
if (!strcmp(tarName, "-") && createFlag == TRUE)
tostdoutFlag = TRUE;
stopIt=TRUE; stopIt=TRUE;
break; break;
#if defined BB_FEATURE_TAR_EXCLUDE #if defined BB_FEATURE_TAR_EXCLUDE
case 'e': case 'e':
if (strcmp(*argv, "exclude")==0) { if (strcmp(*argv, "exclude")==0) {
if (--argc == 0) {
fatalError( "Option requires an argument: No file specified\n");
}
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2)); excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv); excludeList[excludeListSize] = *(++argv);
if (excludeList[excludeListSize] == NULL)
fatalError( "Option requires an argument: No file specified\n");
/* Remove leading "/"s */ /* Remove leading "/"s */
if (*excludeList[excludeListSize] =='/') if (*excludeList[excludeListSize] =='/')
excludeList[excludeListSize] = (excludeList[excludeListSize])+1; excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
@ -224,7 +215,6 @@ extern int tar_main(int argc, char **argv)
default: default:
usage(tar_usage); usage(tar_usage);
} }
++(*argv);
} }
} }
@ -236,11 +226,12 @@ extern int tar_main(int argc, char **argv)
#ifndef BB_FEATURE_TAR_CREATE #ifndef BB_FEATURE_TAR_CREATE
fatalError( "This version of tar was not compiled with tar creation support.\n"); fatalError( "This version of tar was not compiled with tar creation support.\n");
#else #else
exit(writeTarFile(tarName, tostdoutFlag, verboseFlag, argc, argv, excludeList)); exit(writeTarFile(tarName, verboseFlag, argv, excludeList));
#endif #endif
} }
if (listFlag == TRUE || extractFlag == TRUE) { if (listFlag == TRUE || extractFlag == TRUE) {
exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag, verboseFlag, &argv[optind], excludeList)); exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag,
verboseFlag, argv, excludeList));
} }
flagError: flagError:
@ -967,8 +958,8 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
return( TRUE); return( TRUE);
} }
static int writeTarFile(const char* tarName, int tostdoutFlag, static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
int verboseFlag, int argc, char **argv, char** excludeList) char** excludeList)
{ {
int tarFd=-1; int tarFd=-1;
int errorFlag=FALSE; int errorFlag=FALSE;
@ -977,11 +968,11 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
tbInfo.verboseFlag = verboseFlag; tbInfo.verboseFlag = verboseFlag;
/* Make sure there is at least one file to tar up. */ /* Make sure there is at least one file to tar up. */
if (argc <= 0) if (*argv == NULL)
fatalError("Cowardly refusing to create an empty archive\n"); fatalError("Cowardly refusing to create an empty archive\n");
/* Open the tar file for writing. */ /* Open the tar file for writing. */
if (tostdoutFlag == TRUE) if (!strcmp(tarName, "-"))
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);
@ -1000,7 +991,7 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
umask(0); umask(0);
/* Read the directory/files and iterate over them one at a time */ /* Read the directory/files and iterate over them one at a time */
while (argc-- > 0) { while (*argv != NULL) {
if (recursiveAction(*argv++, TRUE, FALSE, FALSE, if (recursiveAction(*argv++, TRUE, FALSE, FALSE,
writeFileToTarball, writeFileToTarball, writeFileToTarball, writeFileToTarball,
(void*) &tbInfo) == FALSE) { (void*) &tbInfo) == FALSE) {

39
tar.c
View File

@ -137,8 +137,8 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
#ifdef BB_FEATURE_TAR_CREATE #ifdef BB_FEATURE_TAR_CREATE
/* Local procedures to save files into a tar file. */ /* Local procedures to save files into a tar file. */
static int writeTarFile(const char* tarName, int tostdoutFlag, static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
int verboseFlag, int argc, char **argv, char** excludeList); char** excludeList);
#endif #endif
extern int tar_main(int argc, char **argv) extern int tar_main(int argc, char **argv)
@ -160,13 +160,11 @@ extern int tar_main(int argc, char **argv)
if (argc <= 1) if (argc <= 1)
usage(tar_usage); usage(tar_usage);
/* do normal option parsing */ while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) {
while (--argc > 0 && ((*argv && **(++argv) == '-') ||
(firstOpt==TRUE && strspn(*argv, "-cxt") ))) {
firstOpt=FALSE; firstOpt=FALSE;
stopIt=FALSE; stopIt=FALSE;
while (stopIt==FALSE && *argv && **argv) { while (stopIt==FALSE && **argv) {
switch (**argv) { switch (*((*argv)++)) {
case 'c': case 'c':
if (extractFlag == TRUE || listFlag == TRUE) if (extractFlag == TRUE || listFlag == TRUE)
goto flagError; goto flagError;
@ -187,29 +185,22 @@ extern int tar_main(int argc, char **argv)
break; break;
case 'O': case 'O':
tostdoutFlag = TRUE; tostdoutFlag = TRUE;
tarName = "-";
break; break;
case 'f': case 'f':
if (--argc == 0) {
fatalError( "Option requires an argument: No file specified\n");
}
if (*tarName != '-') if (*tarName != '-')
fatalError( "Only one 'f' option allowed\n"); fatalError( "Only one 'f' option allowed\n");
tarName = *(++argv); tarName = *(++argv);
if (tarName == NULL) if (tarName == NULL)
fatalError( "Option requires an argument: No file specified\n"); fatalError( "Option requires an argument: No file specified\n");
if (!strcmp(tarName, "-") && createFlag == TRUE)
tostdoutFlag = TRUE;
stopIt=TRUE; stopIt=TRUE;
break; break;
#if defined BB_FEATURE_TAR_EXCLUDE #if defined BB_FEATURE_TAR_EXCLUDE
case 'e': case 'e':
if (strcmp(*argv, "exclude")==0) { if (strcmp(*argv, "exclude")==0) {
if (--argc == 0) {
fatalError( "Option requires an argument: No file specified\n");
}
excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2)); excludeList=xrealloc( excludeList, sizeof(char**) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv); excludeList[excludeListSize] = *(++argv);
if (excludeList[excludeListSize] == NULL)
fatalError( "Option requires an argument: No file specified\n");
/* Remove leading "/"s */ /* Remove leading "/"s */
if (*excludeList[excludeListSize] =='/') if (*excludeList[excludeListSize] =='/')
excludeList[excludeListSize] = (excludeList[excludeListSize])+1; excludeList[excludeListSize] = (excludeList[excludeListSize])+1;
@ -224,7 +215,6 @@ extern int tar_main(int argc, char **argv)
default: default:
usage(tar_usage); usage(tar_usage);
} }
++(*argv);
} }
} }
@ -236,11 +226,12 @@ extern int tar_main(int argc, char **argv)
#ifndef BB_FEATURE_TAR_CREATE #ifndef BB_FEATURE_TAR_CREATE
fatalError( "This version of tar was not compiled with tar creation support.\n"); fatalError( "This version of tar was not compiled with tar creation support.\n");
#else #else
exit(writeTarFile(tarName, tostdoutFlag, verboseFlag, argc, argv, excludeList)); exit(writeTarFile(tarName, verboseFlag, argv, excludeList));
#endif #endif
} }
if (listFlag == TRUE || extractFlag == TRUE) { if (listFlag == TRUE || extractFlag == TRUE) {
exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag, verboseFlag, &argv[optind], excludeList)); exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag,
verboseFlag, argv, excludeList));
} }
flagError: flagError:
@ -967,8 +958,8 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
return( TRUE); return( TRUE);
} }
static int writeTarFile(const char* tarName, int tostdoutFlag, static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
int verboseFlag, int argc, char **argv, char** excludeList) char** excludeList)
{ {
int tarFd=-1; int tarFd=-1;
int errorFlag=FALSE; int errorFlag=FALSE;
@ -977,11 +968,11 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
tbInfo.verboseFlag = verboseFlag; tbInfo.verboseFlag = verboseFlag;
/* Make sure there is at least one file to tar up. */ /* Make sure there is at least one file to tar up. */
if (argc <= 0) if (*argv == NULL)
fatalError("Cowardly refusing to create an empty archive\n"); fatalError("Cowardly refusing to create an empty archive\n");
/* Open the tar file for writing. */ /* Open the tar file for writing. */
if (tostdoutFlag == TRUE) if (!strcmp(tarName, "-"))
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);
@ -1000,7 +991,7 @@ static int writeTarFile(const char* tarName, int tostdoutFlag,
umask(0); umask(0);
/* Read the directory/files and iterate over them one at a time */ /* Read the directory/files and iterate over them one at a time */
while (argc-- > 0) { while (*argv != NULL) {
if (recursiveAction(*argv++, TRUE, FALSE, FALSE, if (recursiveAction(*argv++, TRUE, FALSE, FALSE,
writeFileToTarball, writeFileToTarball, writeFileToTarball, writeFileToTarball,
(void*) &tbInfo) == FALSE) { (void*) &tbInfo) == FALSE) {