Changeset 365 for trunk/src

Timestamp:

Nov 30, 2009, 11:51:23 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: Make sure QDir::absoluteFilePath() works correctly on OS/2 (this is the only bit left after rolling back r355 and friends).

Location:

trunk/src/corelib/io

Files:

• qdir.cpp (modified) (2 diffs)
• qfsfileengine_os2.cpp (modified) (3 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -732 +732 @@
 {
     Q_D(const QDir);
+
+#ifdef Q_OS_OS2
+
+    // On OS/2, paths like "A:bbb.txt" and "\ccc.dat" are not absolute (because
+    // they may lead to different locations depending on where we are). This
+    // requires special processing here. Don't be confused that everywhere else
+    // in Qt (except QFSFileEngine::fileName() on OS/2) these paths will be
+    // still considered absolute -- the latter is already so confusing and
+    // inconsistent that we cannot make it any worse, while this function is
+    // the only way to properly handle such paths w/o introducing custom
+    // processing in each Qt application and we rely on it at least in
+    // QLibraryInfo. See also isRelativePath() and isNotReallyAbsolutePath() in
+    // qfsfileengine_os2.cpp.
+
+    QString fn = QDir::fromNativeSeparators(fileName);
+    if (!d->data->fileEngine)
+        return fn;
+
+    bool curDriveRelative = false;
+    bool curDirOnDriveRelative = false;
+    if (isAbsolutePath(fn)) {
+        // filter out not really absolute cases
+        QChar ch0, ch1, ch2;
+        if (fn.length()) ch0 = fn.at(0);
+        if (fn.length() > 1) ch1 = fn.at(1);
+        if (fn.length() > 2) ch2 = fn.at(2);
+        curDriveRelative = ch0 == QLatin1Char('/') && ch1 != QLatin1Char('/'); // "\ccc.dat"
+        if (!curDriveRelative) {
+            curDirOnDriveRelative = ch0.isLetter() && ch1 == QLatin1Char(':') && // "A:bbb.txt" (but not A:)
+                                    !ch2.isNull() && ch2 != QLatin1Char('/');
+            if (!curDirOnDriveRelative) {
+                return fn; // really absolute ("A:\bla...", "\\server\share"), nothing to do
+            }
+        }
+    }
+
+    QString ret = d->data->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
+
+    if (!fn.isEmpty()) {
+        if (curDirOnDriveRelative) {
+            // QFileInfo::absoluteFilePath() knows what to do
+            ret = QFileInfo(fn).absoluteFilePath();
+        } else {
+            if (curDriveRelative)
+                ret = ret.left(2); // only take the drive name from this QDir
+            else if (!ret.isEmpty() && !ret.endsWith(QLatin1Char('/')))
+                ret += QLatin1Char('/'); // append the missing slash
+            ret += fn;
+        }
+    }
+    return ret;
+
+#else // #ifdef Q_OS_OS2
+
     if (isAbsolutePath(fileName))
         return fileName;
@@ -753 +807 @@
     }
     return ret;
+
+#endif // #ifdef Q_OS_OS2
 }
 

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, paths like "A:bbb.txt" and "\ccc.dat" are not absolute (because
+    // they may lead to different locations depending on where we are). However,
+    // fixing this function will break an unfixable amount of invalid code in Qt
+    // and qmake (just search for isRelativePath in there) so that we have to
+    // live with it... See also QDir::absoluteFilePath() and
+    // isNotReallyAbsolutePath() below.
+
+    return !(path.startsWith(QLatin1Char('/')) || // "\ccc.dat" or "\\server\share..."
+             (path.length() >= 2 && path.at(0).isLetter() && // "A:bbb..." or "A:\bbb..."
+              path.at(1) == QLatin1Char(':')));
+}
+
+static bool isNotReallyAbsolutePath(const QString &path)
+{
+    // see isRelativePath(). Intended to detect a false absolute case when
+    // isRelativePath() returns true
+
+    QChar ch0, ch1, ch2;
+    if (path.length()) ch0 = path.at(0);
+    if (path.length() > 1) ch1 = path.at(1);
+    if (path.length() > 2) ch2 = path.at(2);
+    return ((ch0 == QLatin1Char('/') && ch1 != QLatin1Char('/')) || // "\ccc.dat"
+            (ch0.isLetter() && ch1 == QLatin1Char(':') && // "A:bbb.txt" (but not A:)
+             !ch2.isNull() && ch2 != QLatin1Char('/')));
 }
 
@@ -687 +707 @@
         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(d->filePath)) {
+            if (::isNotReallyAbsolutePath(d->filePath)) {
                 char buf[PATH_MAX+1];
                 strcpy(buf, QFile::encodeName(d->filePath).constData());
@@ -749 +766 @@
                 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 (::isNotReallyAbsolutePath(target)) {
                         char buf[PATH_MAX+1];
                         strcpy(buf, QFile::encodeName(target).constData());