X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1678ad780265f08fc8b84d180c04ae3a9900b1bb..7482b22003c03f7aa3335aec271b5fcb48e2693d:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 75fa377b7c..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,20 +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 @@ -78,6 +100,7 @@ #define stat _stat // constants + #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR @@ -87,21 +110,39 @@ #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 +#ifdef __BORLANDC__ + #define W_OK 2 + #define R_OK 4 +#endif + // there is no distinction between text and binary files under Unix #ifdef __UNIX__ #define O_BINARY (0) #endif //__UNIX__ + +#ifdef __SALFORDC__ +#include +#endif + // wxWindows #include #include #include #include +#ifndef MAX_PATH +#define MAX_PATH 512 +#endif // ============================================================================ // implementation of wxFile @@ -110,10 +151,35 @@ // ---------------------------------------------------------------------------- // static functions // ---------------------------------------------------------------------------- -bool wxFile::Exists(const char *sz) +bool wxFile::Exists(const char *name) { +#ifdef __SALFORDC__ + struct _stat st; +#else struct stat st; - return !access(sz, 0) && !stat(sz, &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 = 0; + + switch ( mode ) { + case read: + how = R_OK; + break; + + case write: + how = W_OK; + break; + + default: + wxFAIL_MSG("bad wxFile::Access mode parameter."); + } + + return access(name, how) == 0; } // ---------------------------------------------------------------------------- @@ -136,14 +202,20 @@ 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); + wxLogSysError(_("can't create file '%s'"), szFileName); return FALSE; } else { @@ -153,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; @@ -175,10 +247,14 @@ 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); + wxLogSysError(_("can't open file '%s'"), szFileName); return FALSE; } else { @@ -192,7 +268,7 @@ bool wxFile::Close() { if ( IsOpened() ) { if ( close(m_fd) == -1 ) { - wxLogSysError("can't close file descriptor %d", m_fd); + wxLogSysError(_("can't close file descriptor %d"), m_fd); m_fd = fd_invalid; return FALSE; } @@ -212,23 +288,31 @@ 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); + 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); + wxLogSysError(_("can't write to file descriptor %d"), m_fd); m_error = TRUE; return 0; } @@ -240,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; @@ -275,12 +362,12 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode) break; default: - wxFAIL_MSG("unknown seek origin"); + wxFAIL_MSG(_("unknown seek origin")); } int iRc = lseek(m_fd, ofs, flag); if ( iRc == -1 ) { - wxLogSysError("can't seek on file descriptor %d", m_fd); + wxLogSysError(_("can't seek on file descriptor %d"), m_fd); return wxInvalidOffset; } else @@ -294,7 +381,7 @@ off_t wxFile::Tell() const int iRc = tell(m_fd); if ( iRc == -1 ) { - wxLogSysError("can't get seek position on file descriptor %d", m_fd); + wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); return wxInvalidOffset; } else @@ -306,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); @@ -327,7 +414,7 @@ off_t wxFile::Length() const #endif //_MSC_VER if ( iRc == -1 ) { - wxLogSysError("can't find length of file on file descriptor %d", m_fd); + wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); return wxInvalidOffset; } else @@ -341,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(); @@ -361,12 +448,12 @@ bool wxFile::Eof() const return FALSE; case -1: - wxLogSysError("can't determine if the end of file is reached on " - "descriptor %d", m_fd); + wxLogSysError(_("can't determine if the end of file is reached on \ +descriptor %d"), m_fd); break; default: - wxFAIL_MSG("invalid eof() return value."); + wxFAIL_MSG(_("invalid eof() return value.")); } return TRUE; @@ -392,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. - #ifdef __UNIX__ + #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 @@ -401,7 +488,12 @@ bool wxTempFile::Open(const wxString& strName) wxSplitPath(strName, &strPath, NULL, NULL); if ( strPath.IsEmpty() ) strPath = '.'; // GetTempFileName will fail if we give it empty string +#ifdef __WIN32__ if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) ) +#else + // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug? + if ( !GetTempFileName((BYTE) (const char*) strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) ) +#endif wxLogLastError("GetTempFileName"); m_strTemp.UngetWriteBuf(); #endif // Windows/Unix @@ -424,12 +516,12 @@ bool wxTempFile::Commit() m_file.Close(); if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) { - wxLogSysError("can't remove file '%s'", m_strName.c_str()); + wxLogSysError(_("can't remove file '%s'"), m_strName.c_str()); return FALSE; } if ( rename(m_strTemp, m_strName) != 0 ) { - wxLogSysError("can't commit changes to file '%s'", m_strName.c_str()); + wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); return FALSE; } @@ -440,5 +532,5 @@ void wxTempFile::Discard() { m_file.Close(); if ( remove(m_strTemp) != 0 ) - wxLogSysError("can't remove temporary file '%s'", m_strTemp.c_str()); + wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); }