Changeset 367 for trunk/src

Timestamp:

Dec 1, 2009, 2:24:09 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: Fixed: QDir::midir()/mkpath()/rmdir()/rmpath() didn't properly handle relative paths and UNC paths which could result into a false failure to create a requested path or creating it at the wrong location.

Location:

trunk/src/corelib/io

Files:

• qdir.cpp (modified) (4 diffs)
• qfsfileengine_os2.cpp (modified) (5 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -1480 +1480 @@
         return false;
 
+#ifdef Q_OS_OS2
+    // see QDir::absoluteFilePath() and QFSFileEngine::mkdir()
+    QString fn = absoluteFilePath(dirName);
+#else
     QString fn = filePath(dirName);
+#endif
     return d->data->fileEngine->mkdir(fn, false);
 }
@@ -1505 +1510 @@
         return false;
 
+#ifdef Q_OS_OS2
+    // see QDir::absoluteFilePath() and QFSFileEngine::rmdir()
+    QString fn = absoluteFilePath(dirName);
+#else
     QString fn = filePath(dirName);
+#endif
     return d->data->fileEngine->rmdir(fn, false);
 }
@@ -1531 +1541 @@
         return false;
 
+#ifdef Q_OS_OS2
+    // see QDir::absoluteFilePath() and QFSFileEngine::mkdir()
+    QString fn = absoluteFilePath(dirPath);
+#else
     QString fn = filePath(dirPath);
+#endif
     return d->data->fileEngine->mkdir(fn, true);
 }
@@ -1557 +1572 @@
         return false;
 
+#ifdef Q_OS_OS2
+    // see QDir::absoluteFilePath() and QFSFileEngine::rmdir()
+    QString fn = absoluteFilePath(dirPath);
+#else
     QString fn = filePath(dirPath);
+#endif
     return d->data->fileEngine->rmdir(fn, true);
 }

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -138 +138 @@
 }
 
+static bool isRelativePath(const QString &path)
+{
+    // 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('/')));
+}
+
 /*!
     \internal
@@ -401 +429 @@
 bool QFSFileEngine::mkdir(const QString &name, bool createParentDirectories) const
 {
-    QString dirName = name;
+    // Note: according to what I see in implementations of this function on
+    // other platforms, it expects name to be the absolute path (since no
+    // member variables of this class are used in there). Thus, assert.
+    Q_ASSERT(!::isRelativePath(name) && !::isNotReallyAbsolutePath(name));
+    if (::isRelativePath(name) || ::isNotReallyAbsolutePath(name))
+        return false;
+
+    QString dirName = QDir::toNativeSeparators(QDir::cleanPath(name));
     if (createParentDirectories) {
-        dirName = QDir::cleanPath(dirName);
-        for(int oldslash = -1, slash=0; slash != -1; oldslash = slash) {
-            slash = dirName.indexOf(QDir::separator(), oldslash+1);
-            if (slash == -1) {
-                if (oldslash == dirName.length())
-                    break;
-                slash = dirName.length();
+        int sep = -1;
+        if (dirName.startsWith(QLatin1String("\\\\"))) {
+            // don't attempt to create a share on the server
+            sep = dirName.indexOf(QLatin1Char('\\'), 2);
+            if (sep)
+                sep = dirName.indexOf(QLatin1Char('\\'), sep + 1);
+            if (sep < 0) // "\\server" or "\\server\share"?
+                return false;
+        } else if (dirName.at(1) == QLatin1Char(':')) {
+            // don't attempt to create the root dir on drive
+            sep = 2;
+        }
+        while (sep < dirName.length()) {
+            sep = dirName.indexOf(QLatin1Char('\\'), sep + 1);
+            if (sep < 0)
+                sep = dirName.length();
+            QByteArray chunk = QFile::encodeName(dirName.left(sep));
+            QT_STATBUF st;
+            if (QT_STAT(chunk, &st) != -1) {
+                if ((st.st_mode & S_IFMT) != S_IFDIR)
+                    return false;
+            } else if (::mkdir(chunk, 0777) != 0) {
+                    return false;
             }
-            if (slash) {
-                QByteArray chunk = QFile::encodeName(dirName.left(slash));
-                QT_STATBUF st;
-                if (QT_STAT(chunk, &st) != -1) {
-                    if ((st.st_mode & S_IFMT) != S_IFDIR)
-                        return false;
-                } else if (::mkdir(chunk, 0777) != 0) {
-                        return false;
-                }
-            }
         }
         return true;
@@ -429 +470 @@
 bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) const
 {
-    QString dirName = name;
+    // Note: according to what I see in implementations of this function on
+    // other platforms, it expects name to be the absolute path (since no
+    // member variables of this class are used in there). Thus, assert.
+    Q_ASSERT(!::isRelativePath(name) && !::isNotReallyAbsolutePath(name));
+    if (::isRelativePath(name) || ::isNotReallyAbsolutePath(name))
+        return false;
+
+    QString dirName = QDir::toNativeSeparators(QDir::cleanPath(name));
     if (recurseParentDirectories) {
-        dirName = QDir::cleanPath(dirName);
-        for(int oldslash = 0, slash=dirName.length(); slash > 0; oldslash = slash) {
-            QByteArray chunk = QFile::encodeName(dirName.left(slash));
+        int lastSep = -1;
+        if (dirName.startsWith(QLatin1String("\\\\"))) {
+            // don't attempt to delete a share on the server
+            lastSep = dirName.indexOf(QLatin1Char('\\'), 2);
+            if (lastSep)
+                lastSep = dirName.indexOf(QLatin1Char('\\'), lastSep + 1);
+            if (lastSep < 0) // "\\server" or "\\server\share"?
+                return false;
+        } else if (dirName.at(1) == QLatin1Char(':')) {
+            // don't attempt to delete the root dir on the drive
+            lastSep = 2;
+        }
+        int sep = dirName.length();
+        while (sep > lastSep) {
+            QByteArray chunk = QFile::encodeName(dirName.left(sep));
             QT_STATBUF st;
             if (QT_STAT(chunk, &st) != -1) {
@@ -439 +499 @@
                     return false;
                 if (::rmdir(chunk) != 0)
-                    return oldslash != 0;
+                    return sep < dirName.length();
             } else {
                 return false;
             }
-            slash = dirName.lastIndexOf(QDir::separator(), oldslash-1);
+            sep = dirName.lastIndexOf(QLatin1Char('\\'), sep - 1);
         }
         return true;
@@ -646 +706 @@
     }
     return ret;
-}
-
-static bool isRelativePath(const QString &path)
-{
-    // 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('/')));
 }