X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/341287bf49066e5dd84e971bd508ee3919ff4b46..3e418ffc1002c514f0e3e876809c33ae9ad8695b:/src/common/file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f3fd151385..127a04feb4 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -15,7 +15,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-#pragma implementation "file.h"
+    #pragma implementation "file.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -23,13 +23,14 @@
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 // standard
 #if   defined(__WXMSW__) && !defined(__GNUWIN32__)
   #include  <io.h>
 
+#ifndef __SALFORDC__
   #define   WIN32_LEAN_AND_MEAN
   #define   NOSERVICE
   #define   NOIME
@@ -50,23 +51,38 @@
   #define   NOKANJI
   #define   NOCRYPT
   #define   NOMCX
+#endif
+
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
-  #include  <unistd.h>
+    #include  <unistd.h>
+    #ifdef __GNUWIN32__
+        #include <windows.h>
+    #endif
 #elif (defined(__WXSTUBS__))
-  // Have to ifdef this for different environments
-  #include <io.h>
+    // Have to ifdef this for different environments
+    #include <io.h>
+#elif (defined(__WXMAC__))
+    int access( const char *path, int mode ) { return 0 ; }
+    char* mktemp( char * path ) { return path ;}
+    #include  <unistd.h>
+    #include  <unix.h>
+    #define   W_OK        2
+    #define   R_OK        4
 #else
-  #error  "Please specify the header with file functions declarations."
+    #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c
-#include  <sys/types.h>   // needed for stat
-#include  <sys/stat.h>    // stat
+
+#ifndef __MWERKS__
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat
+#endif
 
 // Microsoft compiler loves underscores, feed them to it
-#ifdef    _MSC_VER
+#ifdef  __VISUALC__
   // functions
   #define   open        _open
   #define   close       _close
@@ -81,6 +97,7 @@
   #define   stat        _stat
 
   // constants
+
   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR
@@ -90,14 +107,11 @@
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
-
-  #define   W_OK        2
-  #define   R_OK        4
 #else
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
-#endif  //_MSC_VER
+#endif  // VC++
 
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(_MSC_VER)
   #define   W_OK        2
   #define   R_OK        4
 #endif
@@ -107,6 +121,10 @@
   #define   O_BINARY    (0)
 #endif  //__UNIX__
 
+#ifdef __SALFORDC__
+    #include <unix.h>
+#endif
+
 // wxWindows
 #include  <wx/string.h>
 #include  <wx/intl.h>
@@ -114,7 +132,13 @@
 #include  <wx/log.h>
 
 #ifndef MAX_PATH
-#define MAX_PATH 512
+    #define MAX_PATH 512
+#endif
+
+#ifdef __WXMAC__
+    char gwxMacFileName[ MAX_PATH ] ;
+    char gwxMacFileName2[ MAX_PATH ] ;
+    char gwxMacFileName3[ MAX_PATH ] ;
 #endif
 
 // ============================================================================
@@ -126,13 +150,18 @@
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const char *name)
 {
+#ifdef __SALFORDC__
+  struct _stat st;
+#else
   struct stat st;
-  return !access(name, 0) && !stat(name, &st) && (st.st_mode & S_IFREG);
+#endif
+
+  return !access(name, 0) && !stat((char*) name, &st) && (st.st_mode & S_IFREG);
 }
 
 bool wxFile::Access(const char *name, OpenMode mode)
 {
-  int how;
+  int how = 0;
 
   switch ( mode ) {
     case read:
@@ -170,11 +199,17 @@ wxFile::~wxFile()
 }
 
 // create the file, fail if it already exists and bOverwrite
-bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
+bool wxFile::Create(const char *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(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+#ifdef __SALFORDC__
+  int fd = open(szFileName, O_WRONLY | O_CREAT |
+                (bOverwrite ? O_TRUNC : O_EXCL));
+#else
+  int fd = open(szFileName, O_WRONLY | O_CREAT |
+                (bOverwrite ? O_TRUNC : O_EXCL), accessMode);
+#endif
 
   if ( fd == -1 ) {
     wxLogSysError(_("can't create file '%s'"), szFileName);
@@ -187,7 +222,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
 }
 
 // open the file
-bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
+bool wxFile::Open(const char *szFileName, OpenMode mode, int accessMode)
 {
   int flags = O_BINARY;
 
@@ -209,7 +244,11 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
       break;
   }
 
-  int fd = open(szFileName, flags, access);
+#ifdef __SALFORDC__
+  int fd = open(szFileName, flags);
+#else
+  int fd = open(szFileName, flags, accessMode);
+#endif
 
   if ( fd == -1 ) {
     wxLogSysError(_("can't open file '%s'"), szFileName);
@@ -246,7 +285,11 @@ off_t wxFile::Read(void *pBuf, off_t nCount)
 {
   wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
+#ifdef __MWERKS__
+  int iRc = ::read(m_fd, (char*) pBuf, nCount);
+#else
   int iRc = ::read(m_fd, pBuf, nCount);
+#endif
   if ( iRc == -1 ) {
     wxLogSysError(_("can't read from file descriptor %d"), m_fd);
     return wxInvalidOffset;
@@ -260,7 +303,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 {
   wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
+#ifdef __MWERKS__
+  int iRc = ::write(m_fd, (const char*) pBuf, nCount);
+#else
   int iRc = ::write(m_fd, pBuf, nCount);
+#endif
   if ( iRc == -1 ) {
     wxLogSysError(_("can't write to file descriptor %d"), m_fd);
     m_error = TRUE;
@@ -274,12 +321,15 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 bool wxFile::Flush()
 {
   if ( IsOpened() ) {
-		// @@@ fsync() is not ANSI (BSDish)
-//    if ( fsync(m_fd) == -1 ) { // TODO
-      if (wxTrue) {
-      wxLogSysError(_("can't flush file descriptor %d"), m_fd);
-      return FALSE;
-    }
+    #if defined(__VISUALC__) || wxHAVE_FSYNC
+        if ( fsync(m_fd) == -1 )
+        {
+            wxLogSysError(_("can't flush file descriptor %d"), m_fd);
+            return FALSE;
+        }
+    #else // no fsync
+        // just do nothing
+    #endif // fsync
   }
 
   return TRUE;
@@ -340,9 +390,9 @@ off_t wxFile::Length() const
 {
   wxASSERT( IsOpened() );
 
-  #ifdef  _MSC_VER
+  #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
-  #else
+  #else // !VC++
     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
       // @ have to use const_cast :-(
@@ -357,8 +407,7 @@ off_t wxFile::Length() const
 
       iRc = iLen;
     }
-
-  #endif  //_MSC_VER
+  #endif  // VC++
 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
@@ -375,7 +424,7 @@ bool wxFile::Eof() const
 
   int iRc;
 
-  #if defined(__UNIX__) || defined(__GNUWIN32__)
+  #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
           ofsMax = Length();
@@ -426,7 +475,7 @@ bool wxTempFile::Open(const wxString& strName)
   // otherwise rename() in Commit() might not work (if the files are on
   // different partitions for example). Unfortunately, the only standard
   // (POSIX) temp file creation function tmpnam() can't do it.
-  #if defined(__UNIX__) || defined(__WXSTUBS__)
+  #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change