Changeset 203 for trunk/src

Timestamp:

Oct 6, 2009, 12:22:41 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed sending data to standard input with QProcess::write().

Location:

trunk/src/corelib/io

Files:

• qprocess.cpp (modified) (3 diffs)
• qprocess_os2.cpp (modified) (2 diffs)
• qprocess_p.h (modified) (1 diff)

trunk/src/corelib/io/qprocess.cpp

@@ -636 +636 @@
 
     qint64 written = writeToStdin(writeBuffer.readPointer(),
-                                      writeBuffer.nextDataBlockSize());
+                                  writeBuffer.nextDataBlockSize());
     if (written < 0) {
         destroyPipe(stdinChannel.pipe);
@@ -1440 +1440 @@
            data, qt_prettyDebug(data, len, 16).constData(), len);
 #endif
+
+
+
+
+
         return 1;
     }
@@ -1450 +1455 @@
     qDebug("QProcess::writeData(%p \"%s\", %lld) == %lld (written to buffer)",
            data, qt_prettyDebug(data, len, 16).constData(), len, len);
+
+
+
+
+
 #endif
     return len;

trunk/src/corelib/io/qprocess_os2.cpp

@@ -1016 +1016 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 qint64 QProcessPrivate::readFromStdout(char *data, qint64 maxlen)
 {
@@ -1061 +1076 @@
     APIRET arc = DosWrite(stdinChannel.pipe.server, data, maxlen, &actual);
 
-    qint64 written = arc == NO_ERROR ? (qint64)actual : -1;
-
-    QProcessPrivate* that = const_cast<QProcessPrivate*>(this);
-
-    // reset the counter so that QProcessManager will inform us again if
-    // more space is available (note that we don't care about the actual number)
-    that->pipeData[InPipe].newBytes.fetchAndStoreRelaxed(0);
+    qint64 written = -1;
+    if (arc == NO_ERROR) {
+    ;
+        // update our counter
+    
+    
+    
 
 #if defined QPROCESS_DEBUG

trunk/src/corelib/io/qprocess_p.h

@@ -251 +251 @@
     qint64 bytesAvailableFromStdout() const;
     qint64 bytesAvailableFromStderr() const;
+
+
+
     qint64 readFromStdout(char *data, qint64 maxlen);
     qint64 readFromStderr(char *data, qint64 maxlen);