Changeset 928 for trunk/src/corelib

Timestamp:

Aug 1, 2011, 9:56:31 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: QProcess: Fixed the way how pipes are closed.

This makes sure that feof() will return 1 and ferror() will not
return 1 on the child end of the pipe connected to its stdin.
This in turn fixes programs that check the ferror() value to
decide if the input data is valid, as well as programs using
feof() as the only way to break the input stream read loop.

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -67 +67 @@
     static FILE *f = 0;
     if (!f) {
-        f = fopen("\\qprocess.dbg", "w");
+        f = fopen("\\qprocess.dbg", "w");
         setbuf(f, NULL);
     }
@@ -624 +624 @@
     }
     if (pipe.server != HPIPE(~0)) {
-        DosDisConnectNPipe(pipe.server);
+        // Note: We do not call DosDisConnectNPipe() as this is not necessary
+        // and will only cause DosRead() on the other side to return
+        // ERROR_PIPE_NOT_CONNECTED that will be interpreted by LIBC read() and
+        // fread() as an error (ferror() will return true) and some programs
+        // don't like it (e.g. 7z, rar32 when reading data from stdin).
         DosClose(pipe.server);
         pipe.server = HPIPE(~0);