Changeset 422 for trunk/src

Timestamp:

Dec 14, 2009, 8:14:19 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: QFSFileEngine: Added workaround: On OS/2, trailing spaces in file names are ignored ("readme " = "readme") but kLIBC doesn't handle this well.

File:

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

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -179 +179 @@
 void QFSFileEnginePrivate::nativeInitFileName()
 {
-    nativeFilePath = QFile::encodeName(filePath);
+    // On OS/2, trailing spaces in file names are ignored so that "readme " and
+    // "readme" refers to the same file. However, kLIBC seems to not handle this
+    // case well and returns ENOENT at least when attempting to access a file
+    // named "somedir /file" (provided that "somedir" exists of course. To try
+    // to seamlessly solve this issue, we remove such trailing spaces from path
+    // components here.
+    QString fp = filePath.replace(QRegExp("(?: *)([\\\\/$]|$)"), QLatin1String("\\1"));
+    nativeFilePath = QFile::encodeName(fp);
 }