wxBitmap compilation fix for BCC enforced typecast in resource.cpp

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 6702d2dd83457937159dc1c4dde1feabcbbaedd6..243bdc03733699d5a36863b2efa3c997f7a9b191 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -25,10 +25,6 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-

 #if wxUSE_FILE
 
 // standard
 #if wxUSE_FILE
 
 // standard


@@ -64,16 +60,24 @@
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif
     #ifdef __GNUWIN32__
         #include <windows.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(__WXMAC__))
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXMAC__))

+#if __MSL__ < 0x6000

     int access( const char *path, int mode ) { return 0 ; }
     int access( const char *path, int mode ) { return 0 ; }

+#else
+    int _access( const char *path, int mode ) { return 0 ; }
+#endif

     char* mktemp( char * path ) { return path ;}
     char* mktemp( char * path ) { return path ;}

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

     #define   W_OK        2
     #define   R_OK        4
     #define   W_OK        2
     #define   R_OK        4

+    #include  <unistd.h>

 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX


@@ -86,43 +90,14 @@
     #include  <sys/stat.h>    // stat
 #endif
 
     #include  <sys/stat.h>    // stat
 #endif
 

-// Microsoft compiler loves underscores, feed them to it
-#ifdef  __VISUALC__
-    // functions
-    #define   open        _open
-    #define   close       _close
-    #define   read        _read
-    #define   write       _write
-    #define   lseek       _lseek
-    #define   fsync       _commit
-    #define   access      _access
-    #define   eof         _eof
-
-    // types
-    #define   stat        _stat
-
-    // constants
-
-    #define   O_RDONLY    _O_RDONLY
-    #define   O_WRONLY    _O_WRONLY
-    #define   O_RDWR      _O_RDWR
-    #define   O_EXCL      _O_EXCL
-    #define   O_CREAT     _O_CREAT
-    #define   O_BINARY    _O_BINARY
-
-    #define   S_IFDIR     _S_IFDIR
-    #define   S_IFREG     _S_IFREG
-#else
-    #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
-#endif  // VC++
-

 #if defined(__BORLANDC__) || defined(_MSC_VER)
     #define   W_OK        2
     #define   R_OK        4
 #endif
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
     #define   W_OK        2
     #define   R_OK        4
 #endif
 

-// there is no distinction between text and binary files under Unix
-#ifdef    __UNIX__
+// 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
+#if defined(__UNIX__) && !defined(O_BINARY)

     #define   O_BINARY    (0)
 #endif  //__UNIX__
 
     #define   O_BINARY    (0)
 #endif  //__UNIX__
 


@@ -130,22 +105,10 @@
     #include <unix.h>
 #endif
 
     #include <unix.h>
 #endif
 

-// wxWindows
-#include  <wx/string.h>
-#include  <wx/intl.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-

 #ifndef MAX_PATH
     #define MAX_PATH 512
 #endif
 
 #ifndef MAX_PATH
     #define MAX_PATH 512
 #endif
 

-#ifdef __WXMAC__
-    char gwxMacFileName[ MAX_PATH ] ;
-    char gwxMacFileName2[ MAX_PATH ] ;
-    char gwxMacFileName3[ MAX_PATH ] ;
-#endif
-

 // some broken compilers don't have 3rd argument in open() and creat()
 #ifdef __SALFORDC__
     #define ACCESS(access)
 // some broken compilers don't have 3rd argument in open() and creat()
 #ifdef __SALFORDC__
     #define ACCESS(access)


@@ -154,6 +117,12 @@
     #define ACCESS(access)  , (access)
 #endif // Salford C
 
     #define ACCESS(access)  , (access)
 #endif // Salford C
 

+// wxWindows
+#include  "wx/string.h"
+#include  "wx/intl.h"
+#include  "wx/file.h"
+#include  "wx/log.h"
+

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


@@ -163,18 +132,26 @@
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const wxChar *name)
 {
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const wxChar *name)
 {

-    struct stat st;
+    wxStructStat st;

 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 
 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 

-    return !access(fname, 0) &&
-           !stat(MBSTRINGCAST fname, &st) &&
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
+#else
+    return !wxAccess(fname, 0) &&
+           !wxStat(wxMBSTRINGCAST fname, &st) &&

            (st.st_mode & S_IFREG);
            (st.st_mode & S_IFREG);

+#endif
+#else
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);

 #else
 #else

