Changeset 1112

Timestamp:

Mar 1, 2013, 12:42:39 AM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Make sure OS/2 file engine takes kLIB path rewrite into account.

This is to make QDir::absoluteFilePath() and friends work for paths like
/@unixroot/dir (by translating them to X:/my_unixroot/dir instead of givng
invalid paths like X:/@unixroot/dir). See #282.

File:

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

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -66 +66 @@
 #include <unistd.h>
 
+
+
+
+
 #include <pwd.h>
 #include <grp.h>
@@ -798 +802 @@
         if (!::isRelativePath(d->filePath)) {
             if (::isNotReallyAbsolutePath(d->filePath)) {
+
                 char buf[PATH_MAX+1];
-                strcpy(buf, QFile::encodeName(d->filePath).constData());
+#ifdef __INNOTEK_LIBC__
+                // In kLIBC (0.6.5-), _abspath() doesn't perform path rewriting to expand
+                // e.g. /@unixroot/dir to X:/my_unixroot/dir which confuses many apps by
+                // translating such paths to invalid ones like X:/@unixroot/dir. Fix this
+                // by calling path rewrite explicitly. @todo kLIBC should actually do that.
+                if (__libc_PathRewrite(filePath.constData(), buf, sizeof(buf)) <= 0)
+#endif
+                    strcpy(buf, filePath.constData());
                 _abspath(buf, buf, sizeof(buf));
                 ret = QFile::decodeName(buf);
@@ -856 +868 @@
                 if (!::isRelativePath(target)) {
                     if (::isNotReallyAbsolutePath(target)) {
+
                         char buf[PATH_MAX+1];
-                        strcpy(buf, QFile::encodeName(target).constData());
+#ifdef __INNOTEK_LIBC__
+                        // In kLIBC (0.6.5-), _abspath() doesn't perform path rewriting to expand
+                        // e.g. /@unixroot/dir to X:/my_unixroot/dir which confuses many apps by
+                        // translating such paths to invalid ones like X:/@unixroot/dir. Fix this
+                        // by calling path rewrite explicitly. @todo kLIBC should actually do that.
+                        if (__libc_PathRewrite(filePath.constData(), buf, sizeof(buf)) <= 0)
+#endif
+                            strcpy(buf, filePath.constData());
                         _abspath(buf, buf, sizeof(buf));
                         ret = QFile::decodeName(buf);