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

Use getopt (or getopt_long).

Browse Source
This commit is contained in:
Matt Kraai 2001-01-22 20:49:00 +00:00
parent 8f8dab94e5
commit 3b3f5c364a
3 changed files with 153 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
archival/tar.c
View File

@ -182,6 +182,13 @@ extern int tar_unzip_init(int tarFd)
} }
#endif #endif
#if defined BB_FEATURE_TAR_EXCLUDE
struct option longopts[] = {
{ "exclude", 1, NULL, 'e' },
{ NULL, 0, NULL, 0 }
};
#endif
extern int tar_main(int argc, char **argv) extern int tar_main(int argc, char **argv)
{ {
char** excludeList=NULL; char** excludeList=NULL;
@ -189,7 +196,6 @@ extern int tar_main(int argc, char **argv)
const char *tarName="-"; const char *tarName="-";
#if defined BB_FEATURE_TAR_EXCLUDE #if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0; int excludeListSize=0;
char *excludeFileName ="-";
FILE *fileList; FILE *fileList;
char file[256]; char file[256];
#endif #endif
@ -202,17 +208,26 @@ extern int tar_main(int argc, char **argv)
int verboseFlag = FALSE; int verboseFlag = FALSE;
int tostdoutFlag = FALSE; int tostdoutFlag = FALSE;
int status = FALSE; int status = FALSE;
int firstOpt = TRUE; int opt;
int stopIt;
if (argc <= 1) if (argc <= 1)
usage(tar_usage); usage(tar_usage);
while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) { if (argv[1][0] != '-') {
firstOpt=FALSE; char *tmp = xmalloc(strlen(argv[1]) + 2);
stopIt=FALSE; tmp[0] = '-';
while (stopIt==FALSE && **argv) { strcpy(tmp + 1, argv[1]);
switch (*((*argv)++)) { argv[1] = tmp;
}
while (
#ifndef BB_FEATURE_TAR_EXCLUDE
(opt = getopt(argc, argv, "cxtzvOf:"))
#else
(opt = getopt_long(argc, argv, "cxtzvOf:X:", longopts, NULL))
#endif
> 0) {
switch (opt) {
case 'c': case 'c':
if (extractFlag == TRUE || listFlag == TRUE) if (extractFlag == TRUE || listFlag == TRUE)
goto flagError; goto flagError;
@ -242,33 +257,17 @@ extern int tar_main(int argc, char **argv)
case 'f': case 'f':
if (*tarName != '-') if (*tarName != '-')
error_msg_and_die( "Only one 'f' option allowed\n"); error_msg_and_die( "Only one 'f' option allowed\n");
tarName = *(++argv); tarName = optarg;
if (tarName == NULL)
error_msg_and_die( "Option requires an argument: No file specified\n");
stopIt=TRUE;
break; break;
#if defined BB_FEATURE_TAR_EXCLUDE #if defined BB_FEATURE_TAR_EXCLUDE
case 'e': case 'e':
if (strcmp(*argv, "xclude")==0) {
excludeList=xrealloc( excludeList, excludeList=xrealloc( excludeList,
sizeof(char *) * (excludeListSize+2)); sizeof(char *) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv); excludeList[excludeListSize] = optarg;
if (excludeList[excludeListSize] == NULL)
error_msg_and_die( "Option requires an argument: No file specified\n");
/* Tack a NULL onto the end of the list */ /* Tack a NULL onto the end of the list */
excludeList[++excludeListSize] = NULL; excludeList[++excludeListSize] = NULL;
stopIt=TRUE;
break;
}
case 'X': case 'X':
if (*excludeFileName != '-') fileList = xfopen(optarg, "r");
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) { while (fgets(file, sizeof(file), fileList) != NULL) {
excludeList = xrealloc(excludeList, excludeList = xrealloc(excludeList,
sizeof(char *) * (excludeListSize+2)); sizeof(char *) * (excludeListSize+2));
@ -279,16 +278,12 @@ extern int tar_main(int argc, char **argv)
excludeList[++excludeListSize] = NULL; excludeList[++excludeListSize] = NULL;
} }
fclose(fileList); fclose(fileList);
stopIt=TRUE;
break; break;
#endif #endif
case '-':
break;
default: default:
usage(tar_usage); usage(tar_usage);
} }
} }
}
/* /*
* Do the correct type of action supplying the rest of the * Do the correct type of action supplying the rest of the
@ -302,13 +297,13 @@ extern int tar_main(int argc, char **argv)
if (unzipFlag==TRUE) if (unzipFlag==TRUE)
error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n"); error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n");
#endif #endif
status = writeTarFile(tarName, verboseFlag, argv, excludeList); status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList);
#endif #endif
} }
if (listFlag == TRUE || extractFlag == TRUE) { if (listFlag == TRUE || extractFlag == TRUE) {
int tarFd; int tarFd;
if (*argv) if (argv[optind])
extractList = argv; extractList = argv + optind;
/* Open the tar file for reading. */ /* Open the tar file for reading. */
if (!strcmp(tarName, "-")) if (!strcmp(tarName, "-"))
tarFd = fileno(stdin); tarFd = fileno(stdin);

63
tar.c
View File

