Changeset 181 for trunk/src

Timestamp:

Sep 15, 2009, 11:09:52 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed stdio redirection in QProcess but it will only work for kLIBC-based child processes for now. See #69.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (12 diffs)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -104 +104 @@
 #include <errno.h>
 #include <sys/filio.h>
+
 
 QT_BEGIN_NAMESPACE
@@ -113 +114 @@
     if (pipe[1] != -1)
         ::close(pipe[1]);
-    if (::pipe(pipe) != 0) {
-        qWarning("QProcessPrivate::createPipe: Cannot create pipe %p: %s",
-                 pipe, qPrintable(qt_error_string(errno)));
+    // Note: with kLIBC 0.6.3 and earlier (GCC 3.3.5 CSD3), fds created with
+    // pipe() cannot be used in select(), so use socketpair() instead
+    if (::socketpair(AF_OS2, SOCK_STREAM, 0, pipe) != 0) {
+        qWarning("QProcessPrivate::createPipe: ::socketpair() failed with '%s'",
+                 qPrintable(qt_error_string(errno)));
     }
     ::fcntl(pipe[0], F_SETFD, FD_CLOEXEC);
@@ -247 +250 @@
                            const QStringList *environment, bool detached = false)
 {
+
     int mode = detached ? P_DETACH : P_NOWAIT;
 
@@ -310 +314 @@
 
     // start the program
-    int pid = spawnvpe(mode | P_DEFAULT, encodedProgramName, argv, envv);
+#ifdef QPROCESS_DEBUG
+    qDebug("Trying spawnvpe(%d, \"%s\")",
+           mode, encodedProgramName.constData());
+#endif
+    int pid = spawnvpe(mode, encodedProgramName, argv, envv);
 
     // if spawnvpe() couldn't find the executable, try .CMD and .BAT
     // extensions (in order of CMD.EXE precedence); spawnvpe() knows how to
     // locate and run them (i.e. using CMD.EXE /c)
-    if ( pid == -1 && errno == ENOENT ) {
+    if () {
         encodedProgramName += ".cmd";
         argv[0] = encodedProgramName.data();
-        pid = spawnvpe(P_NOWAIT | P_DEFAULT, encodedProgramName, argv, envv);
+#ifdef QPROCESS_DEBUG
+            qDebug("Trying spawnvpe(%d, \"%s\")",
+                   mode, encodedProgramName.constData());
+#endif
+        pid = spawnvpe(mode, encodedProgramName, argv, envv);
         if ( pid == -1 && errno == ENOENT ) {
             qstrcpy(encodedProgramName.data() + encodedProgramName.length() - 4, ".bat");
             argv[0] = encodedProgramName.data();
-            pid = spawnvpe(P_NOWAIT | P_DEFAULT, encodedProgramName, argv, envv);
+#ifdef QPROCESS_DEBUG
+            qDebug("Trying spawnvpe(%d, \"%s\")",
+                   mode, encodedProgramName.constData());
+#endif
+            pid = spawnvpe(mode, encodedProgramName, argv, envv);
         }
     }
@@ -374 +390 @@
             ::dup2(fileno(stdout), fileno(stderr));
         } else {
+
+
             ::dup2(stderrChannel.pipe[1], fileno(stderr));
+
         }
     }
@@ -398 +417 @@
         // Cleanup, report error and return
 #if defined (QPROCESS_DEBUG)
-        qDebug("spawnvpe failed: %s", qt_error_string(errno));
+        qDebug("spawnvpe failed: %s", q));
 #endif
         q->setProcessState(QProcess::NotRunning);
         processError = QProcess::FailedToStart;
-        q->setErrorString(QProcess::tr("Process failed to start: %1").arg(qt_error_string(errno)));
+        q->setErrorString(QProcess::tr("Process failed to start: %1")
+                                       .arg(qPrintable(qt_error_string(errno))));
         emit q->error(processError);
         cleanup();
@@ -555 +575 @@
 }
 
