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

Use bb_getopt_ulflags, save 150 bytes.

Browse Source
This commit is contained in:
Glenn L McGrath 2004-01-05 12:35:05 +00:00
parent 6cb3bc056c
commit ab7780655b
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
archival/gunzip.c
View File

@ -71,37 +71,20 @@ static char *license_msg[] = {
#include "busybox.h" #include "busybox.h"
#include "unarchive.h" #include "unarchive.h"
const char gunzip_to_stdout = 1; #define GUNZIP_OPT_STDOUT 1
const char gunzip_force = 2; #define GUNZIP_OPT_FORCE 2
const char gunzip_test = 4; #define GUNZIP_OPT_TEST 4
#define GUNZIP_OPT_DECOMPRESS 8
extern int gunzip_main(int argc, char **argv) extern int gunzip_main(int argc, char **argv)
{ {
char status = EXIT_SUCCESS; char status = EXIT_SUCCESS;
char flags = 0; unsigned long opt;
int opt;
opt = bb_getopt_ulflags(argc, argv, "cftd");
/* if called as zcat */ /* if called as zcat */
if (strcmp(bb_applet_name, "zcat") == 0) { if (strcmp(bb_applet_name, "zcat") == 0) {
flags |= gunzip_to_stdout; opt |= GUNZIP_OPT_STDOUT;
}
while ((opt = getopt(argc, argv, "ctfhd")) != -1) {
switch (opt) {
case 'c':
flags |= gunzip_to_stdout;
break;
case 'f':
flags |= gunzip_force;
break;
case 't':
flags |= gunzip_test;
break;
case 'd': /* Used to convert gzip to gunzip. */
break;
default:
bb_show_usage(); /* exit's inside usage */
}
} }
do { do {
@ -116,7 +99,7 @@ extern int gunzip_main(int argc, char **argv)
if (old_path == NULL || strcmp(old_path, "-") == 0) { if (old_path == NULL || strcmp(old_path, "-") == 0) {
src_fd = fileno(stdin); src_fd = fileno(stdin);
flags |= gunzip_to_stdout; opt |= GUNZIP_OPT_STDOUT;
} else { } else {
src_fd = bb_xopen(old_path, O_RDONLY); src_fd = bb_xopen(old_path, O_RDONLY);
@ -127,15 +110,15 @@ extern int gunzip_main(int argc, char **argv)
} }
/* Check that the input is sane. */ /* Check that the input is sane. */
if (isatty(src_fd) && ((flags & gunzip_force) == 0)) { if (isatty(src_fd) && ((opt & GUNZIP_OPT_FORCE) == 0)) {
bb_error_msg_and_die bb_error_msg_and_die
("compressed data not read from terminal. Use -f to force it."); ("compressed data not read from terminal. Use -f to force it.");
} }
/* Set output filename and number */ /* Set output filename and number */
if (flags & gunzip_test) { if (opt & GUNZIP_OPT_TEST) {
dst_fd = bb_xopen("/dev/null", O_WRONLY); /* why does test use filenum 2 ? */ dst_fd = bb_xopen("/dev/null", O_WRONLY); /* why does test use filenum 2 ? */
} else if (flags & gunzip_to_stdout) { } else if (opt & GUNZIP_OPT_STDOUT) {
dst_fd = fileno(stdout); dst_fd = fileno(stdout);
} else { } else {
char *extension; char *extension;