wxDbGrid additions contributed by Paul and Roger Gammans with additions/corrections...

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 4a407852701385f54b1d6e233632f72c9e5e4232..f0209434b2f854d80eebf7d0f210f133e2fabf45 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -62,19 +62,22 @@
     #endif
 #elif (defined(__WXPM__))
     #include <io.h>
     #endif
 #elif (defined(__WXPM__))
     #include <io.h>

-    #include <direct.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__))
     #define   W_OK        2
     #define   R_OK        4
 #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


@@ -87,36 +90,6 @@
     #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
 #if defined(__BORLANDC__) || defined(_MSC_VER)
     #define   W_OK        2
     #define   R_OK        4


@@ -132,12 +105,6 @@
     #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


@@ -150,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
 // ============================================================================


@@ -159,26 +132,19 @@
 // ----------------------------------------------------------------------------
 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);
 

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

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

-#endif
-#else
-#ifdef __WXMAC__
-  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)


@@ -198,7 +164,7 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             wxFAIL_MSG(wxT("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;

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


@@ -219,12 +185,15 @@ 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

-#ifdef __WXMAC__
-  int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+#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( szFileName , accessMode);

 #else
 #else

-    int fd = open(wxFNCONV(szFileName),
-                  O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
-                  ACCESS(accessMode));
+    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);
 #endif
     if ( fd == -1 ) {
         wxLogSysError(_("can't create file '%s'"), szFileName);


@@ -246,24 +215,25 @@ 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;
     }
 

-#ifdef __WXMAC__
-  int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
-#else
-    int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
-#endif
+    int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));

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


@@ -318,7 +288,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


@@ -336,7 +310,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;


@@ -390,7 +364,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;


@@ -407,7 +381,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();


@@ -458,8 +432,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:


@@ -500,7 +473,7 @@ bool wxTempFile::Open(const wxString& strName)
     // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
     static const wxChar *szMktempSuffix = wxT("XXX");
     m_strTemp << strName << szMktempSuffix;
     // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
     static const wxChar *szMktempSuffix = wxT("XXX");
     m_strTemp << strName << szMktempSuffix;

-    mkdir(m_strTemp.GetWriteBuf(MAX_PATH));
+    ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL);

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


@@ -522,7 +495,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


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

-#ifndef __WXMAC__
-    if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 0 ) {
+    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;
 }


@@ -599,13 +560,8 @@ bool wxTempFile::Commit()
 void wxTempFile::Discard()
 {
     m_file.Close();
 void wxTempFile::Discard()
 {
     m_file.Close();

-#ifndef __WXMAC__
-    if ( remove(m_strTemp.fn_str()) != 0 )
+    if ( wxRemove(m_strTemp) != 0 )

         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
         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());
-#endif

 }
 
 #endif
 }
 
 #endif