some more src code reformatting

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index cd4f7c7a010f1fe7179a10798e6051373447f9e1..243bdc03733699d5a36863b2efa3c997f7a9b191 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -68,12 +68,16 @@
     // 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 ; }
+#else
+    int _access( const char *path, int mode ) { return 0 ; }
+#endif
     char* mktemp( char * path ) { return path ;}
-    #include  <unistd.h>
-    #include  <unix.h>
+    #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
@@ -132,7 +136,7 @@ bool wxFile::Exists(const wxChar *name)
 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
 #else
     return !wxAccess(fname, 0) &&
@@ -140,7 +144,7 @@ bool wxFile::Exists(const wxChar *name)
            (st.st_mode & S_IFREG);
 #endif
 #else
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
 #else
     return !wxAccess(name, 0) &&
@@ -188,8 +192,10 @@ 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
-#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(wxUnix2MacFilename( szFileName ), accessMode);
 #else
     int fd = wxOpen(wxFNCONV(szFileName),
                     O_BINARY | O_WRONLY | O_CREAT |
@@ -234,7 +240,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
     int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
 #else
     int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
@@ -293,7 +299,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
     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
@@ -545,7 +555,7 @@ bool wxTempFile::Commit()
 {
     m_file.Close();
 
-#ifndef __WXMAC__
+#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;
@@ -573,7 +583,7 @@ bool wxTempFile::Commit()
 void wxTempFile::Discard()
 {
     m_file.Close();
-#ifndef __WXMAC__
+#if !defined(__WXMAC__) || defined(__UNIX__)
     if ( wxRemove(m_strTemp) != 0 )
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 #else