Imported Debian patch 1.3.2-3woody4

[gzip] / gzip.c

diff --git a/gzip.c b/gzip.c
index b18a0a9103a90c2813fa3261a930ef9b2d7c2f83..f69b8c96bf294ccbb8510ae573131732dedd2d20 100644 (file)
--- a/gzip.c
+++ b/gzip.c
@@ -878,8 +878,11 @@ local void treat_file(iname)
     }
 
     close(ifd);
-    if (!to_stdout && close(ofd)) {
-       write_error();
+    if (!to_stdout) {
+        /* Copy modes, times, ownership, and remove the input file */
+        copy_stat(&istat);
+       if (close(ofd))
+               write_error();
     }
     if (method == -1) {
        if (!to_stdout) xunlink (ofname);
@@ -899,10 +902,6 @@ local void treat_file(iname)
        }
        fprintf(stderr, "\n");
     }
-    /* Copy modes, times, ownership, and remove the input file */
-    if (!to_stdout) {
-       copy_stat(&istat);
-    }
 }
 
 /* ========================================================================
@@ -1322,6 +1321,7 @@ local int get_method(in)
                /* Copy the base name. Keep a directory prefix intact. */
                 char *p = base_name (ofname);
                 char *base = p;
+                char *base2;
                for (;;) {
                    *p = (char)get_char();
                    if (*p++ == '\0') break;
@@ -1329,6 +1329,8 @@ local int get_method(in)
                        error("corrupted input -- file name too large");
                    }
                }
+               base2 = base_name (base);
+               strcpy(base, base2);
                 /* If necessary, adapt the name to local OS conventions: */
                 if (!list) {
                    MAKE_LEGAL_NAME(base);
@@ -1730,7 +1732,7 @@ local void copy_stat(ifstat)
     reset_times(ofname, ifstat);
 #endif
     /* Copy the protection modes */
-    if (chmod(ofname, ifstat->st_mode & 07777)) {
+    if (fchmod(ofd, ifstat->st_mode & 07777)) {
        int e = errno;
        WARN((stderr, "%s: ", progname));
        if (!quiet) {
@@ -1739,7 +1741,7 @@ local void copy_stat(ifstat)
        }
     }
 #ifndef NO_CHOWN
-    chown(ofname, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
+    (void) fchown(ofd, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
 #endif
     remove_ofname = 0;
     /* It's now safe to remove the input file: */