X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fgunzip.c;h=f229ae5245ad41febb4bceb60d739b167abf182f;hb=56f16b42c93af18fbb984e8d6384c03e5405e3ae;hp=b4edb25ac19fb502fcf727919bf7673406c11b54;hpb=53265546a69d5810d5e19b22d6a5095f04eca6be;p=oweals%2Fbusybox.git diff --git a/archival/gunzip.c b/archival/gunzip.c index b4edb25ac..f229ae524 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -7,9 +7,9 @@ * Originally adjusted for busybox by Sven Rudolph * based on gzip sources * - * Adjusted further by Erik Andersen , - * to support files as well as stdin/stdout, and to generally behave itself wrt - * command line handling. + * 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 @@ -64,32 +64,27 @@ static char *license_msg[] = { #include #include #include +#include +#include +#include + #include "busybox.h" -#define BB_DECLARE_EXTERN -#define bb_need_memory_exhausted -#define bb_need_name_too_long -#include "messages.c" +#include "unarchive.h" + +const char gunzip_to_stdout = 1; +const char gunzip_force = 2; +const char gunzip_test = 4; extern int gunzip_main(int argc, char **argv) { - FILE *in_file, *out_file; - struct stat stat_buf; - - char *if_name = NULL; - char *of_name = NULL; - char *delete_file_name = NULL; - - const int gunzip_to_stdout = 1; - const int gunzip_force = 2; - const int gunzip_test = 4; - - int flags = 0; - int opt = 0; - int delete_old_file = FALSE; + 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, "ctfhd")) != -1) { switch (opt) { @@ -102,80 +97,119 @@ extern int gunzip_main(int argc, char **argv) case 't': flags |= gunzip_test; break; - case 'd': /* Used to convert gzip to gunzip. */ + case 'd': /* Used to convert gzip to gunzip. */ break; - case 'h': default: - show_usage(); /* exit's inside usage */ + bb_show_usage(); /* exit's inside usage */ } } - /* Set input filename and number */ - if (argv[optind] == NULL) { - flags |= gunzip_to_stdout; - in_file = stdin; - } else { - if_name = strdup(argv[optind]); - /* Open input file */ - in_file = xfopen(if_name, "r"); - - /* Get the time stamp on the input file. */ - if (stat(if_name, &stat_buf) < 0) { - error_msg_and_die("Couldn't stat file %s", if_name); - } - } + 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++; - /* 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(if_name); - - delete_old_file = TRUE; - extension = strrchr(if_name, '.'); - if (extension && strcmp(extension, ".gz") == 0) { - length -= 3; - } else if (extension && strcmp(extension, ".tgz") == 0) { - length -= 4; + if (old_path == NULL || strcmp(old_path, "-") == 0) { + src_fd = fileno(stdin); + flags |= gunzip_to_stdout; } else { - error_msg_and_die("Invalid extension"); + 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); + } } - of_name = (char *) xcalloc(sizeof(char), length + 1); - strncpy(of_name, if_name, length); - /* Open output file */ - out_file = xfopen(of_name, "w"); + /* 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 permissions on the file */ - chmod(of_name, stat_buf.st_mode); - } + /* 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; - /* do the decompression, and cleanup */ - if (unzip(in_file, out_file) == 0) { - /* Success, remove .gz file */ - delete_file_name = if_name; - } else { - /* remove failed attempt */ - delete_file_name = of_name; - } + new_path = bb_xstrdup(old_path); - fclose(out_file); - fclose(in_file); + 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; + } - if (delete_old_file == TRUE) { - if (unlink(delete_file_name) < 0) { - error_msg_and_die("Couldnt remove %s", delete_file_name); + /* 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"); } - } - free(of_name); + 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(EXIT_SUCCESS); + return status; }