Changeset 18

Timestamp:

Jun 6, 2009, 11:27:15 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: Adopted QFSFileEngine for OS/2 (posix-style).

Location:

trunk

Files:

• mkspecs/os2-g++/qplatformdefs.h (modified) (4 diffs)
• qmake/Makefile.os2-g++ (modified) (2 diffs)
• src/corelib/io/io.pri (modified) (1 diff)
• src/corelib/io/qfsfileengine_iterator_os2.cpp (copied) (copied from trunk/src/corelib/io/qfsfileengine_iterator_unix.cpp ) (1 diff)
• src/corelib/io/qfsfileengine_os2.cpp (copied) (copied from trunk/src/corelib/io/qfsfileengine_unix.cpp ) (6 diffs)
• src/corelib/io/qfsfileengine_p.h (modified) (1 diff)

trunk/mkspecs/os2-g++/qplatformdefs.h

@@ -58 +58 @@
 // @todo
 //#ifdef QT_LARGEFILE_SUPPORT
-//#define QT_STATBUF            struct _stati64         // non-ANSI defs
-//#define QT_STATBUF4TSTAT      struct _stati64         // non-ANSI defs
-//#define QT_STAT                       ::_stati64
-//#define QT_FSTAT              ::_fstati64
-//#else
+// provide large file versions of functions?
+//#endif
 #define QT_STATBUF              struct stat
 #define QT_STATBUF4TSTAT        struct stat
@@ -68 +65 @@
 #define QT_FSTAT                ::fstat
 #define QT_LSTAT                ::lstat
-//#endif
 #define QT_STAT_REG             S_IFREG
 #define QT_STAT_DIR             S_IFDIR
@@ -77 +73 @@
 #define QT_FILENO               fileno
 #define QT_OPEN                 ::open
+#define QT_TRUNCATE     ::truncate
+#define QT_FTRUNCATE    ::ftruncate
 #define QT_CLOSE                ::close
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_LSEEK                ::lseeki64
-#define QT_TSTAT                ::stati64
-#else
 #define QT_LSEEK                ::lseek
-#define QT_TSTAT                ::stat
-#endif
 #define QT_READ                 ::read
 #define QT_WRITE                ::write
@@ -105 +97 @@
 
 #define QT_FOPEN                ::fopen
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FSEEK                ::fseeko64
-#define QT_FTELL                ::ftello64
-#else
 #define QT_FSEEK                ::fseek
 #define QT_FTELL                ::ftell
-#endif
 #define QT_FGETPOS              ::fgetpos
 #define QT_FSETPOS              ::fsetpos
 #define QT_FPOS_T               fpos_t
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_OFF_T                off64_t
-#else
 #define QT_OFF_T                long
-#endif
 
 #define QT_SIGNAL_ARGS          int

trunk/qmake/Makefile.os2-g++

@@ -60 +60 @@
         qfsfileengine.obj \
         qfsfileengine_iterator.obj \
-        qfsfileengine_pm.obj \
-        qfsfileengine_iterator_pm.obj \
+        qfsfileengine_os2.obj \
+        qfsfileengine_iterator_os2.obj \
         qglobal.obj \
         qhash.obj \
@@ -220 +220 @@
         $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
 
-qfsfileengine_pm.obj: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_pm.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_pm.cpp
-
-qfsfileengine_iterator_pm.obj: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_pm.cpp
-        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_pm.cpp
+qfsfileengine_os2.obj: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_os2.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_os2.cpp
+
+qfsfileengine_iterator_os2.obj: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_os2.cpp
+        $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_os2.cpp
 
 qfsfileengine.obj: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp

trunk/src/corelib/io/io.pri

@@ -60 +60 @@
         HEADERS += io/qwindowspipewriter_p.h
         SOURCES += io/qwindowspipewriter.cpp
+} else:os2 {
+        SOURCES += io/qsettings_os2.cpp
+        SOURCES += io/qprocess_os2.cpp
+        SOURCES += io/qfsfileengine_os2.cpp
+
+        SOURCES += io/qfsfileengine_iterator_os2.cpp
+        SOURCES += io/qfilesystemwatcher_os2.cpp
+        HEADERS += io/qfilesystemwatcher_os2_p.h
 } else:unix {
         SOURCES += io/qfsfileengine_unix.cpp

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -44 +44 @@
 
 #include <QtCore/qvariant.h>
+
+#include <dirent.h>
+#include <unistd.h>
 
 #ifndef QT_NO_FSFILEENGINE

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -59 +59 @@
 #include <limits.h>
 #include <errno.h>
-#if !defined(QWS) && defined(Q_OS_MAC)
-# include <private/qcore_mac_p.h>
-#endif
+#include <unistd.h>
+
+#include <pwd.h>
+#include <grp.h>
 
 QT_BEGIN_NAMESPACE
@@ -119 +120 @@
     }
 
-#ifdef O_CLOEXEC
-    // supported on Linux >= 2.6.23; avoids one extra system call
-    // and avoids a race condition: if another thread forks, we could
-    // end up leaking a file descriptor...
-    oflags |= O_CLOEXEC;
-#endif
     return oflags;
 }
@@ -178 +173 @@
         }
 
-#ifndef O_CLOEXEC
-        // not needed on Linux >= 2.6.23
         setCloseOnExec(fd);     // ignore failure
-#endif
 
         // Seek to the end when in Append mode.
@@ -956 +948 @@
 uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags)
 {
+#if 1
+    // @todo mmap() and friends isn't implemented in kLIBC yet...
+    return 0;
+#else
     Q_Q(QFSFileEngine);
     Q_UNUSED(flags);
@@ -997 +993 @@
     }
     return 0;
+#endif
 }
 
 bool QFSFileEnginePrivate::unmap(uchar *ptr)
 {
+#if 1
+    // @todo mmap() and friends isn't implemented in kLIBC yet...
+    return false;
+#else
     Q_Q(QFSFileEngine);
     if (!maps.contains(ptr)) {
@@ -1015 +1016 @@
     maps.remove(ptr);
     return true;
+#endif
 }
 

trunk/src/corelib/io/qfsfileengine_p.h

@@ -139 +139 @@
     mutable uint could_stat : 1;
     mutable uint tried_stat : 1;
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     mutable uint need_lstat : 1;
     mutable uint is_link : 1;