xti additions / changes, trying to reduce dependencies

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 99582fae2898945e44b4d102457493ca7999221f..3d6fde63ea9dd6aa45a67038e8c6767362c012fc 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -7,14 +7,14 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "file.h"
 #endif
 
     #pragma implementation "file.h"
 #endif
 


@@ -28,7 +28,7 @@
 #if wxUSE_FILE
 
 // standard
 #if wxUSE_FILE
 
 // standard

-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

   #include  <io.h>
 
 #ifndef __SALFORDC__
   #include  <io.h>
 
 #ifndef __SALFORDC__


@@ -54,10 +54,14 @@
     #define   NOMCX
 #endif
 
     #define   NOMCX
 #endif
 

+#elif defined(__WXMSW__) && defined(__WXWINCE__)
+    // TODO: what to include?

 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>

+    #include  <time.h>
+    #include  <sys/stat.h>

     #ifdef __GNUWIN32__
     #ifdef __GNUWIN32__

-        #include <windows.h>
+        #include "wx/msw/wrapwin.h"

     #endif
 #elif defined(__DOS__)
     #if defined(__WATCOMC__)
     #endif
 #elif defined(__DOS__)
     #if defined(__WATCOMC__)


@@ -71,8 +75,6 @@
     #endif
 #elif (defined(__WXPM__))
     #include <io.h>
     #endif
 #elif (defined(__WXPM__))
     #include <io.h>

-    #define   W_OK        2
-    #define   R_OK        4

 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>


@@ -84,28 +86,37 @@
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>

-    #define   W_OK        2
-    #define   R_OK        4

     #include  <unistd.h>
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
     #include  <unistd.h>
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants

+
+#ifndef __WXWINCE__

 #include  <fcntl.h>       // O_RDONLY &c
 #include  <fcntl.h>       // O_RDONLY &c

+#endif

 
 

-#ifndef __MWERKS__
+#ifdef __WXWINCE__
+// Nothing
+#elif !defined(__MWERKS__)

     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat

-#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+#elif defined(__MWERKS__) && ( defined(__WXMSW__) || defined(__MACH__) )

     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
 #endif
 
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
 #endif
 

-#if defined(__BORLANDC__) || defined(_MSC_VER)
-    #define   W_OK        2
-    #define   R_OK        4
-#endif
+// Windows compilers don't have these constants
+#ifndef W_OK
+    enum
+    {
+        F_OK = 0,   // test for existence
+        X_OK = 1,   //          execute permission
+        W_OK = 2,   //          write
+        R_OK = 4    //          read
+    };
+#endif // W_OK

 
 // there is no distinction between text and binary files under Unix, so define
 // O_BINARY as 0 if the system headers don't do it already
 
 // there is no distinction between text and binary files under Unix, so define
 // O_BINARY as 0 if the system headers don't do it already


@@ -138,11 +149,16 @@
 
 #include  "wx/filename.h"
 #include  "wx/file.h"
 
 #include  "wx/filename.h"
 #include  "wx/file.h"

+#include  "wx/filefn.h"

 
 #ifdef __WXMSW__
     #include "wx/msw/mslu.h"
 #endif
 
 
 #ifdef __WXMSW__
     #include "wx/msw/mslu.h"
 #endif
 

+#ifdef __WXWINCE__
+    #include "wx/msw/private.h"
+#endif
+

 // ============================================================================
 // implementation of wxFile
 // ============================================================================
 // ============================================================================
 // implementation of wxFile
 // ============================================================================


@@ -150,19 +166,22 @@
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------