-    return !access(name, 0) &&
-           !stat((wxChar*) name, &st) &&
+    return !wxAccess(name, 0) &&
+           !wxStat(name, &st) &&

            (st.st_mode & S_IFREG);
 #endif
            (st.st_mode & S_IFREG);
 #endif

+#endif

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


@@ -191,10 +168,10 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(_T("bad wxFile::Access mode parameter."));
+            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));

     }
 
     }
 

-    return access(wxFNCONV(name), how) == 0;
+    return wxAccess(wxFNCONV(name), how) == 0;

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


@@ -210,21 +187,21 @@ wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
     Open(szFileName, mode);
 }
 
     Open(szFileName, mode);
 }
 

-// dtor
-wxFile::~wxFile()
-{
-    Close();
-}
-

 // create the file, fail if it already exists and bOverwrite
 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
 // create the file, fail if it already exists and bOverwrite
 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

-    int fd = open(wxFNCONV(szFileName),
-                  O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
-                  ACCESS(accessMode));
-
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  // 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(wxUnix2MacFilename( szFileName ), accessMode);
+#else
+    int fd = wxOpen(wxFNCONV(szFileName),
+                    O_BINARY | O_WRONLY | O_CREAT |
+                    (bOverwrite ? O_TRUNC : O_EXCL)
+                    ACCESS(accessMode));
+#endif

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


@@ -245,21 +222,29 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             flags |= O_RDONLY;
             break;
 
             flags |= O_RDONLY;
             break;
 

+        case write_append:
+            if ( wxFile::Exists(szFileName) )
+            {
+                flags |= O_WRONLY | O_APPEND;
+                break;
+            }
+            //else: fall through as write_append is the same as write if the
+            //      file doesn't exist
+

         case write:
             flags |= O_WRONLY | O_CREAT | O_TRUNC;
             break;
 
         case write:
             flags |= O_WRONLY | O_CREAT | O_TRUNC;
             break;
 

-        case write_append:
-            flags |= O_WRONLY | O_APPEND;
-            break;
-

         case read_write:
             flags |= O_RDWR;
             break;
     }
 
         case read_write:
             flags |= O_RDWR;
             break;
     }
 

-    int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
-
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
+#else
+    int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
+#endif

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


@@ -314,7 +299,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __MWERKS__
     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);
     int iRc = ::write(m_fd, (const char*) pBuf, nCount);

+#endif

 #else
     int iRc = ::write(m_fd, pBuf, nCount);
 #endif
 #else
     int iRc = ::write(m_fd, pBuf, nCount);
 #endif


