X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..6f34921d9369a31de14e4b07e4824e2d701710f0:/src/common/file.cpp?ds=sidebyside diff --git a/src/common/file.cpp b/src/common/file.cpp index 1e3734b5d6..44c4b7b77f 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -53,6 +53,9 @@ #include // for GetTempFileName #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include +#elif (defined(__WXSTUBS__)) + // Have to ifdef this for different environments + #include #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX @@ -87,10 +90,18 @@ #define S_IFDIR _S_IFDIR #define S_IFREG _S_IFREG + + #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) @@ -113,10 +124,30 @@ // ---------------------------------------------------------------------------- // static functions // ---------------------------------------------------------------------------- -bool wxFile::Exists(const char *sz) +bool wxFile::Exists(const char *name) { struct stat st; - return !access(sz, 0) && !stat(sz, &st) && (st.st_mode & S_IFREG); + return !access(name, 0) && !stat(name, &st) && (st.st_mode & S_IFREG); +} + +bool wxFile::Access(const char *name, OpenMode mode) +{ + int how; + + 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; } // ---------------------------------------------------------------------------- @@ -146,7 +177,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access) int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); if ( fd == -1 ) { - wxLogSysError("can't create file '%s'", szFileName); + wxLogSysError(_("can't create file '%s'"), szFileName); return FALSE; } else { @@ -181,7 +212,7 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int access) int fd = open(szFileName, flags, access); if ( fd == -1 ) { - wxLogSysError("can't open file '%s'", szFileName); + wxLogSysError(_("can't open file '%s'"), szFileName); return FALSE; } else { @@ -195,7 +226,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; } @@ -217,21 +248,21 @@ off_t wxFile::Read(void *pBuf, off_t nCount) int iRc = ::read(m_fd, pBuf, nCount); 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 ); int iRc = ::write(m_fd, pBuf, nCount); 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; } @@ -246,7 +277,7 @@ bool wxFile::Flush() // @@@ fsync() is not ANSI (BSDish) // if ( fsync(m_fd) == -1 ) { // TODO if (TRUE) { - wxLogSysError("can't flush file descriptor %d", m_fd); + wxLogSysError(_("can't flush file descriptor %d"), m_fd); return FALSE; } } @@ -278,12 +309,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 @@ -297,7 +328,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 @@ -330,7 +361,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 @@ -364,12 +395,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; @@ -395,7 +426,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__) static const char *szMktempSuffix = "XXXXXX"; m_strTemp << strName << szMktempSuffix; mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change @@ -432,12 +463,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; } @@ -448,5 +479,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()); }