wxTempFile now respects the access rights under Unix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/file.cpp

@@ -141,6 +141,14 @@
     char gwxMacFileName3[ MAX_PATH ] ;
 #endif
 
+// some broken compilers don't have 3rd argument in open() and creat()
+#ifdef __SALFORDC__
+    #define ACCESS(access)
+    #define stat    _stat
+#else // normal compiler
+    #define ACCESS(access)  , (access)
+#endif // Salford C
+
 // ============================================================================
 // implementation of wxFile
 // ============================================================================
@@ -150,13 +158,11 @@
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const char *name)
 {
-#ifdef __SALFORDC__
-  struct _stat st;
-#else
     struct stat st;
-#endif
 
-  return !access(name, 0) && !stat((char*) name, &st) && (st.st_mode & S_IFREG);
+    return !access(name, 0) &&
+           !stat((char*) name, &st) &&
+           (st.st_mode & S_IFREG);
 }
 
 bool wxFile::Access(const char *name, OpenMode mode)
@@ -203,13 +209,9 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode)
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
-#ifdef __SALFORDC__
+    int fd = open(szFileName,
-  int fd = open(szFileName, O_WRONLY | O_CREAT |
+                  O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
-                (bOverwrite ? O_TRUNC : O_EXCL));
+                  ACCESS(accessMode));
-#else
-  int fd = open(szFileName, O_WRONLY | O_CREAT |
-                (bOverwrite ? O_TRUNC : O_EXCL), accessMode);
-#endif
 
     if ( fd == -1 ) {
         wxLogSysError(_("can't create file '%s'"), szFileName);
@@ -244,11 +246,7 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
-#ifdef __SALFORDC__
+    int fd = open(szFileName, flags ACCESS(accessMode));
-  int fd = open(szFileName, flags);
-#else
-  int fd = open(szFileName, flags, accessMode);
-#endif
 
     if ( fd == -1 ) {
         wxLogSysError(_("can't open file '%s'"), szFileName);
@@ -494,7 +492,36 @@ bool wxTempFile::Open(const wxString& strName)
     m_strTemp.UngetWriteBuf();
 #endif  // Windows/Unix
 
-  return m_file.Open(m_strTemp, wxFile::write);
+    int access = wxS_DEFAULT;
+#ifdef __UNIX__
+    // create the file with the same mode as the original one under Unix
+    struct stat st;
+    if ( stat(strName, &st) == 0 )
+    {
+        // this assumes that only lower bits of st_mode contain the access
+        // rights, but it's true for at least all Unices which have S_IXXXX()
+        // macros, so should not be less portable than using (not POSIX)
+        // S_IFREG &c
+        access = st.st_mode & 0777;
+    }
+    else
+    {
+        wxLogLastError("stat");
+    }
+
+    // we want to create the file with exactly the same access rights as the
+    // original one, so disable the user's umask for the moment
+    mode_t umaskOld = umask(0);
+#endif // Unix
+
+    bool ok =  m_file.Open(m_strTemp, wxFile::write, access);
+
+#ifdef __UNIX__
+    // restore umask now that the file is created
+    (void)umask(umaskOld);
+#endif // Unix
+
+    return ok;
 }
 
 // ----------------------------------------------------------------------------