X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09914df7b85fe17845223b291ab65925dceba6f2..7214297d16aed4c160c1cbef6b19f153ca065ab7:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 016c199ca1..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 +#ifndef __SALFORDC__ #define WIN32_LEAN_AND_MEAN #define NOSERVICE #define NOIME @@ -50,38 +51,38 @@ #define NOKANJI #define NOCRYPT #define NOMCX +#endif + #include // for GetTempFileName #elif (defined(__UNIX__) || defined(__GNUWIN32__)) - #include -#ifdef __GNUWIN32__ - #include -#endif + #include + #ifdef __GNUWIN32__ + #include + #endif #elif (defined(__WXSTUBS__)) - // Have to ifdef this for different environments - #include + // Have to ifdef this for different environments + #include #elif (defined(__WXMAC__)) - int access( const char *path, int mode ) { return 0 ; } - char* mktemp( char * path ) { return path ;} - #include - #include - #define W_OK 2 - #define R_OK 4 + int access( const char *path, int mode ) { return 0 ; } + char* mktemp( char * path ) { return path ;} + #include + #include + #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 // SEEK_xxx constants #include // O_RDONLY &c + #ifndef __MWERKS__ -#include // needed for stat -#include // stat + #include // needed for stat + #include // stat #endif // Microsoft compiler loves underscores, feed them to it -#ifdef _MSC_VER - - #ifndef __MWERKS__ - +#ifdef __VISUALC__ // functions #define open _open #define close _close @@ -96,7 +97,7 @@ #define stat _stat // constants - + #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 - - #endif - - #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 @@ -125,6 +121,10 @@ #define O_BINARY (0) #endif //__UNIX__ +#ifdef __SALFORDC__ + #include +#endif + // wxWindows #include #include @@ -132,7 +132,13 @@ #include #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 // ============================================================================ @@ -144,8 +150,13 @@ // ---------------------------------------------------------------------------- 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) @@ -188,12 +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_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); @@ -206,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; @@ -228,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); @@ -301,7 +321,7 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) bool wxFile::Flush() { if ( IsOpened() ) { - #if defined(_MSC_VER) || wxHAVE_FSYNC + #if defined(__VISUALC__) || wxHAVE_FSYNC if ( fsync(m_fd) == -1 ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); @@ -370,9 +390,9 @@ off_t wxFile::Length() const { wxASSERT( IsOpened() ); - #if defined( _MSC_VER ) && !defined( __MWERKS__ ) + #ifdef __VISUALC__ int iRc = _filelength(m_fd); - #else + #else // !VC++ int iRc = tell(m_fd); if ( iRc != -1 ) { // @ have to use const_cast :-( @@ -387,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); @@ -405,7 +424,7 @@ bool wxFile::Eof() const 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();