X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/246037e22990a4719c672c2e2a8b62b99cc4d49c..a4388683f1b20020b5425c59c401d6ab673860de:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 4372a8092b..61e0b07afb 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -53,17 +53,25 @@ #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 #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 +86,7 @@ #define stat _stat // constants + #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR @@ -87,10 +96,20 @@ #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) @@ -102,6 +121,9 @@ #include #include +#ifndef MAX_PATH +#define MAX_PATH 512 +#endif // ============================================================================ // implementation of wxFile @@ -110,10 +132,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 = 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; } // ---------------------------------------------------------------------------- @@ -140,7 +182,8 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access) { // 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); + int fd = open(szFileName, O_WRONLY | O_CREAT | + (bOverwrite ? O_TRUNC : O_EXCL), access); if ( fd == -1 ) { wxLogSysError(_("can't create file '%s'"), szFileName); @@ -212,37 +255,45 @@ 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 ofsInvalid; + 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; return 0; } else - return (uint)iRc; + return iRc; } // flush bool wxFile::Flush() { if ( IsOpened() ) { -// @@@ fsync() is not ANSI (BSDish) + // @@@ fsync() is not ANSI (BSDish) // if ( fsync(m_fd) == -1 ) { // TODO - if (TRUE) { + if (wxTrue) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); return FALSE; } @@ -275,13 +326,13 @@ 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); - return ofsInvalid; + return wxInvalidOffset; } else return (off_t)iRc; @@ -295,7 +346,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); - return ofsInvalid; + return wxInvalidOffset; } else return (off_t)iRc; @@ -306,7 +357,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); @@ -328,7 +379,7 @@ off_t wxFile::Length() const if ( iRc == -1 ) { wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); - return ofsInvalid; + return wxInvalidOffset; } else return (off_t)iRc; @@ -341,11 +392,11 @@ bool wxFile::Eof() const int iRc; - #if defined(__UNIX__) || defined(__GNUWIN32__) + #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) // @@ this doesn't work, of course, on unseekable file descriptors off_t ofsCur = Tell(), ofsMax = Length(); - if ( ofsCur == ofsInvalid || ofsMax == ofsInvalid ) + if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset ) iRc = -1; else iRc = ofsCur == ofsMax; @@ -361,12 +412,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 +443,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 @@ -401,7 +452,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