Changeset 355 for trunk

Timestamp:

Nov 28, 2009, 5:20:07 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: On OS/2, treat "A:bbb.txt" and "/ccc.dat" as relative paths not as absolute (the absolute path, by definition, leads to the same object from any location which is not true for these paths).

Location:

trunk/src/corelib/io

Files:

• qdir.cpp (modified) (2 diffs)
• qfileinfo.cpp (modified) (1 diff)
• qfsfileengine_os2.cpp (modified) (5 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -732 +732 @@
 {
     Q_D(const QDir);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     if (isAbsolutePath(fileName))
         return fileName;
@@ -753 +798 @@
     }
     return ret;
+
+
 }
 

trunk/src/corelib/io/qfileinfo.cpp

@@ -586 +586 @@
     drive letter, except for network shares that are not mapped to a
     drive letter, in which case the path will begin '//sharename/'.
-    QFileInfo will uppercase drive letters. Note that QDir does not do
-    this. The code snippet below shows this.
+    QFileInfo will uppercase drive letters. Note that QDir does not
+    this. The code snippet below shows this.
 
     \snippet doc/src/snippets/code/src_corelib_io_qfileinfo.cpp newstuff

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -650 +650 @@
 static bool isRelativePath(const QString &path)
 {
-    return !(path.startsWith(QLatin1Char('/'))
-        || (path.length() >= 2
-        && ((path.at(0).isLetter() && path.at(1) == QLatin1Char(':'))
-        || (path.at(0) == QLatin1Char('/') && path.at(1) == QLatin1Char('/')))));                // drive, e.g. a:
+        // On OS/2, "A:bbb.txt" and "/ccc.dat" are relative paths
+    return !(path.startsWith(QLatin1String("//")) ||
+             (path.length() >= 2 && path.at(0).isLetter() &&
+              path.at(1) == QLatin1Char(':') &&
+              // we treat "D:" as absolute while "D:aaa" as relative
+              (path.length() == 2 || path.at(2) == QLatin1Char('/'))));
 }
 
