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

Eliminate spurious warning, convert to getopt, and eliminate redundant check.

Browse Source
This commit is contained in:
Matt Kraai 2001-04-18 16:05:34 +00:00
parent 96dcd19b8a
commit 53265546a6
4 changed files with 46 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/gunzip.c
View File

@ -91,7 +91,7 @@ extern int gunzip_main(int argc, char **argv)
if (strcmp(applet_name, "zcat") == 0) if (strcmp(applet_name, "zcat") == 0)
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
while ((opt = getopt(argc, argv, "ctfh")) != -1) { while ((opt = getopt(argc, argv, "ctfhd")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
@ -102,6 +102,8 @@ extern int gunzip_main(int argc, char **argv)
case 't': case 't':
flags |= gunzip_test; flags |= gunzip_test;
break; break;
case 'd': /* Used to convert gzip to gunzip. */
break;
case 'h': case 'h':
default: default:
show_usage(); /* exit's inside usage */ show_usage(); /* exit's inside usage */

24
archival/gzip.c
View File

@ -1900,14 +1900,10 @@ int gzip_main(int argc, char **argv)
int tostdout = 0; int tostdout = 0;
int fromstdin = 0; int fromstdin = 0;
int force = 0; int force = 0;
int opt;
/* Parse any options */ while ((opt = getopt(argc, argv, "cf123456789d")) != -1) {
while (--argc > 0 && **(++argv) == '-') { switch (opt) {
if (*((*argv) + 1) == '\0') {
tostdout = 1;
}
while (*(++(*argv))) {
switch (**argv) {
case 'c': case 'c':
tostdout = 1; tostdout = 1;
break; break;
@ -1920,22 +1916,20 @@ int gzip_main(int argc, char **argv)
break; break;
#ifdef BB_GUNZIP #ifdef BB_GUNZIP
case 'd': case 'd':
exit(gunzip_main(argc, argv)); optind = 1;
return gunzip_main(argc, argv);
#endif #endif
default: default:
show_usage(); show_usage();
} }
} }
} if (optind == argc) {
if (argc <= 0 ) {
fromstdin = 1; fromstdin = 1;
tostdout = 1; tostdout = 1;
} }
if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
error_msg_and_die( "data not read from terminal. Use -f to force it.");
if (isatty(fileno(stdout)) && tostdout==1 && force==0) if (isatty(fileno(stdout)) && tostdout==1 && force==0)
error_msg_and_die( "data not written to terminal. Use -f to force it."); error_msg_and_die( "compressed data not written to terminal. Use -f to force it.");
foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
if (foreground) { if (foreground) {
@ -1975,9 +1969,7 @@ int gzip_main(int argc, char **argv)
ifile_size = -1L; /* convention for unknown size */ ifile_size = -1L; /* convention for unknown size */
} else { } else {
/* Open up the input file */ /* Open up the input file */
if (argc <= 0) strncpy(ifname, argv[optind], MAX_PATH_LEN);
show_usage();
strncpy(ifname, *argv, MAX_PATH_LEN);
/* Open input file */ /* Open input file */
inFileNum = open(ifname, O_RDONLY); inFileNum = open(ifname, O_RDONLY);

4
gunzip.c
View File

@ -91,7 +91,7 @@ extern int gunzip_main(int argc, char **argv)
if (strcmp(applet_name, "zcat") == 0) if (strcmp(applet_name, "zcat") == 0)
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
while ((opt = getopt(argc, argv, "ctfh")) != -1) { while ((opt = getopt(argc, argv, "ctfhd")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
@ -102,6 +102,8 @@ extern int gunzip_main(int argc, char **argv)
case 't': case 't':
flags |= gunzip_test; flags |= gunzip_test;
break; break;
case 'd': /* Used to convert gzip to gunzip. */
break;
case 'h': case 'h':
default: default:
show_usage(); /* exit's inside usage */ show_usage(); /* exit's inside usage */

24
gzip.c
View File

@ -1900,14 +1900,10 @@ int gzip_main(int argc, char **argv)
int tostdout = 0; int tostdout = 0;
int fromstdin = 0; int fromstdin = 0;
int force = 0; int force = 0;
int opt;
/* Parse any options */ while ((opt = getopt(argc, argv, "cf123456789d")) != -1) {
while (--argc > 0 && **(++argv) == '-') { switch (opt) {
if (*((*argv) + 1) == '\0') {
tostdout = 1;
}
while (*(++(*argv))) {
switch (**argv) {
case 'c': case 'c':
tostdout = 1; tostdout = 1;
break; break;
@ -1920,22 +1916,20 @@ int gzip_main(int argc, char **argv)
break; break;
#ifdef BB_GUNZIP #ifdef BB_GUNZIP
case 'd': case 'd':
exit(gunzip_main(argc, argv)); optind = 1;
return gunzip_main(argc, argv);
#endif #endif
default: default:
show_usage(); show_usage();
} }
} }
} if (optind == argc) {
if (argc <= 0 ) {
fromstdin = 1; fromstdin = 1;
tostdout = 1; tostdout = 1;
} }
if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
error_msg_and_die( "data not read from terminal. Use -f to force it.");
if (isatty(fileno(stdout)) && tostdout==1 && force==0) if (isatty(fileno(stdout)) && tostdout==1 && force==0)
error_msg_and_die( "data not written to terminal. Use -f to force it."); error_msg_and_die( "compressed data not written to terminal. Use -f to force it.");
foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
if (foreground) { if (foreground) {
@ -1975,9 +1969,7 @@ int gzip_main(int argc, char **argv)
ifile_size = -1L; /* convention for unknown size */ ifile_size = -1L; /* convention for unknown size */
} else { } else {
/* Open up the input file */ /* Open up the input file */
if (argc <= 0) strncpy(ifname, argv[optind], MAX_PATH_LEN);
show_usage();
strncpy(ifname, *argv, MAX_PATH_LEN);
/* Open input file */ /* Open input file */
inFileNum = open(ifname, O_RDONLY); inFileNum = open(ifname, O_RDONLY);