Changeset 561 for trunk/tools/porting/src/filewriter.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/porting/src/filewriter.cpp (modified) (5 diffs)

trunk/tools/porting/src/filewriter.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the qt3to4 porting application of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include <QDir>
 #include <ctype.h>
+
 
 QT_BEGIN_NAMESPACE
@@ -107 +108 @@
             while (answer != 'y' && answer != 'n' && answer != 'a') {
 #if defined(Q_OS_WIN) && defined(_MSC_VER) && _MSC_VER >= 1400
-                scanf_s("%c", &answer);
+                scanf_s("%c", &answer);
 #else
-                scanf("%c", &answer);
+                scanf("%c", &answer);
 #endif
-                answer = tolower(answer);
+                if (1 == result)
+                    answer = tolower(answer);
+                else if (EOF == result) {
+                    if (EINTR == errno || EILSEQ == errno)
+                        continue;
+
+                    answer = 'n';
+                }
             }