commit f909182842b44b8a4ee2767a962aaee0510203f8
author Thomas Klausner <tk@giga.or.at> Tue May 26 08:13:45 2015 +0200
committer Thomas Klausner <tk@giga.or.at> Tue May 26 08:13:45 2015 +0200
tree dc69d0f276eef2aac95ed38deb3bed84a1e98c6b
parent 57bba91072592799f0d7e314d1c14a97781f55bd

Make umask use more portable to Windows.
Reported and tested by Vasili Svirski.

lib/zip_source_filep.c

diff --git a/lib/zip_source_filep.c b/lib/zip_source_filep.c
index 22500e2..64d7845 100644
--- a/lib/zip_source_filep.c
+++ b/lib/zip_source_filep.c
@@ -49,11 +49,12 @@
 #ifndef S_ISREG
 #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
-#ifndef S_IRWXG
-#define S_IRWXG (S_IRWXU >> 3)
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO (S_IRWXG >> 3)
+#if defined(S_IXUSR) && defined(S_IRWXG) && defined(S_IRWXO)
+#define _SAFE_MASK (S_IXUSR | S_IRWXG | S_IRWXO)
+#elif defined(_S_IWRITE)
+#define _SAFE_MASK (_S_IWRITE)
+#else
+#error do not know safe values for umask, please report this
 #endif
 
 #ifdef _MSC_VER
@@ -183,7 +184,7 @@
     }
     sprintf(temp, "%s.XXXXXX", ctx->fname);
 
-    mask = umask(S_IXUSR | S_IRWXG | S_IRWXO);
+    mask = umask(_SAFE_MASK);
     if ((tfd=mkstemp(temp)) == -1) {
         zip_error_set(&ctx->error, ZIP_ER_TMPOPEN, errno);
 	umask(mask);