Use the safe versions in these system calls I've just introduced.

Reviewed-By: ossi

5 files changed, 33 insertions, 24 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_dnotify.cpp b/src/corelib/io/qfilesystemwatcher_dnotify.cpp
index c68af85..6df3746 100644
--- a/src/corelib/io/qfilesystemwatcher_dnotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_dnotify.cpp
@@ -59,6 +59,8 @@
 #include <fcntl.h>
 #include <time.h>
 
+#include "private/qcore_unix_p.h"
+
 #ifdef QT_LINUXBASE
 
 /* LSB doesn't standardize these */
@@ -80,7 +82,7 @@ static void (*qfswd_old_sigio_handler)(int) = 0;
 static void (*qfswd_old_sigio_action)(int, siginfo_t *, void *) = 0;
 static void qfswd_sigio_monitor(int signum, siginfo_t *i, void *v)
 {
-    ::write(qfswd_fileChanged_pipe[1], &i->si_fd, sizeof(int));
+    qt_safe_write(qfswd_fileChanged_pipe[1], reinterpret_cast<char*>(&i->si_fd), sizeof(int));
 
     if (qfswd_old_sigio_handler && qfswd_old_sigio_handler != SIG_IGN)
         qfswd_old_sigio_handler(signum);
@@ -121,9 +123,7 @@ QDnotifySignalThread::QDnotifySignalThread()
 {
     moveToThread(this);
 
-    ::pipe(qfswd_fileChanged_pipe);
-    ::fcntl(qfswd_fileChanged_pipe[0], F_SETFL,
-            ::fcntl(qfswd_fileChanged_pipe[0], F_GETFL) | O_NONBLOCK);
+    qt_safe_pipe(qfswd_fileChanged_pipe, O_NONBLOCK);
 
     struct sigaction oldAction;
     struct sigaction action;
@@ -181,7 +181,7 @@ void QDnotifySignalThread::run()
 void QDnotifySignalThread::readFromDnotify()
 {
     int fd;
-    int readrv = ::read(qfswd_fileChanged_pipe[0], &fd,sizeof(int));
+    int readrv = qt_safe_read(qfswd_fileChanged_pipe[0], reinterpret_cast<char*>(&fd), sizeof(int));
     // Only expect EAGAIN or EINTR.  Other errors are assumed to be impossible.
     if(readrv != -1) {
         Q_ASSERT(readrv == sizeof(int));
@@ -207,9 +207,9 @@ QDnotifyFileSystemWatcherEngine::~QDnotifyFileSystemWatcherEngine()
     for(QHash<int, Directory>::ConstIterator iter = fdToDirectory.constBegin();
             iter != fdToDirectory.constEnd();
             ++iter) {
-        ::close(iter->fd);
+        qt_safe_close(iter->fd);
         if(iter->parentFd)
-            ::close(iter->parentFd);
+            qt_safe_close(iter->parentFd);
     }
 }
 
@@ -353,7 +353,7 @@ QStringList QDnotifyFileSystemWatcherEngine::removePaths(const QStringList &path
 
         if(!directory.isMonitored && directory.files.isEmpty()) {
             // No longer needed
-            ::close(directory.fd);
+            qt_safe_close(directory.fd);
             pathToFD.remove(directory.path);
             fdToDirectory.remove(fd);
         }
@@ -419,9 +419,9 @@ void QDnotifyFileSystemWatcherEngine::refresh(int fd)
     }
 
     if(!directory.isMonitored && directory.files.isEmpty()) {
-        ::close(directory.fd);
+        qt_safe_close(directory.fd);
         if(directory.parentFd) {
-            ::close(directory.parentFd);
+            qt_safe_close(directory.parentFd);
             parentToFD.remove(directory.parentFd);
         }
         fdToDirectory.erase(iter);
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index e32b818..beafe72 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -50,6 +50,9 @@
 #if !defined(Q_OS_WINCE)
 #include <errno.h>
 #endif
+#if defined(Q_OS_UNIX)
+#include "private/qcore_unix_p.h"
+#endif
 #include <stdio.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 5708e9f..47e3db0 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -458,7 +458,7 @@ bool QFSFileEngine::caseSensitive() const
 bool QFSFileEngine::setCurrentPath(const QString &path)
 {
     int r;
-    r = ::chdir(QFile::encodeName(path));
+    r = QT_CHDIR(QFile::encodeName(path));
     return r >= 0;
 }
 
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 161398e..0eeea04 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -49,6 +49,7 @@
 #include "qeventdispatcher_unix_p.h"
 #include <private/qthread_p.h>
 #include <private/qcoreapplication_p.h>
+#include <private/qcore_unix_p.h>
 
 #include <errno.h>
 #include <stdio.h>
@@ -76,6 +77,7 @@ static void signalHandler(int sig)
 }
 
 
+#ifdef Q_OS_INTEGRITY
 static void initThreadPipeFD(int fd)
 {
     int ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
@@ -90,7 +92,7 @@ static void initThreadPipeFD(int fd)
     if (ret == -1)
         perror("QEventDispatcherUNIXPrivate: Unable to set flags on thread pipe");
 }
-
+#endif
 
 QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()
 {
@@ -102,13 +104,13 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()
     // INTEGRITY doesn't like a "select" on pipes, so use socketpair instead
     if (socketpair(AF_INET, SOCK_STREAM, PF_INET, thread_pipe) == -1)
         perror("QEventDispatcherUNIXPrivate(): Unable to create socket pair");
-#else
-    if (pipe(thread_pipe) == -1)
-        perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe");
-#endif
 
     initThreadPipeFD(thread_pipe[0]);
     initThreadPipeFD(thread_pipe[1]);
+#else
+    if (qt_safe_pipe(thread_pipe, O_NONBLOCK) == -1)
+        perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe");
+#endif
 
     sn_highest = -1;
 
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index a6ecd4e..178d519 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -48,6 +48,10 @@
 #include "qprinterinfo.h"
 #include <qnumeric.h>
 
+#ifdef Q_OS_UNIX
+#include "private/qcore_unix_p.h" // overrides QT_OPEN
+#endif
+
 QT_BEGIN_NAMESPACE
 
 extern int qt_defaultDpi();
@@ -1647,7 +1651,7 @@ static void closeAllOpenFds()
 #endif
     // leave stdin/out/err untouched
     while(--i > 2)
-        ::close(i);
+        QT_CLOSE(i);
 }
 #endif
 
@@ -1681,7 +1685,7 @@ bool QPdfBaseEnginePrivate::openPrintDevice()
         if (!printerName.isEmpty())
             pr = printerName;
         int fds[2];
-        if (pipe(fds) != 0) {
+        if (qt_safe_pipe(fds) != 0) {
             qWarning("QPdfPrinter: Could not open pipe to print");
             return false;
         }
@@ -1700,9 +1704,9 @@ bool QPdfBaseEnginePrivate::openPrintDevice()
                 (void)execlp("true", "true", (char *)0);
                 (void)execl("/bin/true", "true", (char *)0);
                 (void)execl("/usr/bin/true", "true", (char *)0);
-                ::exit(0);
+                ::_exit(0);
             }
-            dup2(fds[0], 0);
+            qt_safe_dup2(fds[0], 0, 0);
 
             closeAllOpenFds();
 
@@ -1769,14 +1773,14 @@ bool QPdfBaseEnginePrivate::openPrintDevice()
             // wait for a second so the parent process (the
             // child of the GUI process) has exited.  then
             // exit.
-            ::close(0);
+            QT_CLOSE(0);
             (void)::sleep(1);
-            ::exit(0);
+            ::_exit(0);
         }
         // parent process
-        ::close(fds[0]);
+        QT_CLOSE(fds[0]);
         fd = fds[1];
-        (void)::waitpid(pid, 0, 0);
+        (void)qt_safe_waitpid(pid, 0, 0);
 
         if (fd < 0)
             return false;