Port most uses of ::open and QT_OPEN to the safe version.

This ensures that we're calling the open64 version of this function as
well as handling the O_CLOEXEC flag and EINTR errors.

Reviewed-By: João Abecasis

6 files changed, 24 insertions, 25 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
index ed42c34..721f52c 100644
--- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp
@@ -43,6 +43,7 @@
 
 #include "qfilesystemwatcher.h"
 #include "qfilesystemwatcher_kqueue_p.h"
+#include "qcore_unix_p.h"
 
 #include <qdebug.h>
 #include <qfile.h>
@@ -124,9 +125,9 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths,
         QString path = it.next();
         int fd;
 #if defined(O_EVTONLY)
-        fd = ::open(QFile::encodeName(path), O_EVTONLY);
+        fd = qt_safe_open(QFile::encodeName(path), O_EVTONLY);
 #else
-        fd = ::open(QFile::encodeName(path), O_RDONLY);
+        fd = qt_safe_open(QFile::encodeName(path), O_RDONLY);
 #endif
         if (fd == -1) {
             perror("QKqueueFileSystemWatcherEngine::addPaths: open");
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 4743a47..5708e9f 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -42,6 +42,7 @@
 #include "qplatformdefs.h"
 #include "qabstractfileengine.h"
 #include "private/qfsfileengine_p.h"
+#include "private/qcore_unix_p.h"
 
 #ifndef QT_NO_FSFILEENGINE
 
@@ -90,6 +91,12 @@ static QByteArray openModeToFopenMode(QIODevice::OpenMode flags, const QString &
         if (flags & QIODevice::ReadOnly)
             mode += '+';
     }
+
+#if defined(__GLIBC__) && (__GLIBC__ * 0x100 + __GLIBC_MINOR__) >= 0x0207
+    // must be glibc >= 2.7
+    mode += 'e';
+#endif
+
     return mode;
 }
 
@@ -118,12 +125,6 @@ static int openModeToOpenFlags(QIODevice::OpenMode mode)
             oflags |= QT_OPEN_TRUNC;
     }
 
-#ifdef O_CLOEXEC
-    // supported on Linux >= 2.6.23; avoids one extra system call
-    // and avoids a race condition: if another thread forks, we could
-    // end up leaking a file descriptor...
-    oflags |= O_CLOEXEC;
-#endif
     return oflags;
 }
 
@@ -177,11 +178,6 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
             }
         }
 
-#ifndef O_CLOEXEC
-        // not needed on Linux >= 2.6.23
-        setCloseOnExec(fd);     // ignore failure
-#endif
-
         // Seek to the end when in Append mode.
         if (flags & QFile::Append) {
             int ret;
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index fe8764d..a70b92f 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -56,6 +56,10 @@
 #include <qplatformdefs.h>
 #include "private/qabstractfileengine_p.h"
 
+#ifdef Q_OS_UNIX
+# include "private/qcore_unix_p.h"
+#endif
+
 //#define DEBUG_RESOURCE_MATCH
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 62ab0c4..2ae4611 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -60,6 +60,10 @@
 #include <time.h>
 #include <ctype.h>
 
+#if defined(Q_OS_UNIX)
+# include "private/qcore_unix_p.h"
+#endif
+
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 # include <process.h>
 # if defined(_MSC_VER) && _MSC_VER >= 1400
@@ -72,7 +76,6 @@
 #  include "qfunctions_wince.h"
 #endif
 
-
 QT_BEGIN_NAMESPACE
 
 /*
@@ -208,8 +211,9 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen)
             if ((*doopen =
                 QT_OPEN(targetPath.toLocal8Bit(), O_CREAT|O_EXCL|O_RDWR
 #  else // CE
+            // this is Unix
             if ((*doopen =
-                open(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR
+                qt_safe_open(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR
 #  endif
 #  ifdef QT_LARGEFILE_SUPPORT
                            |QT_OPEN_LARGEFILE
@@ -219,18 +223,9 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen)
 #  elif defined(Q_OS_WIN)
                            |O_BINARY
 #  endif
-#  ifdef O_CLOEXEC
-                           // supported on Linux >= 2.6.23; avoids one extra system call
-                           // and avoids a race condition: if another thread forks, we could
-                           // end up leaking a file descriptor...
-                           |O_CLOEXEC
-#  endif
                      , 0600)) >= 0)
 #endif // WIN && !CE
             {
-#if defined(Q_OS_UNIX) && !defined(O_CLOEXEC)
-                fcntl(*doopen, F_SETFD, FD_CLOEXEC);
-#endif
                 return 1;
             }
             if (errno != EEXIST)
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index 5299972..04739ff 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -59,6 +59,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "private/qcore_unix_p.h"
+
 QT_BEGIN_NAMESPACE
 
 QSharedMemoryPrivate::QSharedMemoryPrivate()
@@ -153,7 +155,7 @@ int QSharedMemoryPrivate::createUnixKeyFile(const QString &fileName)
     if (QFile::exists(fileName))
         return 0;
 
-    int fd = open(QFile::encodeName(fileName).constData(),
+    int fd = qt_safe_open(QFile::encodeName(fileName).constData(),
             O_EXCL | O_CREAT | O_RDWR, 0640);
     if (-1 == fd) {
         if (errno == EEXIST)
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 64cf16e..4aed2b2 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -58,6 +58,7 @@
 
 #if defined(Q_OS_UNIX)
 #define QT_USE_MMAP
+#include "private/qcore_unix_p.h"
 #endif
 
 // most of the headers below are already included in qplatformdefs.h