X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fgunzip.c;h=f229ae5245ad41febb4bceb60d739b167abf182f;hb=56f16b42c93af18fbb984e8d6384c03e5405e3ae;hp=83ed5e84af5fe8dd07eb61627ab26c175ae42547;hpb=7ac868460a90e1de4a2f45229f22f1cd07370c05;p=oweals%2Fbusybox.git diff --git a/archival/gunzip.c b/archival/gunzip.c index 83ed5e84a..f229ae524 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -7,7 +7,7 @@ * 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. * @@ -64,111 +64,29 @@ static char *license_msg[] = { #include #include #include -#include "busybox.h" - -const int gunzip_to_stdout = 1; -const int gunzip_force = 2; -const int gunzip_test = 4; -const int gunzip_verbose = 8; - -static int gunzip_file (const char *path, int flags) -{ - FILE *in_file, *out_file; - struct stat stat_buf; - const char *delete_path = NULL; - char *out_path = NULL; - - if (path == NULL || strcmp (path, "-") == 0) { - in_file = stdin; - flags |= gunzip_to_stdout; - } else { - if ((in_file = wfopen(path, "r")) == NULL) - return -1; - - if (flags & gunzip_verbose) { - fprintf(stderr, "%s:\t", path); - } - - /* set the buffer size */ - setvbuf(in_file, NULL, _IOFBF, 0x8000); +#include +#include +#include - /* Get the time stamp on the input file. */ - if (stat(path, &stat_buf) < 0) { - error_msg_and_die("Couldn't stat file %s", path); - } - } - - /* Check that the input is sane. */ - if (isatty(fileno(in_file)) && (flags & gunzip_force) == 0) - error_msg_and_die("compressed data not read from terminal. Use -f to force it."); - - /* Set output filename and number */ - if (flags & gunzip_test) { - out_file = xfopen("/dev/null", "w"); /* why does test use filenum 2 ? */ - } else if (flags & gunzip_to_stdout) { - out_file = stdout; - } else { - char *extension; - int length = strlen(path); - - extension = strrchr(path, '.'); - if (extension && strcmp(extension, ".gz") == 0) { - length -= 3; - } else if (extension && strcmp(extension, ".tgz") == 0) { - length -= 4; - } else { - error_msg_and_die("Invalid extension"); - } - out_path = (char *) xcalloc(sizeof(char), length + 1); - strncpy(out_path, path, length); - - /* Open output file */ - out_file = xfopen(out_path, "w"); - - /* Set permissions on the file */ - chmod(out_path, stat_buf.st_mode); - } - - /* do the decompression, and cleanup */ - if (unzip(in_file, out_file) == 0) { - /* Success, remove .gz file */ - if ( !(flags & gunzip_to_stdout )) - delete_path = path; - if (flags & gunzip_verbose) { - fprintf(stderr, "OK\n"); - } - } else { - /* remove failed attempt */ - delete_path = out_path; - } - - if (out_file != stdout) - fclose(out_file); - if (in_file != stdin) - fclose(in_file); - - if (delete_path && !(flags & gunzip_test)) { - if (unlink(delete_path) < 0) { - error_msg_and_die("Couldn't remove %s", delete_path); - } - } - - free(out_path); +#include "busybox.h" +#include "unarchive.h" - return 0; -} +const char gunzip_to_stdout = 1; +const char gunzip_force = 2; +const char gunzip_test = 4; extern int gunzip_main(int argc, char **argv) { - int flags = 0; - int i, opt; - int status = EXIT_SUCCESS; + char status = EXIT_SUCCESS; + char flags = 0; + int opt; /* if called as zcat */ - if (strcmp(applet_name, "zcat") == 0) + if (strcmp(bb_applet_name, "zcat") == 0) { flags |= gunzip_to_stdout; + } - while ((opt = getopt(argc, argv, "ctfhdqv")) != -1) { + while ((opt = getopt(argc, argv, "ctfhd")) != -1) { switch (opt) { case 'c': flags |= gunzip_to_stdout; @@ -179,28 +97,119 @@ extern int gunzip_main(int argc, char **argv) case 't': flags |= gunzip_test; break; - case 'v': - flags |= gunzip_verbose; - break; - case 'd': /* Used to convert gzip to gunzip. */ + case 'd': /* Used to convert gzip to gunzip. */ break; - case 'q': - error_msg("-q option not supported, ignored"); - break; - case 'h': default: - show_usage(); /* exit's inside usage */ + bb_show_usage(); /* exit's inside usage */ } } - if (optind == argc) { - if (gunzip_file (NULL, flags) < 0) - status = EXIT_FAILURE; - } else { - for (i = optind; i < argc; i++) { - if (gunzip_file (argv[i], flags) < 0) - status = EXIT_FAILURE; - } - } + do { + struct stat stat_buf; + const char *old_path = argv[optind]; + const char *delete_path = NULL; + char *new_path = NULL; + int src_fd; + int dst_fd; + + optind++; + + if (old_path == NULL || strcmp(old_path, "-") == 0) { + src_fd = fileno(stdin); + flags |= gunzip_to_stdout; + } else { + src_fd = bb_xopen(old_path, O_RDONLY); + + /* Get the time stamp on the input file. */ + if (stat(old_path, &stat_buf) < 0) { + bb_error_msg_and_die("Couldn't stat file %s", old_path); + } + } + + /* Check that the input is sane. */ + if (isatty(src_fd) && ((flags & gunzip_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 = bb_xopen("/dev/null", O_WRONLY); /* why does test use filenum 2 ? */ + } else if (flags & gunzip_to_stdout) { + dst_fd = fileno(stdout); + } else { + char *extension; + + new_path = bb_xstrdup(old_path); + + extension = strrchr(new_path, '.'); +#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS + if (extension && (strcmp(extension, ".Z") == 0)) { + *extension = '\0'; + } else +#endif + if (extension && (strcmp(extension, ".gz") == 0)) { + *extension = '\0'; + } else if (extension && (strcmp(extension, ".tgz") == 0)) { + extension[2] = 'a'; + extension[3] = 'r'; + } else { + bb_error_msg_and_die("Invalid extension"); + } + + /* Open output file */ + dst_fd = bb_xopen(new_path, O_WRONLY | O_CREAT); + + /* Set permissions on the file */ + chmod(new_path, stat_buf.st_mode); + + /* If unzip succeeds remove the old file */ + delete_path = old_path; + } + + /* do the decompression, and cleanup */ + if (bb_xread_char(src_fd) == 0x1f) { + unsigned char magic2; + + magic2 = bb_xread_char(src_fd); +#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS + if (magic2 == 0x9d) { + status = uncompress(src_fd, dst_fd); + } else +#endif + if (magic2 == 0x8b) { + check_header_gzip(src_fd); + status = inflate_gunzip(src_fd, dst_fd); + if (status != 0) { + bb_error_msg_and_die("Error inflating"); + } + } else { + bb_error_msg_and_die("Invalid magic"); + } + } else { + bb_error_msg_and_die("Invalid magic"); + } + + if ((status != EXIT_SUCCESS) && (new_path)) { + /* Unzip failed, remove new path instead of old path */ + delete_path = new_path; + } + + if (dst_fd != fileno(stdout)) { + close(dst_fd); + } + if (src_fd != fileno(stdin)) { + close(src_fd); + } + + /* delete_path will be NULL if in test mode or from stdin */ + if (delete_path && (unlink(delete_path) == -1)) { + bb_error_msg_and_die("Couldn't remove %s", delete_path); + } + + free(new_path); + + } while (optind < argc); + return status; }