X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..a8a4906b88393ceedc51bb22320db70b1031ecfb:/src/common/file.cpp?ds=sidebyside diff --git a/src/common/file.cpp b/src/common/file.cpp index b32441ff97..2d3f2c1329 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -30,6 +30,7 @@ #if defined(__WXMSW__) && !defined(__GNUWIN32__) #include +#ifndef __SALFORDC__ #define WIN32_LEAN_AND_MEAN #define NOSERVICE #define NOIME @@ -50,23 +51,41 @@ #define NOKANJI #define NOCRYPT #define NOMCX +#endif + #include // for GetTempFileName #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include +#ifdef __GNUWIN32__ + #include +#endif #elif (defined(__WXSTUBS__)) // 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 #else #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 +#endif // Microsoft compiler loves underscores, feed them to it #ifdef _MSC_VER + + #ifndef __MWERKS__ + // functions #define open _open #define close _close @@ -81,6 +100,7 @@ #define stat _stat // constants + #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR @@ -90,6 +110,8 @@ #define S_IFDIR _S_IFDIR #define S_IFREG _S_IFREG + + #endif #define W_OK 2 #define R_OK 4 @@ -107,6 +129,11 @@ #define O_BINARY (0) #endif //__UNIX__ + +#ifdef __SALFORDC__ +#include +#endif + // wxWindows #include #include @@ -126,13 +153,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 +202,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 +225,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 +247,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,21 +288,29 @@ 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; } else - return (uint)iRc; + return (size_t)iRc; } // write -uint wxFile::Write(const void *pBuf, uint nCount) +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 +324,15 @@ uint wxFile::Write(const void *pBuf, uint 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 +393,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 +428,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 +479,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