Changeset 923

Timestamp:

Jul 31, 2011, 11:07:15 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fix QFile::atEnd() returning 0 on a pipe after it is closed.

This is to be compatible with other platforms (e.g. Linux) and with
software that incorrectly uses the while(file.atEnd()) loop to read
data from a file.

File:

• trunk/src/corelib/io/qfsfileengine.cpp (modified) (1 diff)

trunk/src/corelib/io/qfsfileengine.cpp

@@ -890 +890 @@
     Q_D(QFSFileEngine);
     if (extension == AtEndExtension && d->fh && isSequential())
+#ifdef Q_OS_OS2
+        // On OS/2 feof() doesn't return 1 when the stream is a pipe and the
+        // other end of the pipe gets closed. This makes programs using the
+        // somewhat incorrect "while (qfile.atEnd())..." loop spin forever (UIC
+        // is one of such programs). In order to fix it, we use ferror() which
+        // does return 1 in cases like that.
+        return feof(d->fh) || ferror(d->fh);
+#else
         return feof(d->fh);
+#endif
 
     if (extension == MapExtension) {