X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02aef13c07cde46e051a2504cafdb5d12fef4155..72366f68d1036084d1adc5971eeee4885f36fe5c:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 60e204f0a2..5f4ec23ee3 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -14,10 +14,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "file.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -103,20 +99,10 @@ }; #endif // W_OK -// there is no distinction between text and binary files under Unix, so define -// O_BINARY as 0 if the system headers don't do it already -#if defined(__UNIX__) && !defined(O_BINARY) - #define O_BINARY (0) -#endif //__UNIX__ - #ifdef __SALFORDC__ #include #endif -#ifndef MAX_PATH - #define MAX_PATH 512 -#endif - // some broken compilers don't have 3rd argument in open() and creat() #ifdef __SALFORDC__ #define ACCESS(access) @@ -136,6 +122,12 @@ #include "wx/file.h" #include "wx/filefn.h" +// there is no distinction between text and binary files under Unix, so define +// O_BINARY as 0 if the system headers don't do it already +#if defined(__UNIX__) && !defined(O_BINARY) + #define O_BINARY (0) +#endif //__UNIX__ + #ifdef __WXMSW__ #include "wx/msw/mslu.h" #endif @@ -144,6 +136,10 @@ #include "wx/msw/private.h" #endif +#ifndef MAX_PATH + #define MAX_PATH 512 +#endif + // ============================================================================ // implementation of wxFile // ============================================================================ @@ -216,11 +212,9 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode) wxLogSysError(_("can't create file '%s'"), szFileName); return false; } - else - { - Attach(fd); - return true; - } + + Attach(fd); + return true; } // open the file @@ -270,10 +264,9 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) wxLogSysError(_("can't open file '%s'"), szFileName); return false; } - else { - Attach(fd); - return true; - } + + Attach(fd); + return true; } // close @@ -298,51 +291,53 @@ bool wxFile::Close() // ---------------------------------------------------------------------------- // read -wxFileSize_t wxFile::Read(void *pBuf, wxFileSize_t nCount) +ssize_t wxFile::Read(void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); - wxFileSize_t iRc = wxRead(m_fd, pBuf, nCount); + ssize_t iRc = wxRead(m_fd, pBuf, nCount); - if ( iRc == wxInvalidOffset ) + if ( iRc == -1 ) { wxLogSysError(_("can't read from file descriptor %d"), m_fd); + return wxInvalidOffset; } return iRc; } // write -wxFileSize_t wxFile::Write(const void *pBuf, wxFileSize_t nCount) +size_t wxFile::Write(const void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); - wxFileSize_t iRc = wxWrite(m_fd, pBuf, nCount); + ssize_t iRc = wxWrite(m_fd, pBuf, nCount); - if ( iRc == wxInvalidOffset ) + if ( iRc == -1 ) { wxLogSysError(_("can't write to file descriptor %d"), m_fd); m_error = true; iRc = 0; } - return (wxFileSize_t)iRc; + return iRc; } // flush bool wxFile::Flush() { - if ( IsOpened() ) { -#if defined(__VISUALC__) || wxHAVE_FSYNC +#ifdef HAVE_FSYNC + // fsync() only works on disk files and returns errors for pipes, don't + // call it then + if ( IsOpened() && GetKind() == wxFILE_KIND_DISK ) + { if ( wxFsync(m_fd) == -1 ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); return false; } -#else // no fsync - // just do nothing -#endif // fsync } +#endif // HAVE_FSYNC return true; } @@ -352,9 +347,12 @@ bool wxFile::Flush() // ---------------------------------------------------------------------------- // seek -wxFileSize_t wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) +wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) { - wxASSERT( IsOpened() ); + wxASSERT_MSG( IsOpened(), _T("can't seek on closed file") ); + wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart, + wxInvalidOffset, + _T("invalid absolute file offset") ); int origin; switch ( mode ) { @@ -374,12 +372,7 @@ wxFileSize_t wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) break; } - if (ofs == (wxFileOffset) wxInvalidOffset) - { - wxLogSysError(_("can't seek on file descriptor %d, large files support is not enabled."), m_fd); - return wxInvalidOffset; - } - wxFileSize_t iRc = wxSeek(m_fd, ofs, origin); + wxFileOffset iRc = wxSeek(m_fd, ofs, origin); if ( iRc == wxInvalidOffset ) { wxLogSysError(_("can't seek on file descriptor %d"), m_fd); @@ -389,11 +382,11 @@ wxFileSize_t wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) } // get current file offset -wxFileSize_t wxFile::Tell() const +wxFileOffset wxFile::Tell() const { wxASSERT( IsOpened() ); - wxFileSize_t iRc = wxTell(m_fd); + wxFileOffset iRc = wxTell(m_fd); if ( iRc == wxInvalidOffset ) { wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); @@ -403,14 +396,14 @@ wxFileSize_t wxFile::Tell() const } // get current file length -wxFileSize_t wxFile::Length() const +wxFileOffset wxFile::Length() const { wxASSERT( IsOpened() ); - wxFileSize_t iRc = Tell(); + wxFileOffset iRc = Tell(); if ( iRc != wxInvalidOffset ) { // have to use const_cast :-( - wxFileSize_t iLen = ((wxFile *)this)->SeekEnd(); + wxFileOffset iLen = ((wxFile *)this)->SeekEnd(); if ( iLen != wxInvalidOffset ) { // restore old position if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) { @@ -435,11 +428,11 @@ bool wxFile::Eof() const { wxASSERT( IsOpened() ); - wxFileSize_t iRc; + wxFileOffset iRc; #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) // @@ this doesn't work, of course, on unseekable file descriptors - wxFileSize_t ofsCur = Tell(), + wxFileOffset ofsCur = Tell(), ofsMax = Length(); if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset ) iRc = wxInvalidOffset; @@ -449,20 +442,14 @@ bool wxFile::Eof() const iRc = wxEof(m_fd); #endif // Windows/Unix - switch ( iRc ) { - case 1: - break; - - case 0: - return false; - - case wxInvalidOffset: - wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd); - break; - - default: - wxFAIL_MSG(_("invalid eof() return value.")); - } + if ( iRc == 1) + {} + else if ( iRc == 0 ) + return false; + else if ( iRc == wxInvalidOffset ) + wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd); + else + wxFAIL_MSG(_("invalid eof() return value.")); return true; }