Changeset 1042 for trunk

Timestamp:

Sep 1, 2011, 6:40:32 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

Don't eat drive letters in QDir::cleanPath().

For paths like "D:/../myfile", it would return "myfile" on all platforms while on
e.g. Windows and OS/2 "D:/" means the root directory and must not be removed.
Now, cleanPath() will leave it as "D:/../myfile" in such cases (similar to Linux
returning "/../myfile" unmodified).

The correctness of "/../myfile" itself is questionable (at least Linux treats such
paths as if there was no ".." and so does the native OS/2 call when resolving the
absolute file path), but it's a different story.

File:

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

trunk/src/corelib/io/qdir.cpp

@@ -2041 +2041 @@
     if (dir_separator != QLatin1Char('/'))
        name.replace(dir_separator, QLatin1Char('/'));
+
+
+
+
 
     int used = 0, levels = 0;
@@ -2152 +2156 @@
     }
 
+
+
+
     return ret;
 }