Changeset 1134 for trunk

Timestamp:

Mar 12, 2013, 10:48:53 PM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Make QDir::absoluteFilePath() kLIBC path rewrite aware. Extends r1112.

This fix makes it possible to use paths like /@unixroot for e.g. Qt system directories.

File:

• trunk/src/corelib/io/qdir.cpp (modified) (3 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -62 +62 @@
 #include <stdlib.h>
 
+#ifdef Q_OS_OS2
+#ifdef __INNOTEK_LIBC__
+#include <InnoTekLIBC/pathrewrite.h>
+#endif
+#endif
+
 QT_BEGIN_NAMESPACE
 
@@ -715 +721 @@
     bool curDirOnDriveRelative = false;
     if (isAbsolutePath(fn)) {
+#ifdef __INNOTEK_LIBC__
+        // Make sure we perform any path rewrite before testing for real
+        // absoluteness. This is necessary to avoid resolving paths like
+        // /@unixroot/dir to X:/@unixroot/dir which would be wrong.
+        char buf[PATH_MAX+1];
+        if (__libc_PathRewrite(QFile::encodeName(fn).constData(), buf, sizeof(buf)) > 0)
+            fn = QFile::decodeName(buf);
+#endif
         // filter out not really absolute cases
         QChar ch0, ch1, ch2;
@@ -737 +751 @@
             ret = QFileInfo(fn).absoluteFilePath();
         } else {
+            // we can't rely on the engine's AbsoluteName here, see the big comment above
             if (curDriveRelative)
                 ret = ret.left(2); // only take the drive name from this QDir