X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fgunzip.c;h=ebbce411240ef415136688816e659830e26f4a37;hb=5d8843e451c01d8abfe6b5be772637310e9e581e;hp=e9963a8d23fa40592efd32c8c846497874d2151a;hpb=bf1cc8b1b7a218a4c2f4bfb23ea44c74b65ebbf6;p=oweals%2Fbusybox.git diff --git a/archival/gunzip.c b/archival/gunzip.c index e9963a8d2..ebbce4112 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -7,13 +7,13 @@ * Originally adjusted for busybox by Sven Rudolph * based on gzip sources * - * Adjusted further by Erik Andersen to support files as + * Adjusted further by Erik Andersen to support files as * well as stdin/stdout, and to generally behave itself wrt command line * handling. * * General cleanup to better adhere to the style guide and make use of standard - * busybox functions by Glenn McGrath - * + * busybox functions by Glenn McGrath + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -40,30 +40,9 @@ * See the file algorithm.doc for the compression algorithms and file formats. */ -#if 0 -static char *license_msg[] = { - " Copyright (C) 1992-1993 Jean-loup Gailly", - " This program is free software; you can redistribute it and/or modify", - " it under the terms of the GNU General Public License as published by", - " the Free Software Foundation; either version 2, or (at your option)", - " any later version.", - "", - " This program is distributed in the hope that it will be useful,", - " but WITHOUT ANY WARRANTY; without even the implied warranty of", - " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", - " GNU General Public License for more details.", - "", - " You should have received a copy of the GNU General Public License", - " along with this program; if not, write to the Free Software", - " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.", - 0 -}; -#endif - #include #include #include -#include #include #include #include @@ -71,37 +50,20 @@ static char *license_msg[] = { #include "busybox.h" #include "unarchive.h" -const char gunzip_to_stdout = 1; -const char gunzip_force = 2; -const char gunzip_test = 4; +#define GUNZIP_OPT_STDOUT 1 +#define GUNZIP_OPT_FORCE 2 +#define GUNZIP_OPT_TEST 4 +#define GUNZIP_OPT_DECOMPRESS 8 -extern int gunzip_main(int argc, char **argv) +int gunzip_main(int argc, char **argv) { char status = EXIT_SUCCESS; - char flags = 0; - int opt; + unsigned long opt; + opt = bb_getopt_ulflags(argc, argv, "cftd"); /* if called as zcat */ - if (strcmp(applet_name, "zcat") == 0) { - flags |= gunzip_to_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: - show_usage(); /* exit's inside usage */ - } + if (strcmp(bb_applet_name, "zcat") == 0) { + opt |= GUNZIP_OPT_STDOUT; } do { @@ -115,32 +77,30 @@ extern int gunzip_main(int argc, char **argv) optind++; if (old_path == NULL || strcmp(old_path, "-") == 0) { - src_fd = fileno(stdin); - flags |= gunzip_to_stdout; + src_fd = STDIN_FILENO; + opt |= GUNZIP_OPT_STDOUT; } else { - src_fd = xopen(old_path, O_RDONLY); + src_fd = bb_xopen(old_path, O_RDONLY); /* Get the time stamp on the input file. */ - if (stat(old_path, &stat_buf) < 0) { - error_msg_and_die("Couldn't stat file %s", old_path); - } + xstat(old_path, &stat_buf); } /* Check that the input is sane. */ - if (isatty(src_fd) && ((flags & gunzip_force) == 0)) { - error_msg_and_die + if (isatty(src_fd) && ((opt & GUNZIP_OPT_FORCE) == 0)) { + bb_error_msg_and_die ("compressed data not read from terminal. Use -f to force it."); } /* Set output filename and number */ - if (flags & gunzip_test) { - dst_fd = xopen("/dev/null", O_WRONLY); /* why does test use filenum 2 ? */ - } else if (flags & gunzip_to_stdout) { - dst_fd = fileno(stdout); + if (opt & GUNZIP_OPT_TEST) { + dst_fd = bb_xopen(bb_dev_null, O_WRONLY); /* why does test use filenum 2 ? */ + } else if (opt & GUNZIP_OPT_STDOUT) { + dst_fd = STDOUT_FILENO; } else { char *extension; - new_path = xstrdup(old_path); + new_path = bb_xstrdup(old_path); extension = strrchr(new_path, '.'); #ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS @@ -154,41 +114,37 @@ extern int gunzip_main(int argc, char **argv) extension[2] = 'a'; extension[3] = 'r'; } else { - error_msg_and_die("Invalid extension"); + bb_error_msg_and_die("Invalid extension"); } - /* Open output file */ - dst_fd = xopen(new_path, O_WRONLY | O_CREAT); - - /* Set permissions on the file */ - chmod(new_path, stat_buf.st_mode); + /* Open output file (with correct permissions) */ + dst_fd = bb_xopen3(new_path, O_WRONLY | O_CREAT, stat_buf.st_mode); /* If unzip succeeds remove the old file */ delete_path = old_path; } /* do the decompression, and cleanup */ - if (xread_char(src_fd) == 0x1f) { + if (bb_xread_char(src_fd) == 0x1f) { unsigned char magic2; - - magic2 = xread_char(src_fd); + + magic2 = bb_xread_char(src_fd); #ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS if (magic2 == 0x9d) { status = uncompress(src_fd, dst_fd); - } else + } else #endif if (magic2 == 0x8b) { check_header_gzip(src_fd); - status = inflate(src_fd, dst_fd); + status = inflate_gunzip(src_fd, dst_fd); if (status != 0) { - error_msg_and_die("Error inflating"); + bb_error_msg_and_die("Error inflating"); } - check_trailer_gzip(src_fd); } else { - error_msg_and_die("Invalid magic"); + bb_error_msg_and_die("Invalid magic"); } } else { - error_msg_and_die("Invalid magic"); + bb_error_msg_and_die("Invalid magic"); } if ((status != EXIT_SUCCESS) && (new_path)) { @@ -196,16 +152,16 @@ extern int gunzip_main(int argc, char **argv) delete_path = new_path; } - if (dst_fd != fileno(stdout)) { + if (dst_fd != STDOUT_FILENO) { close(dst_fd); } - if (src_fd != fileno(stdin)) { + if (src_fd != STDIN_FILENO) { close(src_fd); } /* delete_path will be NULL if in test mode or from stdin */ if (delete_path && (unlink(delete_path) == -1)) { - error_msg_and_die("Couldn't remove %s", delete_path); + bb_error_msg_and_die("Couldn't remove %s", delete_path); } free(new_path);