1 files changed, 23 insertions, 42 deletions

diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index 8eb5ac9564..ab5734a298 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -564,7 +564,7 @@ static int doSpawn(pid_t *ppid, const posix_spawn_file_actions_t *file_actions,
             qWarning("ThreadCtl(): failed to chdir to %s", oldWorkingDir);
 
 #  ifdef Q_OS_QNX
-        if (ThreadCtl(_NTO_TCTL_THREADS_CONT, 0) == -1)
+        if (Q_UNLIKELY(ThreadCtl(_NTO_TCTL_THREADS_CONT, 0) == -1))
             qFatal("ThreadCtl(): cannot resume threads: %s", qPrintable(qt_error_string(errno)));
 #  endif
     }
@@ -676,6 +676,7 @@ void QProcessPrivate::execChild(const char *workingDir, char **path, char **argv
     qt_safe_close(childStartedPipe[0]);
 
     // enter the working directory
+    const char *callthatfailed = "chdir: ";
     if (workingDir && QT_CHDIR(workingDir) == -1) {
         // failed, stop the process
         goto report_errno;
@@ -687,6 +688,7 @@ void QProcessPrivate::execChild(const char *workingDir, char **path, char **argv
     // execute the process
     if (!envp) {
         qt_safe_execvp(argv[0], argv);
+        callthatfailed = "execvp: ";
     } else {
         if (path) {
             char **arg = path;
@@ -704,15 +706,19 @@ void QProcessPrivate::execChild(const char *workingDir, char **path, char **argv
 #endif
             qt_safe_execve(argv[0], argv, envp);
         }
+        callthatfailed = "execve: ";
     }
 
     // notify failure
+    // we're running in the child process, so we don't need to be thread-safe;
+    // we can use strerror
 report_errno:
-    QString error = qt_error_string(errno);
+    const char *msg = strerror(errno);
 #if defined (QPROCESS_DEBUG)
-    fprintf(stderr, "QProcessPrivate::execChild() failed (%s), notifying parent process\n", qPrintable(error));
+    fprintf(stderr, "QProcessPrivate::execChild() failed (%s), notifying parent process\n", msg);
 #endif
-    qt_safe_write(childStartedPipe[1], error.data(), error.length() * sizeof(QChar));
+    qt_safe_write(childStartedPipe[1], callthatfailed, strlen(callthatfailed));
+    qt_safe_write(childStartedPipe[1], msg, strlen(msg));
     qt_safe_close(childStartedPipe[1]);
     childStartedPipe[1] = -1;
 }
@@ -720,8 +726,15 @@ report_errno:
 
 bool QProcessPrivate::processStarted(QString *errorMessage)
 {
-    ushort buf[errorBufferMax];
-    int i = qt_safe_read(childStartedPipe[0], &buf, sizeof buf);
+    char buf[errorBufferMax];
+    int i = 0;
+    int ret;
+    do {
+        ret = qt_safe_read(childStartedPipe[0], buf + i, sizeof buf - i);
+        if (ret > 0)
+            i += ret;
+    } while (ret > 0 && i < int(sizeof buf));
+
     if (startupSocketNotifier) {
         startupSocketNotifier->setEnabled(false);
         startupSocketNotifier->deleteLater();
@@ -736,7 +749,7 @@ bool QProcessPrivate::processStarted(QString *errorMessage)
 
     // did we read an error message?
     if ((i > 0) && errorMessage)
-        *errorMessage = QString((const QChar *)buf, i / sizeof(QChar));
+        *errorMessage = QString::fromLocal8Bit(buf, i);
 
     return i <= 0;
 }
@@ -830,17 +843,6 @@ bool QProcessPrivate::waitForStarted(int msecs)
     return startedEmitted;
 }
 
-#ifdef Q_OS_BLACKBERRY
-QList<QSocketNotifier *> QProcessPrivate::defaultNotifiers() const
-{
-    QList<QSocketNotifier *> notifiers;
-    notifiers << stdoutChannel.notifier
-              << stderrChannel.notifier
-              << stdinChannel.notifier;
-    return notifiers;
-}
-#endif // Q_OS_BLACKBERRY
-
 bool QProcessPrivate::waitForReadyRead(int msecs)
 {
 #if defined (QPROCESS_DEBUG)
@@ -850,10 +852,6 @@ bool QProcessPrivate::waitForReadyRead(int msecs)
     QElapsedTimer stopWatch;
     stopWatch.start();
 
-#ifdef Q_OS_BLACKBERRY
-    QList<QSocketNotifier *> notifiers = defaultNotifiers();
-#endif
-
     forever {
         fd_set fdread;
         fd_set fdwrite;
@@ -876,11 +874,8 @@ bool QProcessPrivate::waitForReadyRead(int msecs)
             add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
 
         int timeout = qt_subtract_from_timeout(msecs, stopWatch.elapsed());
-#ifdef Q_OS_BLACKBERRY
-        int ret = bb_select(notifiers, nfds + 1, &fdread, &fdwrite, timeout);
-#else
         int ret = qt_select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
-#endif
+
         if (ret < 0) {
             break;
         }
@@ -928,10 +923,6 @@ bool QProcessPrivate::waitForBytesWritten(int msecs)
     QElapsedTimer stopWatch;
     stopWatch.start();
 
-#ifdef Q_OS_BLACKBERRY
-    QList<QSocketNotifier *> notifiers = defaultNotifiers();
-#endif
-
     while (!stdinChannel.buffer.isEmpty()) {
         fd_set fdread;
         fd_set fdwrite;
@@ -955,11 +946,8 @@ bool QProcessPrivate::waitForBytesWritten(int msecs)
             add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
 
         int timeout = qt_subtract_from_timeout(msecs, stopWatch.elapsed());
-#ifdef Q_OS_BLACKBERRY
-        int ret = bb_select(notifiers, nfds + 1, &fdread, &fdwrite, timeout);
-#else
         int ret = qt_select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
-#endif
+
         if (ret < 0) {
             break;
         }
@@ -1001,10 +989,6 @@ bool QProcessPrivate::waitForFinished(int msecs)
     QElapsedTimer stopWatch;
     stopWatch.start();
 
-#ifdef Q_OS_BLACKBERRY
-    QList<QSocketNotifier *> notifiers = defaultNotifiers();
-#endif
-
     forever {
         fd_set fdread;
         fd_set fdwrite;
@@ -1028,11 +1012,8 @@ bool QProcessPrivate::waitForFinished(int msecs)
             add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
 
         int timeout = qt_subtract_from_timeout(msecs, stopWatch.elapsed());
-#ifdef Q_OS_BLACKBERRY
-        int ret = bb_select(notifiers, nfds + 1, &fdread, &fdwrite, timeout);
-#else
         int ret = qt_select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
-#endif
+
         if (ret < 0) {
             break;
         }