Fixes for compilation problems on Solaris(!).

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 44c4b7b77fedde9dca0ff1246a98c3803b70ded3..016c199ca16f93ca29cda0a84b2ff30de81be300 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -53,20 +53,35 @@
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <unistd.h>
+#ifdef __GNUWIN32__
+  #include <windows.h>
+#endif
 #elif (defined(__WXSTUBS__))
   // 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."
 #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
+#endif
 
 // Microsoft compiler loves underscores, feed them to it
 #ifdef    _MSC_VER
+
+  #ifndef __MWERKS__
+
   // functions
   #define   open        _open
   #define   close       _close
@@ -81,6 +96,7 @@
   #define   stat        _stat
 
   // constants
+  
   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR
@@ -90,6 +106,8 @@
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
+  
+  #endif
 
   #define   W_OK        2
   #define   R_OK        4
@@ -132,7 +150,7 @@ bool wxFile::Exists(const char *name)
 
 bool wxFile::Access(const char *name, OpenMode mode)
 {
-  int how;
+  int how = 0;
 
   switch ( mode ) {
     case read:
@@ -174,7 +192,8 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
 {
   // 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);
+  int fd = open(szFileName, O_WRONLY | O_CREAT | 
+                (bOverwrite ? O_TRUNC : O_EXCL), access);
 
   if ( fd == -1 ) {
     wxLogSysError(_("can't create file '%s'"), szFileName);
@@ -246,7 +265,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 +283,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 +301,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 (TRUE) {
-      wxLogSysError(_("can't flush file descriptor %d"), m_fd);
-      return FALSE;
-    }
+    #if defined(_MSC_VER) || 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,7 +370,7 @@ off_t wxFile::Length() const
 {
   wxASSERT( IsOpened() );
 
-  #ifdef  _MSC_VER
+  #if defined(  _MSC_VER ) && !defined( __MWERKS__ )
     int iRc = _filelength(m_fd);
   #else
     int iRc = tell(m_fd);
@@ -375,7 +405,7 @@ bool wxFile::Eof() const
 
   int iRc;
 
-  #if defined(__UNIX__) || defined(__GNUWIN32__)
+  #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ )
     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
           ofsMax = Length();
@@ -426,7 +456,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