added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicati...

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 04fd887a9383cef8849c980e3653b9134ba739e2..b8d659f833a727edec30cb6a40624fbbd0fc1645 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -14,7 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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


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

-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__)
-  #include  <io.h>
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

 
 #ifndef __SALFORDC__
     #define   WIN32_LEAN_AND_MEAN
 
 #ifndef __SALFORDC__
     #define   WIN32_LEAN_AND_MEAN


@@ -54,11 +53,16 @@
     #define   NOMCX
 #endif
 
     #define   NOMCX
 #endif
 

+#elif defined(__WXMSW__) && defined(__WXWINCE__)
+    #include  "wx/msw/missing.h"
+#elif (defined(__OS2__))
+    #include <io.h>

 #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__
     #include  <sys/stat.h>
     #ifdef __GNUWIN32__

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

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


@@ -70,8 +74,6 @@
     #else
         #error  "Please specify the header with file functions declarations."
     #endif
     #else
         #error  "Please specify the header with file functions declarations."
     #endif

-#elif (defined(__WXPM__))
-    #include <io.h>

 #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>


@@ -83,21 +85,12 @@
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>

-    #include  <unistd.h>
+    #include <unistd.h>

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

-#include  <fcntl.h>       // O_RDONLY &c
-
-#ifndef __MWERKS__
-    #include  <sys/types.h>   // needed for stat
-    #include  <sys/stat.h>    // stat
-#elif defined(__MWERKS__) && ( defined(__WXMSW__) || defined(__MACH__) )
-    #include  <sys/types.h>   // needed for stat
-    #include  <sys/stat.h>    // stat
-#endif

 
 // Windows compilers don't have these constants
 #ifndef W_OK
 
 // Windows compilers don't have these constants
 #ifndef W_OK


@@ -132,7 +125,7 @@
     #define ACCESS(access)  , (access)
 #endif // Salford C
 
     #define ACCESS(access)  , (access)
 #endif // Salford C
 

-// wxWindows
+// wxWidgets

 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"


@@ -147,6 +140,10 @@
     #include "wx/msw/mslu.h"
 #endif
 
     #include "wx/msw/mslu.h"
 #endif
 

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

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


@@ -194,7 +191,7 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
 wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
 {
     m_fd = fd_invalid;
 wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
 {
     m_fd = fd_invalid;

-    m_error = FALSE;
+    m_error = false;

 
     Open(szFileName, mode);
 }
 
     Open(szFileName, mode);
 }


@@ -206,7 +203,7 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
     // otherwise we only create the new file and fail if it already exists
 #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
     // otherwise we only create the new file and fail if it already exists
 #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 = open( szFileName , O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);

     int fd = creat( szFileName , accessMode);
 #else
     int fd = wxOpen( szFileName,
     int fd = creat( szFileName , accessMode);
 #else
     int fd = wxOpen( szFileName,


@@ -217,12 +214,12 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
     if ( fd == -1 )
     {
         wxLogSysError(_("can't create file '%s'"), szFileName);
     if ( fd == -1 )
     {
         wxLogSysError(_("can't create file '%s'"), szFileName);

-        return FALSE;
+        return false;

     }
     else
     {
         Attach(fd);
     }
     else
     {
         Attach(fd);

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -259,15 +256,23 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
             break;
     }
 

+#ifdef __WINDOWS__
+    // only read/write bits for "all" are supported by this function under
+    // Windows, and VC++ 8 returns EINVAL if any other bits are used in
+    // accessMode, so clear them as they have at best no effect anyhow
+    accessMode &= wxS_IRUSR | wxS_IWUSR;
+#endif // __WINDOWS__
+

     int fd = wxOpen( szFileName, flags ACCESS(accessMode));
     int fd = wxOpen( szFileName, flags ACCESS(accessMode));

+

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

-        return FALSE;
+        return false;

     }
     else {
         Attach(fd);
     }
     else {
         Attach(fd);

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -275,16 +280,17 @@ 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 ) {
+        if (wxClose(m_fd) == -1)
+        {

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

-            return FALSE;
+            return false;

         }
         else
             m_fd = fd_invalid;
     }
 
         }
         else
             m_fd = fd_invalid;
     }
 

-    return TRUE;
+    return true;

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


@@ -292,18 +298,15 @@ bool wxFile::Close()
 // ----------------------------------------------------------------------------
 
 // read
 // ----------------------------------------------------------------------------
 
 // read

-off_t wxFile::Read(void *pBuf, off_t nCount)
+size_t wxFile::Read(void *pBuf, size_t nCount)

 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 

-#ifdef __MWERKS__
-    int iRc = ::read(m_fd, (char*) pBuf, nCount);
-#else
-    int iRc = ::read(m_fd, pBuf, nCount);
-#endif
+    int iRc = wxRead(m_fd, pBuf, nCount);
+

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

-        return wxInvalidOffset;
+        return (size_t)wxInvalidOffset;

     }
     else
         return (size_t)iRc;
     }
     else
         return (size_t)iRc;


