Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / util / subst.c

diff --git a/util/subst.c b/util/subst.c
index db729234f570868d9d445cd606c0a50dce80624c..e745d8631e0b6acfa14608cbaa6476d17460420d 100644 (file)
--- a/util/subst.c
+++ b/util/subst.c
@@ -28,6 +28,9 @@
 #include <fcntl.h>
 #include <time.h>
 #include <utime.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -320,7 +323,7 @@ int main(int argc, char **argv)
 {
        char    line[2048];
        int     c;
-       int     fd;
+       int     fd, ofd = -1;
        FILE    *in, *out, *old = NULL;
        char    *outfn = NULL, *newfn = NULL;
        int     verbose = 0;
@@ -371,12 +374,12 @@ int main(int argc, char **argv)
                }
                strcpy(newfn, outfn);
                strcat(newfn, ".new");
-               fd = open(newfn, O_CREAT|O_TRUNC|O_RDWR, 0444);
-               if (fd < 0) {
+               ofd = open(newfn, O_CREAT|O_TRUNC|O_RDWR, 0644);
+               if (ofd < 0) {
                        perror(newfn);
                        exit(1);
                }
-               out = fdopen(fd, "w+");
+               out = fdopen(ofd, "w+");
                if (!out) {
                        perror("fdopen");
                        exit(1);
@@ -430,12 +433,16 @@ int main(int argc, char **argv)
                                        printf("Using original atime\n");
                                set_utimes(outfn, fileno(old), tv);
                        }
+                       if (ofd >= 0)
+                               (void) fchmod(ofd, 0444);
                        fclose(out);
                        if (unlink(newfn) < 0)
                                perror("unlink");
                } else {
                        if (verbose)
                                printf("Creating or replacing %s.\n", outfn);
+                       if (ofd >= 0)
+                               (void) fchmod(ofd, 0444);
                        fclose(out);
                        if (old)
                                fclose(old);
@@ -448,6 +455,8 @@ int main(int argc, char **argv)
        }
        if (old)
                fclose(old);
+       if (newfn)
+               free(newfn);
        return (0);
 }