Changeset 683

Timestamp:

Mar 15, 2010, 6:30:56 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed r614 regression (QDir(<relative_path>) would contain no directory items to iterate).

File:

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

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -128 +128 @@
         if (!path.endsWith(QLatin1Char('/')))
             path.append(QLatin1Char('/'));
-        // check that the drive is ready before trying to open it which reduces
-        // delays and noise for drives with no media inserted
-        BYTE drv[3] = { path.at(0).cell(), ':', '\0' };
-        BYTE buf[sizeof(FSQBUFFER2) + (3 * CCHMAXPATH)] = {0};
-        ULONG bufSize = sizeof(buf);
-        PFSQBUFFER2 pfsq = (PFSQBUFFER2) buf;
-        APIRET arc = DosQueryFSAttach(drv, 0, FSAIL_QUERYNAME, pfsq, &bufSize);
+        APIRET arc = NO_ERROR;
+        if (path.size() >= 2 && path.at(0).isLetter() && path.at(1) == QLatin1Char(':')) {
+            // check that the drive is ready before trying to open it which reduces
+            // delays and noise for drives with no media inserted
+            BYTE drv[3] = { path.at(0).cell(), ':', '\0' };
+            BYTE buf[sizeof(FSQBUFFER2) + (3 * CCHMAXPATH)] = {0};
+            ULONG bufSize = sizeof(buf);
+            PFSQBUFFER2 pfsq = (PFSQBUFFER2) buf;
+            arc = DosQueryFSAttach(drv, 0, FSAIL_QUERYNAME, pfsq, &bufSize);
+        }
         if (arc != NO_ERROR) {
             that->platform->dir = 0;
@@ -141 +144 @@
             that->platform->done = true;
         } else {
-            // ### Race condition; we should use fpathconf and dirfd().
-            long maxPathName = ::pathconf(QFile::encodeName(path).data(), _PC_NAME_MAX);
-            if ((int) maxPathName == -1)
-                maxPathName = FILENAME_MAX;
+            long maxPathName = CCHMAXPATH;
             maxPathName += sizeof(dirent) + 1;
 #if defined(_POSIX_THREAD_SAFE_FUNCTIONS)