@@ -332,7 +321,7 @@ bool wxFile::Flush()
 {
     if ( IsOpened() ) {
 #if defined(__VISUALC__) || wxHAVE_FSYNC
 {
     if ( IsOpened() ) {
 #if defined(__VISUALC__) || wxHAVE_FSYNC

-        if ( fsync(m_fd) == -1 )
+        if ( wxFsync(m_fd) == -1 )

         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return FALSE;
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return FALSE;


@@ -354,25 +343,25 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

-    int flag = -1;
+    int origin;

     switch ( mode ) {
     switch ( mode ) {

+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+

         case wxFromStart:
         case wxFromStart:

-            flag = SEEK_SET;
+            origin = SEEK_SET;

             break;
 
         case wxFromCurrent:
             break;
 
         case wxFromCurrent:

-            flag = SEEK_CUR;
+            origin = SEEK_CUR;

             break;
 
         case wxFromEnd:
             break;
 
         case wxFromEnd:

-            flag = SEEK_END;
+            origin = SEEK_END;

             break;
             break;

-
-        default:
-            wxFAIL_MSG(_("unknown seek origin"));

     }
 
     }
 

-    int iRc = lseek(m_fd, ofs, flag);
+    int iRc = lseek(m_fd, ofs, origin);

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


@@ -386,7 +375,7 @@ off_t wxFile::Tell() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

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

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


@@ -403,7 +392,7 @@ off_t wxFile::Length() const
 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++
 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++

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

     if ( iRc != -1 ) {
         // @ have to use const_cast :-(
         int iLen = ((wxFile *)this)->SeekEnd();
     if ( iRc != -1 ) {
         // @ have to use const_cast :-(
         int iLen = ((wxFile *)this)->SeekEnd();


@@ -454,8 +443,7 @@ bool wxFile::Eof() const
             return FALSE;
 
         case -1:
             return FALSE;
 
         case -1:

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

                 break;
 
         default:
                 break;
 
         default:


@@ -486,21 +474,29 @@ bool wxTempFile::Open(const wxString& strName)
     // different partitions for example). Unfortunately, the only standard
     // (POSIX) temp file creation function tmpnam() can't do it.
 #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
     // different partitions for example). Unfortunately, the only standard
     // (POSIX) temp file creation function tmpnam() can't do it.
 #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )

-    static const wxChar *szMktempSuffix = _T("XXXXXX");
+    static const wxChar *szMktempSuffix = wxT("XXXXXX");
+    m_strTemp << strName << szMktempSuffix;
+    // can use the cast because length doesn't change
+    mktemp(wxMBSTRINGCAST m_strTemp.mb_str());
+#elif  defined(__WXPM__)
+    // for now just create a file
+    // future enhancements can be to set some extended attributes for file systems
+    // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
+    static const wxChar *szMktempSuffix = wxT("XXX");

     m_strTemp << strName << szMktempSuffix;
     m_strTemp << strName << szMktempSuffix;

-    mktemp(MBSTRINGCAST m_strTemp.mb_str()); // will do because length doesn't change
+    ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL);

 #else // Windows
     wxString strPath;
     wxSplitPath(strName, &strPath, NULL, NULL);
     if ( strPath.IsEmpty() )
 #else // Windows
     wxString strPath;
     wxSplitPath(strName, &strPath, NULL, NULL);
     if ( strPath.IsEmpty() )

-        strPath = _T('.');  // GetTempFileName will fail if we give it empty string
+        strPath = wxT('.');  // GetTempFileName will fail if we give it empty string

 #ifdef __WIN32__
 #ifdef __WIN32__

-    if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+    if ( !GetTempFileName(strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )

 #else
         // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
 #else
         // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?

-        if ( !GetTempFileName((BYTE) (const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+        if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )

 #endif
 #endif

-            wxLogLastError(_T("GetTempFileName"));
+            wxLogLastError(wxT("GetTempFileName"));

     m_strTemp.UngetWriteBuf();
 #endif  // Windows/Unix
 
     m_strTemp.UngetWriteBuf();
 #endif  // Windows/Unix
 


@@ -510,7 +506,7 @@ bool wxTempFile::Open(const wxString& strName)
     mode_t umaskOld = 0; // just to suppress compiler warning
     bool changedUmask;
 
     mode_t umaskOld = 0; // just to suppress compiler warning
     bool changedUmask;
 

-    struct stat st;
+    wxStructStat st;

     if ( stat(strName.fn_str(), &st) == 0 )
     {
         // this assumes that only lower bits of st_mode contain the access
     if ( stat(strName.fn_str(), &st) == 0 )
     {
         // this assumes that only lower bits of st_mode contain the access


@@ -559,15 +555,27 @@ bool wxTempFile::Commit()
 {
     m_file.Close();
 
 {
     m_file.Close();
 

-    if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 0 ) {
+#if !defined(__WXMAC__) || defined(__UNIX__)
+    if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {

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

-    if ( rename(m_strTemp.fn_str(), m_strName.fn_str()) != 0 ) {
+    if ( wxRename(m_strTemp, m_strName) != 0 ) {

         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;
     }

+#else
+  if ( wxFile::Exists(m_strName) && remove(wxUnix2MacFilename( m_strName )) != 0 ) {
+    wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
+    return FALSE;
+  }
+
+  if ( rename(wxUnix2MacFilename( m_strTemp ), wxUnix2MacFilename( m_strName )) != 0 ) {
+    wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
+    return FALSE;
+  }
+#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -575,8 +583,14 @@ bool wxTempFile::Commit()
 void wxTempFile::Discard()
 {
     m_file.Close();
 void wxTempFile::Discard()
 {
     m_file.Close();

-    if ( remove(m_strTemp.fn_str()) != 0 )
+#if !defined(__WXMAC__) || defined(__UNIX__)
+    if ( wxRemove(m_strTemp) != 0 )
+        wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
+#else
+    if ( remove( wxUnix2MacFilename(m_strTemp.fn_str())) != 0 )

         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());

+#endif

 }
 
 }
 

-#endif
\ No newline at end of file
+#endif
+