+

 bool wxFile::Exists(const wxChar *name)
 {
 bool wxFile::Exists(const wxChar *name)
 {

-    wxStructStat st;
-    return !wxAccess(name, 0) &&
-           !wxStat(name, &st) &&
-           (st.st_mode & S_IFREG);
+    return wxFileExists(name);

 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)
 {
 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)
 {

-    int how = 0;
+    int how;
+
+    switch ( mode )
+    {
+        default:
+            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+            // fall through

 
 

-    switch ( mode ) {

         case read:
             how = R_OK;
             break;
         case read:
             how = R_OK;
             break;


@@ -171,11 +190,17 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             how = W_OK;
             break;
 
             how = W_OK;
             break;
 

-        default:
-            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+        case read_write:
+            how = R_OK | W_OK;
+            break;

     }
 
     }
 

-    return wxAccess( name, how) == 0;
+#ifdef __WXWINCE__
+    // FIXME: use CreateFile with 0 access to query the file
+    return TRUE;
+#else
+    return wxAccess(name, how) == 0;
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -196,15 +221,26 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists

-#if defined(__WXMAC__) && !defined(__UNIX__)
+#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE

     // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
     // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
     int fd = creat( szFileName , accessMode);
     // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
     // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
     int fd = creat( szFileName , accessMode);

+#else
+#ifdef __WXWINCE__
+    HANDLE fileHandle = ::CreateFile(szFileName, GENERIC_WRITE, 0, NULL,
+        bOverwrite ? CREATE_ALWAYS : CREATE_NEW, FILE_ATTRIBUTE_NORMAL,
+        0);
+    int fd = 0;
+    if (fileHandle == INVALID_HANDLE_VALUE)
+        fd = (int) fileHandle;
+    else
+        fd = -1;

 #else
     int fd = wxOpen( szFileName,
                      O_BINARY | O_WRONLY | O_CREAT |
                      (bOverwrite ? O_TRUNC : O_EXCL)
                      ACCESS(accessMode) );
 #else
     int fd = wxOpen( szFileName,
                      O_BINARY | O_WRONLY | O_CREAT |
                      (bOverwrite ? O_TRUNC : O_EXCL)
                      ACCESS(accessMode) );

+#endif

 #endif
     if ( fd == -1 )
     {
 #endif
     if ( fd == -1 )
     {


@@ -221,6 +257,59 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 // open the file
 bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 {
 // open the file
 bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 {

+#ifdef __WXWINCE__
+    DWORD access = 0;
+    DWORD shareMode = 0;
+    DWORD disposition = 0;
+
+    int flags = O_BINARY;
+
+    switch ( mode )
+    {
+        case read:
+            access = GENERIC_READ;
+            shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+            disposition = OPEN_EXISTING;
+            break;
+
+        case write_append:
+            if ( wxFile::Exists(szFileName) )
+            {
+                access = GENERIC_READ|GENERIC_WRITE;
+                shareMode = FILE_SHARE_READ;
+                disposition = 0;
+                break;
+            }
+            //else: fall through as write_append is the same as write if the
+            //      file doesn't exist
+
+        case write:
+            access = GENERIC_WRITE;
+            shareMode = 0;
+            disposition = TRUNCATE_EXISTING;
+            break;
+
+        case write_excl:
+            access = GENERIC_WRITE;
+            shareMode = 0;
+            disposition = TRUNCATE_EXISTING;
+            break;
+
+        case read_write:
+            access = GENERIC_READ|GENERIC_WRITE;
+            shareMode = 0;
+            disposition = 0;
+            break;
+    }
+
+    int fd = 0;
+    HANDLE fileHandle = ::CreateFile(szFileName, access, shareMode, NULL,
+        disposition, FILE_ATTRIBUTE_NORMAL, 0);
+    if (fileHandle == INVALID_HANDLE_VALUE)
+        fd = -1;
+    else
+        fd = (int) fileHandle;
+#else

     int flags = O_BINARY;
 
     switch ( mode )
     int flags = O_BINARY;
 
     switch ( mode )


@@ -252,6 +341,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
     }
 
     int fd = wxOpen( szFileName, flags ACCESS(accessMode));
     }
 
     int fd = wxOpen( szFileName, flags ACCESS(accessMode));

+#endif

     if ( fd == -1 )
     {
         wxLogSysError(_("can't open file '%s'"), szFileName);
     if ( fd == -1 )
     {
         wxLogSysError(_("can't open file '%s'"), szFileName);


@@ -267,7 +357,12 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 bool wxFile::Close()
 {
     if ( IsOpened() ) {
 bool wxFile::Close()
 {
     if ( IsOpened() ) {

-        if ( close(m_fd) == -1 ) {
+#ifdef __WXWINCE__
+        if (!CloseHandle((HANDLE) m_fd))
+#else
+        if ( close(m_fd) == -1 )
+#endif
+        {

             wxLogSysError(_("can't close file descriptor %d"), m_fd);
             m_fd = fd_invalid;
             return FALSE;
             wxLogSysError(_("can't close file descriptor %d"), m_fd);
             m_fd = fd_invalid;
             return FALSE;


@@ -288,7 +383,14 @@ off_t wxFile::Read(void *pBuf, off_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 

-#ifdef __MWERKS__
+#ifdef __WXWINCE__
+    DWORD bytesRead = 0;
+    int iRc = 0;
+    if (ReadFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL))
+        iRc = bytesRead;
+    else
+        iRc = -1;
+#elif defined(__MWERKS__)

     int iRc = ::read(m_fd, (char*) pBuf, nCount);
 #else
     int iRc = ::read(m_fd, pBuf, nCount);
     int iRc = ::read(m_fd, (char*) pBuf, nCount);
 #else
     int iRc = ::read(m_fd, pBuf, nCount);


@@ -306,7 +408,14 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 

-#ifdef __MWERKS__
+#ifdef __WXWINCE__
+    DWORD bytesRead = 0;
+    int iRc = 0;
+    if (WriteFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL))
+        iRc = bytesRead;
+    else
+        iRc = -1;
+#elif defined(__MWERKS__)

 #if __MSL__ >= 0x6000
     int iRc = ::write(m_fd, (void*) pBuf, nCount);
 #else
 #if __MSL__ >= 0x6000
     int iRc = ::write(m_fd, (void*) pBuf, nCount);
 #else


@@ -328,7 +437,9 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 bool wxFile::Flush()
 {
     if ( IsOpened() ) {
 bool wxFile::Flush()
 {
     if ( IsOpened() ) {

-#if defined(__VISUALC__) || wxHAVE_FSYNC
+#ifdef __WXWINCE__
+        // Do nothing
+#elif defined(__VISUALC__) || wxHAVE_FSYNC

         if ( wxFsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
         if ( wxFsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);


@@ -351,6 +462,34 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    int origin;
+    switch ( mode ) {
+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+
+        case wxFromStart:
+            origin = FILE_BEGIN;
+            break;
+
+        case wxFromCurrent:
+            origin = FILE_CURRENT;
+            break;
+
+        case wxFromEnd:
+            origin = FILE_END;
+            break;
+    }
+
+    DWORD res = SetFilePointer((HANDLE) m_fd, ofs, 0, origin) ;
+    if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR)
+    {
+        wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)res;
+#else

     int origin;
     switch ( mode ) {
         default:
     int origin;
     switch ( mode ) {
         default:


@@ -376,6 +515,7 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
     }
     else
         return (off_t)iRc;
     }
     else
         return (off_t)iRc;

+#endif

 }
 
 // get current off_t
 }
 
 // get current off_t


@@ -383,6 +523,16 @@ off_t wxFile::Tell() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    DWORD res = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT) ;
+    if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR)
+    {
+        wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)res;
+#else

     int iRc = wxTell(m_fd);
     if ( iRc == -1 ) {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
     int iRc = wxTell(m_fd);
     if ( iRc == -1 ) {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);


@@ -390,6 +540,7 @@ off_t wxFile::Tell() const
     }
     else
         return (off_t)iRc;
     }
     else
         return (off_t)iRc;

+#endif

 }
 
 // get current file length
 }
 
 // get current file length


@@ -397,6 +548,15 @@ off_t wxFile::Length() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT);
+    DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END);
+    off_t len = off1;
+
+    // Restore position
+    SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN);
+    return len;
+#else

 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++
 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++


@@ -422,6 +582,7 @@ off_t wxFile::Length() const
     }
     else
         return (off_t)iRc;
     }
     else
         return (off_t)iRc;

+#endif

 }
 
 // is end of file reached?
 }
 
 // is end of file reached?


@@ -429,6 +590,17 @@ bool wxFile::Eof() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

+#ifdef __WXWINCE__
+    DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT);
+    DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END);
+    if (off0 == off1)
+        return TRUE;
+    else
+    {
+        SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN);
+        return FALSE;
+    }
+#else

     int iRc;
 
 #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
     int iRc;
 
 #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)


@@ -459,6 +631,7 @@ bool wxFile::Eof() const
     }
 
     return TRUE;
     }
 
     return TRUE;

+#endif

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -502,9 +675,9 @@ bool wxTempFile::Open(const wxString& strName)
 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     mode_t mode;
 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     mode_t mode;

-
+    

     wxStructStat st;
     wxStructStat st;

-    if ( stat(m_strName.fn_str(), &st) == 0 )
+    if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )

     {
         mode = st.st_mode;
     }
     {
         mode = st.st_mode;
     }


@@ -517,7 +690,7 @@ bool wxTempFile::Open(const wxString& strName)
         umask(mask);
     }
 
         umask(mask);
     }
 

-    if ( chmod(m_strTemp.mb_str(), mode) == -1 )
+    if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )

     {
         wxLogSysError(_("Failed to set temporary file permissions"));
     }
     {
         wxLogSysError(_("Failed to set temporary file permissions"));
     }


@@ -545,7 +718,7 @@ bool wxTempFile::Commit()
         return FALSE;
     }
 
         return FALSE;
     }
 

-    if ( wxRename(m_strTemp, m_strName) != 0 ) {
+    if ( !wxRenameFile(m_strTemp, m_strName)  ) {

         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }
         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }