- patch from Denis Vlasenko to add and use bb_xchdir()
[oweals/busybox.git] / archival / gunzip.c
index c4e84260b20c9c6559003a7fb8c8e91453f9743d..7b939290b4b13e80234aca26a6eddbacc9449689 100644 (file)
@@ -7,13 +7,13 @@
  * Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de>
  * based on gzip sources
  *
- * Adjusted further by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- * to support files as well as stdin/stdout, and to generally behave itself wrt
- * command line handling.
+ * Adjusted further by Erik Andersen <andersen@codepoet.org> 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 <bug1@optushome.com.au>
- * 
+ * busybox functions by Glenn McGrath <bug1@iinet.net.au>
+ *
  * 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
@@ -63,118 +63,133 @@ static char *license_msg[] = {
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <getopt.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include "busybox.h"
+#include "unarchive.h"
+
+#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)
 {
-       FILE *in_file = stdin;
-       FILE *out_file = NULL;
-       struct stat stat_buf;
+       char status = EXIT_SUCCESS;
+       unsigned long opt;
 
-       char *if_name = NULL;
-       char *of_name = NULL;
-       char *delete_file_name = NULL;
+       opt = bb_getopt_ulflags(argc, argv, "cftd");
+       /* if called as zcat */
+       if (strcmp(bb_applet_name, "zcat") == 0) {
+               opt |= GUNZIP_OPT_STDOUT;
+       }
 
-       const int gunzip_to_stdout = 1;
-       const int gunzip_force = 2;
-       const int gunzip_test = 4;
+       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;
 
-       int flags = 0;
-       int opt = 0;
-       int delete_old_file = FALSE;
+               optind++;
 
-       /* if called as zcat */
-       if (strcmp(applet_name, "zcat") == 0)
-               flags |= gunzip_to_stdout;
-
-       while ((opt = getopt(argc, argv, "ctfhdq")) != -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;
-               case 'q':
-                       error_msg("-q option not supported, ignored");
-                       break;
-               case 'h':
-               default:
-                       show_usage(); /* exit's inside usage */
+               if (old_path == NULL || strcmp(old_path, "-") == 0) {
+                       src_fd = STDIN_FILENO;
+                       opt |= GUNZIP_OPT_STDOUT;
+               } else {
+                       src_fd = bb_xopen(old_path, O_RDONLY);
+
+                       /* Get the time stamp on the input file. */
+                       xstat(old_path, &stat_buf);
                }
-       }
 
-       /* Set input filename and number */
-       if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
-               flags |= gunzip_to_stdout;
-       } 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);
+               /* Check that the input is sane.  */
+               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.");
                }
-       }
 
-       /* 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;
+               /* Set output filename and number */
+               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 {
-                       error_msg_and_die("Invalid extension");
+                       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;
                }
-               of_name = (char *) xcalloc(sizeof(char), length + 1);
-               strncpy(of_name, if_name, length);
 
-               /* Open output file */
-               out_file = xfopen(of_name, "w");
+               /* do the decompression, and cleanup */
+               if (bb_xread_char(src_fd) == 0x1f) {
+                       unsigned char magic2;
 
-               /* Set permissions on the file */
-               chmod(of_name, stat_buf.st_mode);
-       }
+                       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");
+               }
 
-       /* 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;
-       }
+               if ((status != EXIT_SUCCESS) && (new_path)) {
+                       /* Unzip failed, remove new path instead of old path */
+                       delete_path = new_path;
+               }
 
-       fclose(out_file);
-       fclose(in_file);
+               if (dst_fd != STDOUT_FILENO) {
+                       close(dst_fd);
+               }
+               if (src_fd != STDIN_FILENO) {
+                       close(src_fd);
+               }
 
-       if (delete_old_file == TRUE) {
-               if (unlink(delete_file_name) < 0) {
-                       error_msg_and_die("Couldnt remove %s", delete_file_name);
+               /* 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(of_name);
+               free(new_path);
+
+       } while (optind < argc);
 
-       return(EXIT_SUCCESS);
+       return status;
 }