Changeset 178 for trunk/src/corelib/io

Timestamp:

Sep 11, 2009, 2:30:36 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed: QDirIterator("X:") would iterate over the current directory instead of the root. This eventually fixes problem 1 from #59.

File:

• trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp (modified) (1 diff)

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -121 +121 @@
     if (!platform->done && !platform->dir) {
         QFSFileEngineIterator *that = const_cast<QFSFileEngineIterator *>(this);
-        if ((that->platform->dir = ::opendir(QFile::encodeName(path()).data())) == 0) {
+        QString path = that->path();
+        // ensure the directory ends with a slash, otherwise for paths like 'X:'
+        // we'll get the current directory's listing instead of the expected root
+        if (!path.endsWith(QLatin1Char('/')))
+            path.append(QLatin1Char('/'));
+        if ((that->platform->dir = ::opendir(QFile::encodeName(path).data())) == 0) {
             that->platform->done = true;
         } else {
             // ### Race condition; we should use fpathconf and dirfd().
-            long maxPathName = ::pathconf(QFile::encodeName(path()).data(), _PC_NAME_MAX);
+            long maxPathName = ::pathconf(QFile::encodeName(path).data(), _PC_NAME_MAX);
             if ((int) maxPathName == -1)
                 maxPathName = FILENAME_MAX;