-static int qt_select(fd_set *fdread, fd_set *fdwrite, int timeout)
+static int qt_select(fd_set *fdread, fd_set *fdwrite, int timeout)
 {
     struct timeval tv;
@@ -561 +581 @@
     tv.tv_usec = (timeout % 1000) * 1000;
 
-    int ret = select(FD_SETSIZE, fdread, fdwrite, 0, timeout < 0 ? 0 : &tv);
+    int ret = select(, fdread, fdwrite, 0, timeout < 0 ? 0 : &tv);
     return ret;
 }
@@ -597 +617 @@
         FD_ZERO(&fdwrite);
 
-        if (stdoutChannel.pipe[0] != -1)
+        int maxFd = 0;
+        if (stdoutChannel.pipe[0] != -1) {
             FD_SET(stdoutChannel.pipe[0], &fdread);
-        if (stderrChannel.pipe[0] != -1)
+            maxFd = qMax(maxFd, stdoutChannel.pipe[0]);
+        }
+        if (stderrChannel.pipe[0] != -1) {
             FD_SET(stderrChannel.pipe[0], &fdread);
-
-        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
+            maxFd = qMax(maxFd, stderrChannel.pipe[0]);
+        }
+
+        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1) {
             FD_SET(stdinChannel.pipe[1], &fdwrite);
+
+
 
         int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
-        int ret = qt_select(&fdread, &fdwrite, timeout);
+        int ret;
+        if (maxFd >= 0) {
+            ret = qt_select(maxFd + 1, &fdread, &fdwrite, timeout);
+        } else {
+            int exitStatus;
+            ret = waitpid(pid, &exitStatus, 0);
+        }
         if (ret < 0) {
             break;
@@ -658 +691 @@
         FD_ZERO(&fdwrite);
 
-        if (stdoutChannel.pipe[0] != -1)
+        int maxFd = 0;
+        if (stdoutChannel.pipe[0] != -1) {
             FD_SET(stdoutChannel.pipe[0], &fdread);
-        if (stderrChannel.pipe[0] != -1)
+            maxFd = qMax(maxFd, stdoutChannel.pipe[0]);
+        }
+        if (stderrChannel.pipe[0] != -1) {
             FD_SET(stderrChannel.pipe[0], &fdread);
-
-        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
+            maxFd = qMax(maxFd, stderrChannel.pipe[0]);
+        }
+
+        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1) {
             FD_SET(stdinChannel.pipe[1], &fdwrite);
+
+
 
         int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
-        int ret = qt_select(&fdread, &fdwrite, timeout);
+        int ret;
+        if (maxFd >= 0) {
+            ret = qt_select(maxFd + 1, &fdread, &fdwrite, timeout);
+        } else {
+            int exitStatus;
+            ret = waitpid(pid, &exitStatus, 0);
+        }
         if (ret < 0) {
             break;
@@ -712 +758 @@
         FD_ZERO(&fdwrite);
 
-        if (stdoutChannel.pipe[0] != -1)
+        int maxFd = -1;
+        if (stdoutChannel.pipe[0] != -1) {
             FD_SET(stdoutChannel.pipe[0], &fdread);
-        if (stderrChannel.pipe[0] != -1)
+            maxFd = qMax(maxFd, stdoutChannel.pipe[0]);
+        }
+        if (stderrChannel.pipe[0] != -1) {
             FD_SET(stderrChannel.pipe[0], &fdread);
-
-        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
+            maxFd = qMax(maxFd, stderrChannel.pipe[0]);
+        }
+
+        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1) {
             FD_SET(stdinChannel.pipe[1], &fdwrite);
+
+
 
         int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
-        int ret = qt_select(&fdread, &fdwrite, timeout);
+        int ret;
+        if (maxFd >= 0) {
+            ret = qt_select(maxFd + 1, &fdread, &fdwrite, timeout);
+        } else {
+            int exitStatus;
+            ret = waitpid(pid, &exitStatus, 0);
+        }
         if (ret < 0) {
             break;
@@ -754 +813 @@
     FD_SET(stdinChannel.pipe[1], &fdwrite);
 
-    int ret = qt_select(0, &fdwrite, msecs < 0 ? 0 : msecs) == 1;
+    int ret = qt_select(stdinChannel.pipe[1] + 1, 0, &fdwrite,
+                        msecs < 0 ? 0 : msecs) == 1;
     return ret == 1;
 }