Changeset 612

Timestamp:

Feb 27, 2010, 12:21:56 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Always return true from QFileInfo::isRoot()/isDir() for paths referring to root directories of drives with no media and always return false from QFileInfo::exists() for them (fixes the original problem from #137). Also, don't lstat() on such paths since they are definitely not symlinks.

Location:

trunk/src/corelib/io

Files:

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

trunk/src/corelib/io/qfsfileengine.cpp

@@ -114 +114 @@
     is_link = 0;
 #endif
-#if defined(Q_OS_OS2)
-    not_ready = 0;
-#endif
     openMode = QIODevice::NotOpen;
     fd = -1;

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -138 +138 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static bool isRelativePath(const QString &path)
 {
@@ -642 +657 @@
                 // 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};
@@ -649 +663 @@
                 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) {
+                if (arc != NO_ERROR) {
                     could_stat = false;
                 } else {
@@ -676 +684 @@
         QFSFileEnginePrivate *that = const_cast<QFSFileEnginePrivate *>(this);
         that->need_lstat = false;
-        QT_STATBUF st;          // don't clobber our main one
-        that->is_link = (QT_LSTAT(nativeFilePath.constData(), &st) == 0) ? S_ISLNK(st.st_mode) : false;
+        if (isDriveRootPath(filePath) || isUncRootPath(filePath)) {
+            is_link = false;        // drive/share names are never symlinks
+        } else {
+            QT_STATBUF st;          // don't clobber our main one
+            that->is_link = (QT_LSTAT(nativeFilePath.constData(), &st) == 0) ?
+                            S_ISLNK(st.st_mode) : false;
+        }
     }
     return is_link;
@@ -688 +701 @@
 {
     Q_D(const QFSFileEngine);
+
     // Force a stat, so that we're guaranteed to get up-to-date results
-    if (type & QAbstractFileEngine::FileFlag(QAbstractFileEngine::Refresh)) {
+    if (type & ) {
         d->tried_stat = 0;
         d->need_lstat = 1;
     }
 
+
+
+
     QAbstractFileEngine::FileFlags ret = 0;
-    bool exists = d->doStat();
-    if (!exists && !d->isSymlink())
+
+    // flags that don't need doStat()
+    if (type & FlagsMask) {
+        ret |= LocalDiskFlag;
+        if (isRoot)
+            ret |= RootFlag;
+    }
+    if (type & TypesMask) {
+        if (isRoot)
+            ret |= DirectoryType;
+        // note: drive/share names are never symlinks
+        else if ((type & LinkType) && d->isSymlink())
+            ret |= LinkType;
+    }
+
+    if (!exists)
         return ret;
 
-    if (exists && (type & PermsMask)) {
+    // flags that need doStat()
+    if (type & PermsMask) {
         if (d->st.st_mode & S_IRUSR)
             ret |= ReadOwnerPerm;
@@ -726 +758 @@
     }
     if (type & TypesMask) {
-        {
-            if ((type & LinkType) && d->isSymlink())
-                ret |= LinkType;
-            if (exists && (d->st.st_mode & S_IFMT) == S_IFREG)
-                ret |= FileType;
-            else if (exists && (d->st.st_mode & S_IFMT) == S_IFDIR)
-                ret |= DirectoryType;
-        }
+        if ((d->st.st_mode & S_IFMT) == S_IFREG)
+            ret |= FileType;
+        else if ((d->st.st_mode & S_IFMT) == S_IFDIR)
+            ret |= DirectoryType;
     }
     if (type & FlagsMask) {
-        ret |= LocalDiskFlag;
-        if (exists)
-            ret |= ExistsFlag;
+        ret |= ExistsFlag;
         if (d->st.st_attr & FILE_HIDDEN)
             ret |= HiddenFlag;
-        if (isDriveRootPath(d->filePath))
-            ret |= RootFlag;
-    }
+    }
+
     return ret;
 }
@@ -1002 +1027 @@
     Q_D(const QFSFileEngine);
     QDateTime ret;
-    if (d->doStat() && !d->not_ready) {
+    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

@@ -138 +138 @@
     mutable uint is_link : 1;
 #endif
-#if defined(Q_OS_OS2)
-    mutable uint not_ready : 1;
-#endif
 
     bool doStat() const;