- use bb_xchdir instead of ignoring eventual errors of chdir

[oweals/busybox.git] / archival / gunzip.c

diff --git a/archival/gunzip.c b/archival/gunzip.c
index 7d382b895ed7cac6e07997af8c83907d29b88b45..7b939290b4b13e80234aca26a6eddbacc9449689 100644 (file)
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -12,8 +12,8 @@
  * 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,7 +63,6 @@ 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>
@@ -71,37 +70,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(bb_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:
-                       bb_show_usage();        /* exit's inside usage */
-               }
+               opt |= GUNZIP_OPT_STDOUT;
        }
 
        do {
@@ -115,28 +97,26 @@ 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 = 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);
-                       }
+                       xstat(old_path, &stat_buf);
                }
 
                /* 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
                                ("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);
+               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;
 
@@ -170,20 +150,19 @@ extern int gunzip_main(int argc, char **argv)
                /* 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 
+                       } 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) {
                                                bb_error_msg_and_die("Error inflating");
                                        }
-                                       check_trailer_gzip(src_fd);
                                } else {
                                        bb_error_msg_and_die("Invalid magic");
                                }
@@ -196,10 +175,10 @@ 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);
                }