Use getopt (or getopt_long).
This commit is contained in:
Matt Kraai
parent
8f8dab94e5
commit
3b3f5c364a
@ -182,6 +182,13 @@ extern int tar_unzip_init(int tarFd)
|
||||
}
|
||||
#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)
|
||||
{
|
||||
char** excludeList=NULL;
|
||||
@ -189,7 +196,6 @@ extern int tar_main(int argc, char **argv)
|
||||
const char *tarName="-";
|
||||
#if defined BB_FEATURE_TAR_EXCLUDE
|
||||
int excludeListSize=0;
|
||||
char *excludeFileName ="-";
|
||||
FILE *fileList;
|
||||
char file[256];
|
||||
#endif
|
||||
@ -202,17 +208,26 @@ extern int tar_main(int argc, char **argv)
|
||||
int verboseFlag = FALSE;
|
||||
int tostdoutFlag = FALSE;
|
||||
int status = FALSE;
|
||||
int firstOpt = TRUE;
|
||||
int stopIt;
|
||||
int opt;
|
||||
|
||||
if (argc <= 1)
|
||||
usage(tar_usage);
|
||||
|
||||
while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) {
|
||||
firstOpt=FALSE;
|
||||
stopIt=FALSE;
|
||||
while (stopIt==FALSE && **argv) {
|
||||
switch (*((*argv)++)) {
|
||||
if (argv[1][0] != '-') {
|
||||
char *tmp = xmalloc(strlen(argv[1]) + 2);
|
||||
tmp[0] = '-';
|
||||
strcpy(tmp + 1, argv[1]);
|
||||
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':
|
||||
if (extractFlag == TRUE || listFlag == TRUE)
|
||||
goto flagError;
|
||||
@ -242,33 +257,17 @@ extern int tar_main(int argc, char **argv)
|
||||
case 'f':
|
||||
if (*tarName != '-')
|
||||
error_msg_and_die( "Only one 'f' option allowed\n");
|
||||
tarName = *(++argv);
|
||||
if (tarName == NULL)
|
||||
error_msg_and_die( "Option requires an argument: No file specified\n");
|
||||
stopIt=TRUE;
|
||||
tarName = optarg;
|
||||
break;
|
||||
#if defined BB_FEATURE_TAR_EXCLUDE
|
||||
case 'e':
|
||||
if (strcmp(*argv, "xclude")==0) {
|
||||
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");
|
||||
excludeList[excludeListSize] = optarg;
|
||||
/* Tack a NULL onto the end of the list */
|
||||
excludeList[++excludeListSize] = NULL;
|
||||
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");
|
||||
fileList = xfopen(optarg, "r");
|
||||
while (fgets(file, sizeof(file), fileList) != NULL) {
|
||||
excludeList = xrealloc(excludeList,
|
||||
sizeof(char *) * (excludeListSize+2));
|
||||
@ -279,16 +278,12 @@ extern int tar_main(int argc, char **argv)
|
||||
excludeList[++excludeListSize] = NULL;
|
||||
}
|
||||
fclose(fileList);
|
||||
stopIt=TRUE;
|
||||
break;
|
||||
#endif
|
||||
case '-':
|
||||
break;
|
||||
default:
|
||||
usage(tar_usage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* 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)
|
||||
error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n");
|
||||
#endif
|
||||
status = writeTarFile(tarName, verboseFlag, argv, excludeList);
|
||||
status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList);
|
||||
#endif
|
||||
}
|
||||
if (listFlag == TRUE || extractFlag == TRUE) {
|
||||
int tarFd;
|
||||
if (*argv)
|
||||
extractList = argv;
|
||||
if (argv[optind])
|
||||
extractList = argv + optind;
|
||||
/* Open the tar file for reading. */
|
||||
if (!strcmp(tarName, "-"))
|
||||
tarFd = fileno(stdin);
|
||||
|
||||
63
tar.c
63
tar.c
@ -182,6 +182,13 @@ extern int tar_unzip_init(int tarFd)
|
||||
}
|
||||
#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)
|
||||
{
|
||||
char** excludeList=NULL;
|
||||
@ -189,7 +196,6 @@ extern int tar_main(int argc, char **argv)
|
||||
const char *tarName="-";
|
||||
#if defined BB_FEATURE_TAR_EXCLUDE
|
||||
int excludeListSize=0;
|
||||
char *excludeFileName ="-";
|
||||
FILE *fileList;
|
||||
char file[256];
|
||||
#endif
|
||||
@ -202,17 +208,26 @@ extern int tar_main(int argc, char **argv)
|
||||
int verboseFlag = FALSE;
|
||||
int tostdoutFlag = FALSE;
|
||||
int status = FALSE;
|
||||
int firstOpt = TRUE;
|
||||
int stopIt;
|
||||
int opt;
|
||||
|
||||
if (argc <= 1)
|
||||
usage(tar_usage);
|
||||
|
||||
while (*(++argv) && (**argv == '-' || firstOpt == TRUE)) {
|
||||
firstOpt=FALSE;
|
||||
stopIt=FALSE;
|
||||
while (stopIt==FALSE && **argv) {
|
||||
switch (*((*argv)++)) {
|
||||
if (argv[1][0] != '-') {
|
||||
char *tmp = xmalloc(strlen(argv[1]) + 2);
|
||||
tmp[0] = '-';
|
||||
strcpy(tmp + 1, argv[1]);
|
||||
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':
|
||||
if (extractFlag == TRUE || listFlag == TRUE)
|
||||
goto flagError;
|
||||
@ -242,33 +257,17 @@ extern int tar_main(int argc, char **argv)
|
||||
case 'f':
|
||||
if (*tarName != '-')
|
||||
error_msg_and_die( "Only one 'f' option allowed\n");
|
||||
tarName = *(++argv);
|
||||
if (tarName == NULL)
|
||||
error_msg_and_die( "Option requires an argument: No file specified\n");
|
||||
stopIt=TRUE;
|
||||
tarName = optarg;
|
||||
break;
|
||||
#if defined BB_FEATURE_TAR_EXCLUDE
|
||||
case 'e':
|
||||
if (strcmp(*argv, "xclude")==0) {
|
||||
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");
|
||||
excludeList[excludeListSize] = optarg;
|
||||
/* Tack a NULL onto the end of the list */
|
||||
excludeList[++excludeListSize] = NULL;
|
||||
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");
|
||||
fileList = xfopen(optarg, "r");
|
||||
while (fgets(file, sizeof(file), fileList) != NULL) {
|
||||
excludeList = xrealloc(excludeList,
|
||||
sizeof(char *) * (excludeListSize+2));
|
||||
@ -279,16 +278,12 @@ extern int tar_main(int argc, char **argv)
|
||||
excludeList[++excludeListSize] = NULL;
|
||||
}
|
||||
fclose(fileList);
|
||||
stopIt=TRUE;
|
||||
break;
|
||||
#endif
|
||||
case '-':
|
||||
break;
|
||||
default:
|
||||
usage(tar_usage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* 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)
|
||||
error_msg_and_die("Creation of compressed not internally support by tar, pipe to busybox gunzip\n");
|
||||
#endif
|
||||
status = writeTarFile(tarName, verboseFlag, argv, excludeList);
|
||||
status = writeTarFile(tarName, verboseFlag, argv + optind, excludeList);
|
||||
#endif
|
||||
}
|
||||
if (listFlag == TRUE || extractFlag == TRUE) {
|
||||
int tarFd;
|
||||
if (*argv)
|
||||
extractList = argv;
|
||||
if (argv[optind])
|
||||
extractList = argv + optind;
|
||||
/* Open the tar file for reading. */
|
||||
if (!strcmp(tarName, "-"))
|
||||
tarFd = fileno(stdin);
|
||||
|
||||
@ -1711,7 +1711,7 @@ FILE *wfopen(const char *path, const char *mode)
|
||||
#endif
|
||||
|
||||
#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
|
||||
FILE *xfopen(const char *path, const char *mode)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user