Ticket #199: qprocess_os2.diff

qprocess_os2.cpp

@@ -1322 +1322 @@
 
 qint64 QProcessPrivate::readFromStdout(char *data, qint64 maxlen)
 {
+    QMutexLocker lock(QProcessManager::pipeStateLock());
+
     ULONG actual = 0;
     APIRET arc = DosRead(stdoutChannel.pipe.server, data, maxlen, &actual);
 
     qint64 bytesRead = -1;
     if (arc == NO_ERROR) {
         bytesRead = (qint64)actual;
+
+        if (!dying && pipeData[OutPipe].signaled) {
+            if (actual >= pipeData[OutPipe].bytes) {
+                pipeData[OutPipe].bytes = 0;
+                pipeData[OutPipe].signaled = false;
+            } else {
+                pipeData[OutPipe].bytes -= actual;
+            }
+        }
     }
 
     DEBUG(("QProcessPrivate::readFromStdout(%p \"%s\", %lld) == %lld",
@@ -1337 +1348 @@
 
 qint64 QProcessPrivate::readFromStderr(char *data, qint64 maxlen)
 {
+    QMutexLocker lock(QProcessManager::pipeStateLock());
+
     ULONG actual = 0;
     APIRET arc = DosRead(stderrChannel.pipe.server, data, maxlen, &actual);
 
     qint64 bytesRead = -1;
     if (arc == NO_ERROR) {
         bytesRead = (qint64)actual;
+
+        if (!dying && pipeData[ErrPipe].signaled) {
+            if (actual >= pipeData[ErrPipe].bytes) {
+                pipeData[ErrPipe].bytes = 0;
+                pipeData[ErrPipe].signaled = false;
+            } else {
+                pipeData[ErrPipe].bytes -= actual;
+            }
+        }
     }
 
     DEBUG(("QProcessPrivate::readFromStderr(%p \"%s\", %lld) == %lld",