corrected a type in the constructor from two points

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 9a8684002bf177287cd0b9c5da1fd133af6c3a7b..127a04feb4f4e1d4920188c2ee66aa3067b5e0c0 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -15,7 +15,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-#pragma implementation "file.h"
+    #pragma implementation "file.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -23,13 +23,14 @@
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 // standard
 #if   defined(__WXMSW__) && !defined(__GNUWIN32__)
   #include  <io.h>
 
 #endif
 
 // standard
 #if   defined(__WXMSW__) && !defined(__GNUWIN32__)
   #include  <io.h>
 

+#ifndef __SALFORDC__

   #define   WIN32_LEAN_AND_MEAN
   #define   NOSERVICE
   #define   NOIME
   #define   WIN32_LEAN_AND_MEAN
   #define   NOSERVICE
   #define   NOIME


@@ -50,38 +51,38 @@
   #define   NOKANJI
   #define   NOCRYPT
   #define   NOMCX
   #define   NOKANJI
   #define   NOCRYPT
   #define   NOMCX

+#endif
+

   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))

-  #include  <unistd.h>
-#ifdef __GNUWIN32__
-  #include <windows.h>
-#endif
+    #include  <unistd.h>
+    #ifdef __GNUWIN32__
+        #include <windows.h>
+    #endif

 #elif (defined(__WXSTUBS__))
 #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__))
 #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
+    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
 #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
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c

+

 #ifndef __MWERKS__
 #ifndef __MWERKS__

-#include  <sys/types.h>   // needed for stat
-#include  <sys/stat.h>    // stat
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat

 #endif
 
 // Microsoft compiler loves underscores, feed them to it
 #endif
 
 // Microsoft compiler loves underscores, feed them to it

-#ifdef    _MSC_VER
-
-  #ifndef __MWERKS__
-
+#ifdef  __VISUALC__

   // functions
   #define   open        _open
   #define   close       _close
   // functions
   #define   open        _open
   #define   close       _close


@@ -96,7 +97,7 @@
   #define   stat        _stat
 
   // constants
   #define   stat        _stat
 
   // constants

-  
+

   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR
   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR


@@ -106,16 +107,11 @@
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG

-  
-  #endif
-
-  #define   W_OK        2
-  #define   R_OK        4

 #else
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
 #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
   #define   W_OK        2
   #define   R_OK        4
 #endif


@@ -125,6 +121,10 @@
   #define   O_BINARY    (0)
 #endif  //__UNIX__
 
   #define   O_BINARY    (0)
 #endif  //__UNIX__
 

+#ifdef __SALFORDC__
+    #include <unix.h>
+#endif
+

 // wxWindows
 #include  <wx/string.h>
 #include  <wx/intl.h>
 // wxWindows
 #include  <wx/string.h>
 #include  <wx/intl.h>


@@ -132,7 +132,13 @@
 #include  <wx/log.h>
 
 #ifndef MAX_PATH
 #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
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -144,8 +150,13 @@
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const char *name)
 {
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const char *name)
 {

+#ifdef __SALFORDC__
+  struct _stat st;
+#else

   struct stat st;
   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)
 }
 
 bool wxFile::Access(const char *name, OpenMode mode)


@@ -188,12 +199,17 @@ wxFile::~wxFile()
 }
 
 // create the file, fail if it already exists and bOverwrite
 }
 
 // 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
 {
   // 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_WRONLY | 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);
 
   if ( fd == -1 ) {
     wxLogSysError(_("can't create file '%s'"), szFileName);


@@ -206,7 +222,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
 }
 
 // open the file
 }
 
 // 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;
 
 {
   int flags = O_BINARY;
 


@@ -228,7 +244,11 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
       break;
   }
 
       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);
 
   if ( fd == -1 ) {
     wxLogSysError(_("can't open file '%s'"), szFileName);


@@ -301,12 +321,15 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 bool wxFile::Flush()
 {
   if ( IsOpened() ) {
 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;
   }
 
   return TRUE;


@@ -367,9 +390,9 @@ off_t wxFile::Length() const
 {
   wxASSERT( IsOpened() );
 
 {
   wxASSERT( IsOpened() );
 

-  #if defined(  _MSC_VER ) && !defined( __MWERKS__ )
+  #ifdef __VISUALC__

     int iRc = _filelength(m_fd);
     int iRc = _filelength(m_fd);

-  #else
+  #else // !VC++

     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
       // @ have to use const_cast :-(
     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
       // @ have to use const_cast :-(


@@ -384,8 +407,7 @@ off_t wxFile::Length() const
 
       iRc = iLen;
     }
 
       iRc = iLen;
     }

-
-  #endif  //_MSC_VER
+  #endif  // VC++

 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);


@@ -402,7 +424,7 @@ bool wxFile::Eof() const
 
   int iRc;
 
 
   int iRc;
 

-  #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ )
+  #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();
     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
           ofsMax = Length();