Changeset 933 for trunk/src/tools/uic/driver.cpp

Timestamp:

Aug 2, 2011, 3:07:49 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

uic: Put stdin/stdout to binary mode on Windows and OS/2.

This is necessary to avoid duplication of CR symbols on output
and hangs in atEnd() due to unexpected CR on input (in particular,
seen when stdin and stdout are redirected to regular files). See
also r932.

Note: it actually may make sense to change QFile::open() so that
it implicitly makes this mode change and restores the origianl mode
on destruction. Just to be on the safe side.

File:

• trunk/src/tools/uic/driver.cpp (modified) (3 diffs)

trunk/src/tools/uic/driver.cpp

@@ -47 +47 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QDebug>
+
+
+
+
+
 
 QT_BEGIN_NAMESPACE
@@ -285 +290 @@
 {
     QFile f;
-    if (fileName.isEmpty())
+    if (fileName.isEmpty()) {
+#if defined(Q_OS_WIN)
+        _setmode(_fileno(stdin), _O_BINARY);
+#elif defined(Q_OS_OS2)
+        setmode(fileno(stdin), O_BINARY);
+#endif
         f.open(stdin, QIODevice::ReadOnly);
-    else {
+    else {
         f.setFileName(fileName);
         if (!f.open(QIODevice::ReadOnly))
@@ -301 +311 @@
         m_output = out;
     } else {
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-        // As one might also redirect the output to a file on win,
-        // we should not create the textstream with QFile::Text flag.
-        // The redirected file is opened in TextMode and this will
-        // result in broken line endings as writing will replace \n again.
-        m_output = new QTextStream(stdout, QIODevice::WriteOnly);
-#else
+#if defined(Q_WS_WIN)
+        _setmode(_fileno(stdout), _O_BINARY);
+#elif defined(Q_OS_OS2)
+        setmode(fileno(stdout), O_BINARY);
+#endif
         m_output = new QTextStream(stdout, QIODevice::WriteOnly | QFile::Text);
-#endif
         deleteOutput = true;
     }