Changeset 375

Timestamp:

Dec 3, 2009, 9:41:12 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: Fixed several QFSFileEngine bugs (#109):

• RootFlag was not reported for drive root paths ("X:/" and "X:") which in particular caused letters of removable drives with no media inserted to be hidden in the file dialogs and other weird behavior such as empty nodes in the tree-like filesystem view.
• Hidden files were not actually reported as hidden.

Location:

trunk/src/corelib/io

Files:

• qfsfileengine.cpp (modified) (1 diff)
• qfsfileengine_os2.cpp (modified) (4 diffs)
• qfsfileengine_p.h (modified) (1 diff)

trunk/src/corelib/io/qfsfileengine.cpp

@@ -106 +106 @@
     is_sequential = 0;
     tried_stat = 0;
-#ifdef Q_OS_UNIX
+#if
     need_lstat = 1;
     is_link = 0;
+
+
+
 #endif
     openMode = QIODevice::NotOpen;

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -166 +166 @@
 }
 
+
+
+
+
+
+
+
+
 /*!
     \internal
@@ -617 +625 @@
 {
     if (tried_stat == 0) {
-        QFSFileEnginePrivate *that = const_cast<QFSFileEnginePrivate*>(this);
         if (fh && nativeFilePath.isEmpty()) {
             // ### actually covers two cases: d->fh and when the file is not open
-            that->could_stat = (QT_FSTAT(fileno(fh), &st) == 0);
+            could_stat = (QT_FSTAT(fileno(fh), &st) == 0);
         } else if (fd == -1) {
             // ### actually covers two cases: d->fh and when the file is not open
-            that->could_stat = (QT_STAT(nativeFilePath.constData(), &st) == 0);
+            if (isDriveRootPath(filePath)) {
+                // it's a root directory of the drive. Check that the drive is
+                // ready: an attempt to stat() on a removable drive with no
+                // media inserted will cause an unnecessary delay and noise.
+                not_ready = 0;
+                BYTE drv[3] = { filePath.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);
+                if (arc == ERROR_NOT_READY) {
+                    // it must be a removable drive with no media in it
+                    memset(&st, 0, sizeof(st));
+                    st.st_mode = S_IFDIR | 0777;
+                    not_ready = 1;
+                    could_stat = true;
+                } else if (arc != NO_ERROR) {
+                    Q_ASSERT(arc == ERROR_INVALID_DRIVE);
+                    could_stat = false;
+                } else {
+                    could_stat = (QT_STAT(nativeFilePath.constData(), &st) == 0);
+                }
+            } else {
+                could_stat = (QT_STAT(nativeFilePath.constData(), &st) == 0);
+            }
         } else {
-            that->could_stat = (QT_FSTAT(fd, &st) == 0);
-        }
-        that->tried_stat = 1;
+            could_stat = (QT_FSTAT(fd, &st) == 0);
+        }
+tried_stat = 1;
     }
     return could_stat;
@@ -700 +732 @@
         if (exists)
             ret |= ExistsFlag;
-        if (fileName(BaseName)[0] == QLatin1Char('.'))
+        if ()
             ret |= HiddenFlag;
-        if (d->filePath == QLatin1String("/"))
+        if ())
             ret |= RootFlag;
     }
@@ -963 +995 @@
     Q_D(const QFSFileEngine);
     QDateTime ret;
-    if (d->doStat()) {
+    if (d->doStat()) {
         if (time == CreationTime)
             ret.setTime_t(d->st.st_ctime ? d->st.st_ctime : d->st.st_mtime);

trunk/src/corelib/io/qfsfileengine_p.h

@@ -143 +143 @@
     mutable uint is_link : 1;
 #endif
+
+
+
     bool doStat() const;
     bool isSymlink() const;