gunzip'ing many files to stdout works now

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

diff --git a/archival/gunzip.c b/archival/gunzip.c
index e47dd3f83d3c1c56eb2f4017f40f7459142b3c6e..83ed5e84af5fe8dd07eb61627ab26c175ae42547 100644 (file)
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -75,7 +75,7 @@ static int gunzip_file (const char *path, int flags)
 {
     FILE *in_file, *out_file;
     struct stat stat_buf;
-    const char *delete_path;
+    const char *delete_path = NULL;
     char *out_path = NULL;
 
     if (path == NULL || strcmp (path, "-") == 0) {
@@ -132,7 +132,8 @@ static int gunzip_file (const char *path, int flags)
     /* do the decompression, and cleanup */
     if (unzip(in_file, out_file) == 0) {
        /* Success, remove .gz file */
-       delete_path = path;
+       if ( !(flags & gunzip_to_stdout ))
+           delete_path = path;
        if (flags & gunzip_verbose) {
            fprintf(stderr, "OK\n");
        }
@@ -141,8 +142,10 @@ static int gunzip_file (const char *path, int flags)
        delete_path = out_path;
     }
 
-    fclose(out_file);
-    fclose(in_file);
+    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) {
@@ -193,10 +196,11 @@ extern int gunzip_main(int argc, char **argv)
        if (optind == argc) {
            if (gunzip_file (NULL, flags) < 0)
                status = EXIT_FAILURE;
-       } else
-           for (i = optind; i < argc; i++)
+       } else {
+           for (i = optind; i < argc; i++) {
                if (gunzip_file (argv[i], flags) < 0)
                    status = EXIT_FAILURE;
-
+           }
+       }
        return status;
 }