]> granicus.if.org Git - postgresql/commitdiff
Skip recently-added umask() call on Windows.
authorNoah Misch <noah@leadboat.com>
Wed, 23 Sep 2015 03:37:26 +0000 (23:37 -0400)
committerNoah Misch <noah@leadboat.com>
Wed, 23 Sep 2015 03:37:26 +0000 (23:37 -0400)
Symbols S_IRWXG and S_IRWXO became available to Windows builds in commit
1319002e2ee166c06b38cdbc5e8508c7205fa115, so PostgreSQL 9.0 cannot use
them in platform-independent code.  Rewrite commit
24aed2124a5273e4cb543b06d4b7bb2c2ad5bf3c to not change Windows builds.
The new umask() call had no effect on Windows, anyway.  Per buildfarm.

src/bin/pg_dump/pg_backup_tar.c

index 51adf7917e1f4654f4861a0c1b62ca131a23a3ea..75cc8dd4bdfe35fabe912d9084c6893bfd8613d9 100644 (file)
@@ -375,20 +375,23 @@ tarOpen(ArchiveHandle *AH, const char *filename, char mode)
        }
        else
        {
-               int                     old_umask;
-
                tm = calloc(1, sizeof(TAR_MEMBER));
 
-               /*
-                * POSIX does not require, but permits, tmpfile() to restrict file
-                * permissions.  Given an OS crash after we write data, the filesystem
-                * might retain the data but forget tmpfile()'s unlink().  If so, the
-                * file mode protects confidentiality of the data written.
-                */
-               old_umask = umask(S_IRWXG | S_IRWXO);
-
 #ifndef WIN32
-               tm->tmpFH = tmpfile();
+               {
+                       int                     old_umask;
+
+                       /*
+                        * POSIX does not require, but permits, tmpfile() to restrict file
+                        * permissions.  Given an OS crash after we write data, the
+                        * filesystem might retain the data but forget tmpfile()'s
+                        * unlink().  If so, the file mode protects confidentiality of the
+                        * data written.
+                        */
+                       old_umask = umask(S_IRWXG | S_IRWXO);
+                       tm->tmpFH = tmpfile();
+                       umask(old_umask);
+               }
 #else
 
                /*
@@ -421,8 +424,6 @@ tarOpen(ArchiveHandle *AH, const char *filename, char mode)
                if (tm->tmpFH == NULL)
                        die_horribly(AH, modulename, "could not generate temporary file name: %s\n", strerror(errno));
 
-               umask(old_umask);
-
 #ifdef HAVE_LIBZ
 
                if (AH->compression != 0)