@@ -314,18 +317,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 {
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 

-#ifdef __MWERKS__
-#if __MSL__ >= 0x6000
-    int iRc = ::write(m_fd, (void*) pBuf, nCount);
-#else
-    int iRc = ::write(m_fd, (const char*) pBuf, nCount);
-#endif
-#else
-    int iRc = ::write(m_fd, pBuf, nCount);
-#endif
+    int iRc = wxWrite(m_fd, pBuf, nCount);
+

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

-        m_error = TRUE;
+        m_error = true;

         return 0;
     }
     else
         return 0;
     }
     else


@@ -340,14 +336,14 @@ bool wxFile::Flush()
         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);

-            return FALSE;
+            return false;

         }
 #else // no fsync
         // just do nothing
 #endif // fsync
     }
 
         }
 #else // no fsync
         // just do nothing
 #endif // fsync
     }
 

-    return TRUE;
+    return true;

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


@@ -355,7 +351,7 @@ bool wxFile::Flush()
 // ----------------------------------------------------------------------------
 
 // seek
 // ----------------------------------------------------------------------------
 
 // seek

-off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
+wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)

 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 


@@ -377,41 +373,43 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
             break;
     }
 
             break;
     }
 

-    int iRc = lseek(m_fd, ofs, origin);
+    if (ofs == wxInvalidOffset)
+    {
+        wxLogSysError(_("can't seek on file descriptor %d, large files support is not enabled."), m_fd);
+        return wxInvalidOffset;
+    }
+    wxFileOffset iRc = wxSeek(m_fd, ofs, origin);

     if ( iRc == -1 ) {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
         return wxInvalidOffset;
     }
     else
     if ( iRc == -1 ) {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
         return wxInvalidOffset;
     }
     else

-        return (off_t)iRc;
+        return iRc;

 }
 
 }
 

-// get current off_t
-off_t wxFile::Tell() const
+// get current wxFileOffset
+wxFileOffset wxFile::Tell() const

 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

-    int iRc = wxTell(m_fd);
+    wxFileOffset iRc = wxTell(m_fd);

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

-        return (off_t)iRc;
+        return iRc;

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

-off_t wxFile::Length() const
+wxFileOffset wxFile::Length() const

 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

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

     if ( iRc != -1 ) {
         // @ have to use const_cast :-(
     if ( iRc != -1 ) {
         // @ have to use const_cast :-(

-        int iLen = ((wxFile *)this)->SeekEnd();
+        wxFileOffset iLen = ((wxFile *)this)->SeekEnd();

         if ( iLen != -1 ) {
             // restore old position
             if ( ((wxFile *)this)->Seek(iRc) == -1 ) {
         if ( iLen != -1 ) {
             // restore old position
             if ( ((wxFile *)this)->Seek(iRc) == -1 ) {


@@ -422,14 +420,13 @@ off_t wxFile::Length() const
 
         iRc = iLen;
     }
 
         iRc = iLen;
     }

-#endif  // VC++

 
     if ( iRc == -1 ) {
         wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
         return wxInvalidOffset;
     }
     else
 
     if ( iRc == -1 ) {
         wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
         return wxInvalidOffset;
     }
     else

-        return (off_t)iRc;
+        return iRc;

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


@@ -441,14 +438,14 @@ bool wxFile::Eof() const
 
 #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
     // @@ this doesn't work, of course, on unseekable file descriptors
 
 #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
     // @@ this doesn't work, of course, on unseekable file descriptors

-    off_t ofsCur = Tell(),
+    wxFileOffset ofsCur = Tell(),

     ofsMax = Length();
     if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
         iRc = -1;
     else
         iRc = ofsCur == ofsMax;
 #else  // Windows and "native" compiler
     ofsMax = Length();
     if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
         iRc = -1;
     else
         iRc = ofsCur == ofsMax;
 #else  // Windows and "native" compiler

-    iRc = eof(m_fd);
+    iRc = wxEof(m_fd);

 #endif // Windows/Unix
 
     switch ( iRc ) {
 #endif // Windows/Unix
 
     switch ( iRc ) {


@@ -456,7 +453,7 @@ bool wxFile::Eof() const
             break;
 
         case 0:
             break;
 
         case 0:

-            return FALSE;
+            return false;

 
         case -1:
             wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
 
         case -1:
             wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);


@@ -466,7 +463,7 @@ bool wxFile::Eof() const
             wxFAIL_MSG(_("invalid eof() return value."));
     }
 
             wxFAIL_MSG(_("invalid eof() return value."));
     }
 

-    return TRUE;
+    return true;

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


@@ -504,13 +501,13 @@ bool wxTempFile::Open(const wxString& strName)
     if ( m_strTemp.empty() )
     {
         // CreateTempFileName() failed
     if ( m_strTemp.empty() )
     {
         // CreateTempFileName() failed

-        return FALSE;
+        return false;

     }
 
 #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;
     if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )
     {
     wxStructStat st;
     if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )
     {


@@ -527,11 +524,13 @@ bool wxTempFile::Open(const wxString& strName)
 
     if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
     {
 
     if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
     {

+#ifndef __OS2__

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

+#endif

     }
 #endif // Unix
 
     }
 #endif // Unix
 

-    return TRUE;
+    return true;

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


@@ -550,15 +549,15 @@ bool wxTempFile::Commit()
 
     if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
         wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
 
     if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
         wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());

-        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());
         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxTempFile::Discard()
 }
 
 void wxTempFile::Discard()