Changeset 1117 for trunk/src

Timestamp:

Mar 5, 2013, 11:30:56 PM (12 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Make QFileInfo returned by QDirIterator report symlinks properly.

In QT_OS2_USE_DOSFINDFIRST mode (which is ON now), we use
DosFindFirst which is unaware of symlinks and doesn't properly resolve that.
Given that in many other places kLIBC functions are used which handle symlinks
pretty well, this would completely confuse some apps like QFileDialog (see #284).

This fix removes this inconsistency.

Location:

trunk/src/corelib/io

Files:

• qfsfileengine_iterator_os2.cpp (modified) (2 diffs)
• qfsfileengine_os2.cpp (modified) (2 diffs)

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -52 +52 @@
 #include <QtCore/qvariant.h>
 
+#include <unistd.h>
 #ifndef QT_OS2_USE_DOSFINDFIRST
 #include <dirent.h>
-#include <unistd.h>
 #else
 #include <QtCore/qdatetime.h>
@@ -360 +360 @@
     }
 
+    // we have to use stat() to see if it's a kLIBC-like symlink
+    QByteArray fn = QFile::encodeName(fileName);
+    QT_STATBUF st;
+    if ((QT_LSTAT(fn.constData(), &st) == 0) && S_ISLNK(st.st_mode))
+    {
+        char buf[PATH_MAX];
+        if (realpath(fn.constData(), buf) != NULL)
+        {
+            d_ptr->fileFlags |= QAbstractFileEngine::LinkType;
+            // query the real file instead of the symlink
+            FILESTATUS3L fst;
+            APIRET arc = DosQueryPathInfo(buf, FIL_STANDARDL, &fst, sizeof(fst));
+            if (arc == NO_ERROR)
+            {
+                // replace the information in the find buffer
+                ffb->fdateCreation = fst.fdateCreation;
+                ffb->ftimeCreation = fst.ftimeCreation;
+                ffb->fdateLastAccess = fst.fdateLastAccess;
+                ffb->ftimeLastAccess = fst.ftimeLastAccess;
+                ffb->fdateLastWrite = fst.fdateLastWrite;
+                ffb->ftimeLastWrite = fst.ftimeLastWrite;
+                ffb->cbFile = fst.cbFile;
+                ffb->cbFileAlloc = fst.cbFileAlloc;
+                ffb->attrFile = fst.attrFile;
+            }
+            else
+            {
+                // mark as broken symlink
+                d_ptr->fileFlags &= ~QAbstractFileEngine::ExistsFlag;
+            }
+        }
+    }
+
     if (ffb->attrFile & FILE_DIRECTORY)
         d_ptr->fileFlags |= QAbstractFileEngine::DirectoryType;

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
-// temporary, until struct dirent in kLIBC gets creation and access time fields
-#define QT_OS2_USE_DOSFINDFIRST
-
 #include "qplatformdefs.h"
 #include "qabstractfileengine.h"
@@ -677 +674 @@
             is_link = false;        // drive/share names are never symlinks
         } else {
-#ifdef QT_OS2_USE_DOSFINDFIRST
-            is_link = false;
-#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;
-#endif
         }
     }