@@ -686 +688 @@
     } else if(file == AbsoluteName || file == AbsolutePathName) {
         QString ret;
-
-        if (!isRelativePath()) {
-            if (d->filePath.size() > 2 && d->filePath.at(1) == QLatin1Char(':')
-                && d->filePath.at(2) != QLatin1Char('/') || // It's a drive-relative path, so Z:a.txt -> Z:\currentpath\a.txt
-                d->filePath.startsWith(QLatin1Char('/'))    // It's a absolute path to the current drive, so \a.txt -> Z:\a.txt
-                ) {
+        if (isRelativePath()) {
+            if ((d->filePath.size() > 2 && d->filePath.at(1) == QLatin1Char(':') &&
+                 d->filePath.at(2) != QLatin1Char('/')) ||    // path relative to the current dir of the given drive, so Z:a.txt -> Z:\currentpath\a.txt
+                (d->filePath.startsWith(QLatin1Char('/')))) { // path relative to the root of the current drive, so \a.txt -> Z:\a.txt
                 char buf[PATH_MAX+1];
                 strcpy(buf, QFile::encodeName(d->filePath).constData());
                 _abspath(buf, buf, sizeof(buf));
-                ret = QFile::decodeName(buf);
+                ret = QDir::cleanPath(QFile::decodeName(buf));
+                if (::isRelativePath(ret)) {
+                    // still relative, this means we have "Z:aaa" but there is no such drive Z:
+                    // just assume root is the current dir on Z:
+                    Q_ASSERT(ret.at(1) == QLatin1Char(':'));
+                    ret.insert(2, QLatin1Char('/'));
+                }
             } else {
-                ret = d->filePath;
+                ret = ;
             }
         } else {
-            ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + d->filePath);
+            ret = ;
         }
 
         // The path should be absolute at this point.
-        // From the docs :
-        // Absolute paths begin with the directory separator "/"
-        // (optionally preceded by a drive specification under Windows).
-        if (ret.at(0) != QLatin1Char('/')) {
+        // On OS/2, the absolute path always contains a "X:/" at the begining
+        // where X is the drive letter, or "//" if it's a network share
+        if (!ret.startsWith("//")) {
             Q_ASSERT(ret.length() >= 2);
             Q_ASSERT(ret.at(0).isLetter());
             Q_ASSERT(ret.at(1) == QLatin1Char(':'));
+
+
+
+
+
+
 
             // Force uppercase drive letters.
@@ -718 +729 @@
         if (file == AbsolutePathName) {
             int slash = ret.lastIndexOf(QLatin1Char('/'));
-            if (slash < 0)
-                return ret;
-            else if (ret.at(0) != QLatin1Char('/') && slash == 2)
-                return ret.left(3);      // include the slash
-            else
-                return ret.left(slash > 0 ? slash : 1);
+            if (!ret.startsWith("//")) {
+                Q_ASSERT(slash >= 2);
+                if (slash == 2)
+                    ret = ret.left(3);  // include the slash if it's "X:/"
+                else
+                    ret = ret.left(slash);
+            } else {
+                Q_ASSERT(slash >= 1);
+                if (slash == 1)
+                    ret = ret.left(3);  // include the slash if it's "//"
+                else
+                    ret = ret.left(slash);
+            }
         }
         return ret;
@@ -733 +751 @@
         if (!ret.isEmpty() && file == CanonicalPathName) {
             int slash = ret.lastIndexOf(QLatin1Char('/'));
-            if (slash == -1)
-                ret = QDir::currentPath();
-            else if (slash == 0)
-                ret = QLatin1String("/");
-            ret = ret.left(slash);
+            if (!ret.startsWith("//")) {
+                Q_ASSERT(slash >= 2);
+                if (slash == 2)
+                    ret = ret.left(3);  // include the slash if it's "X:/"
+                else
+                    ret = ret.left(slash);
+            } else {
+                Q_ASSERT(slash >= 1);
+                if (slash == 1)
+                    ret = ret.left(3);  // include the slash if it's "//"
+                else
+                    ret = ret.left(slash);
+            }
         }
         return ret;
@@ -748 +774 @@
                 QString target = QDir::fromNativeSeparators(QFile::decodeName(QByteArray(buf)));
                 QString ret;
-                if (!::isRelativePath(target)) {
-                    if (target.size() > 2 && target.at(1) == QLatin1Char(':')
-                        && target.at(2) != QLatin1Char('/') || // It's a drive-relative path, so Z:a.txt -> Z:\currentpath\a.txt
-                        target.startsWith(QLatin1Char('/'))    // It's a absolute path to the current drive, so \a.txt -> Z:\a.txt
-                        ) {
+                if (::isRelativePath(target)) {
+                    if ((target.size() > 2 && target.at(1) == QLatin1Char(':') &&
+                         target.at(2) != QLatin1Char('/')) ||    // path relative to the current dir of the given drive, so Z:a.txt -> Z:\currentpath\a.txt
+                        (target.startsWith(QLatin1Char('/')))) { // path relative to the root of the current drive, so \a.txt -> Z:\a.txt
                         char buf[PATH_MAX+1];
                         strcpy(buf, QFile::encodeName(target).constData());
                         _abspath(buf, buf, sizeof(buf));
-                        ret = QFile::decodeName(buf);
+                        ret = QDir::cleanPath(QFile::decodeName(buf));
+                        if (::isRelativePath(ret)) {
+                            // still relative, this means we have "Z:aaa" but there is no such drive Z:
+                            // just assume root is the current dir on Z:
+                            Q_ASSERT(ret.at(1) == QLatin1Char(':'));
+                            ret.insert(2, QLatin1Char('/'));
+                        }
                     } else {
-                        ret = target;
+                        if (S_ISDIR(d->st.st_mode)) {
+                            QDir parent(d->filePath);
+                            parent.cdUp();
+                            ret = parent.path();
+                            if (!ret.isEmpty() && !ret.endsWith(QLatin1Char('/')))
+                                ret += QLatin1Char('/');
+                        }
+                        ret += target;
+
+                        if (::isRelativePath(ret)) {
+                            if (!isRelativePath()) {
+                                ret.prepend(d->filePath.left(d->filePath.lastIndexOf(QLatin1Char('/')))
+                                            + QLatin1Char('/'));
+                            } else {
+                                ret.prepend(QDir::currentPath() + QLatin1Char('/'));
+                            }
+                        }
+                        ret = QDir::cleanPath(ret);
+                        if (ret.size() > 1 && ret.endsWith(QLatin1Char('/')))
+                            ret.chop(1);
                     }
                 } else {
-                    if (S_ISDIR(d->st.st_mode)) {
-                        QDir parent(d->filePath);
-                        parent.cdUp();
-                        ret = parent.path();
-                        if (!ret.isEmpty() && !ret.endsWith(QLatin1Char('/')))
-                            ret += QLatin1Char('/');
-                    }
-                    ret += target;
-
-                    if (::isRelativePath(ret)) {
-                        if (!isRelativePath()) {
-                            ret.prepend(d->filePath.left(d->filePath.lastIndexOf(QLatin1Char('/')))
-                                        + QLatin1Char('/'));
-                        } else {
-                            ret.prepend(QDir::currentPath() + QLatin1Char('/'));
-                        }
-                    }
-                    ret = QDir::cleanPath(ret);
-                    if (ret.size() > 1 && ret.endsWith(QLatin1Char('/')))
-                        ret.chop(1);
+                    ret = target;
                 }
 
+
                 // The path should be absolute at this point.
-                // From the docs :
-                // Absolute paths begin with the directory separator "/"
-                // (optionally preceded by a drive specification under Windows).
-                if (ret.at(0) != QLatin1Char('/')) {
+                // On OS/2, the absolute path always contains a "X:/" at the begining
+                // where X is the drive letter, or "//" if it's a network share
+                if (!ret.startsWith("//")) {
                     Q_ASSERT(ret.length() >= 2);
                     Q_ASSERT(ret.at(0).isLetter());
                     Q_ASSERT(ret.at(1) == QLatin1Char(':'));
+
+
+
+
+
+
 
                     // Force uppercase drive letters.