@ -182,6 +182,13 @@ extern int tar_unzip_init(int tarFd)
} }
#endif #endif
#if defined BB_FEATURE_TAR_EXCLUDE
struct option longopts[] = {
{ "exclude", 1, NULL, 'e' },
{ NULL, 0, NULL, 0 }
};
#endif
extern int tar_main(int argc, char **argv) extern int tar_main(int argc, char **argv)
{ {
char** excludeList=NULL; char** excludeList=NULL;
@ -189,7 +196,6 @@ extern int tar_main(int argc, char **argv)
const char *tarName="-"; const char *tarName="-";
#if defined BB_FEATURE_TAR_EXCLUDE #if defined BB_FEATURE_TAR_EXCLUDE
int excludeListSize=0; int excludeListSize=0;
char *excludeFileName ="-";
FILE *fileList; FILE *fileList;
char file[256]; char file[256];
#endif #endif
@ -202,17 +208,26 @@ extern int tar_main(int argc, char **argv)
int verboseFlag = FALSE; int verboseFlag = FALSE;
int tostdoutFlag = FALSE; int tostdoutFlag = FALSE;
int status = FALSE; int status = FALSE;
int firstOpt = TRUE; int opt;
int stopIt;
if (argc <= 1) if (argc <= 1)
usage(tar_usage); usage(tar_usage);
while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) { if (argv[1][0] != '-') {
firstOpt=FALSE; char *tmp = xmalloc(strlen(argv[1]) + 2);
stopIt=FALSE; tmp[0] = '-';
while (stopIt==FALSE && **argv) { strcpy(tmp + 1, argv[1]);
switch (*((*argv)++)) { argv[1] = tmp;
}
while (
#ifndef BB_FEATURE_TAR_EXCLUDE
(opt = getopt(argc, argv, "cxtzvOf:"))
#else
(opt = getopt_long(argc, argv, "cxtzvOf:X:", longopts, NULL))
#endif
> 0) {
switch (opt) {
case 'c': case 'c':
if (extractFlag == TRUE || listFlag == TRUE) if (extractFlag == TRUE || listFlag == TRUE)
goto flagError; goto flagError;
@ -242,33 +257,17 @@ extern int tar_main(int argc, char **argv)
case 'f': case 'f':
if (*tarName != '-') if (*tarName != '-')
error_msg_and_die( "Only one 'f' option allowed\n"); error_msg_and_die( "Only one 'f' option allowed\n");
tarName = *(++argv); tarName = optarg;
if (tarName == NULL)
error_msg_and_die( "Option requires an argument: No file specified\n");
stopIt=TRUE;
break; break;
#if defined BB_FEATURE_TAR_EXCLUDE #if defined BB_FEATURE_TAR_EXCLUDE
case 'e': case 'e':
if (strcmp(*argv, "xclude")==0) {
excludeList=xrealloc( excludeList, excludeList=xrealloc( excludeList,
sizeof(char *) * (excludeListSize+2)); sizeof(char *) * (excludeListSize+2));
excludeList[excludeListSize] = *(++argv); excludeList[excludeListSize] = optarg;
if (excludeList[excludeListSize] == NULL)
error_msg_and_die( "Option requires an argument: No file specified\n");
/* Tack a NULL onto the end of the list */ /* Tack a NULL onto the end of the list */
excludeList[++excludeListSize] = NULL; excludeList[++excludeListSize] = NULL;
stopIt=TRUE;
break;
}
case 'X': case 'X':
if (*excludeFileName != '-') fileList = xfopen(optarg, "r");
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) { while (fgets(file, sizeof(file), fileList) != NULL) {
excludeList = xrealloc(excludeList, excludeList = xrealloc(excludeList,
sizeof(char *) * (excludeListSize+2)); sizeof(char *) * (excludeListSize+2));
@ -279,16 +278,12 @@ extern int tar_main(int argc, char **argv)
excludeList[++excludeListSize] = NULL; excludeList[++excludeListSize] = NULL;
} }
fclose(fileList); fclose(fileList);
stopIt=TRUE;
break; break;
#endif #endif
case '-':
break;
default: default:
usage(tar_usage); usage(tar_usage);
} }
} }
}
/* /*
* Do the correct type of action supplying the rest of the * Do the correct type of action supplying the rest of the
@ -302,13 +297,13 @@ extern int tar_main(int argc, char **argv)
if (unzipFlag==TRUE) if (unzipFlag==TRUE)
error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n"); error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n");
#endif #endif
status = writeTarFile(tarName, verboseFlag, argv, excludeList); status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList);
#endif #endif
} }
if (listFlag == TRUE || extractFlag == TRUE) { if (listFlag == TRUE || extractFlag == TRUE) {
int tarFd; int tarFd;
if (*argv) if (argv[optind])
extractList = argv; extractList = argv + optind;
/* Open the tar file for reading. */ /* Open the tar file for reading. */
if (!strcmp(tarName, "-")) if (!strcmp(tarName, "-"))
tarFd = fileno(stdin); tarFd = fileno(stdin);

2
utility.c
View File

@ -1711,7 +1711,7 @@ FILE *wfopen(const char *path, const char *mode)
#endif #endif
#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE \ #if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE \
|| defined BB_SED || defined BB_SH || defined BB_UNIQ \ || defined BB_SED || defined BB_SH || defined BB_TAR || defined BB_UNIQ \
|| defined BB_WC || defined BB_CMP || defined BB_WC || defined BB_CMP
FILE *xfopen(const char *path, const char *mode) FILE *xfopen(const char *path, const char *mode)
{ {