Changeset 532

Timestamp:

Feb 5, 2010, 1:54:11 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed: QFileInfo::isExecutable() would return true for all files on local OS/2 file systems.

File:

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

trunk/src/corelib/io/qfileinfo.cpp

@@ -171 +171 @@
         break;
     };
-#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
+#ifdef Q_OS_UNIX
+    return QT_ACCESS(QFile::encodeName(data->fileName).data(), mode) == 0;
+#endif
+#ifdef Q_OS_OS2
+    if ((access == ReadAccess && !getFileFlags(QAbstractFileEngine::ReadUserPerm))
+        || (access == WriteAccess && !getFileFlags(QAbstractFileEngine::WriteUserPerm))) {
+        return false;
+    }
+    if (access == ExecuteAccess)
+        return getFileFlags(QAbstractFileEngine::ExeUserPerm);
+
     return QT_ACCESS(QFile::encodeName(data->fileName).data(), mode) == 0;
 #endif