X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..f40f8e17226c2080dec017e2043fe59e2d21e15b:/src/common/ffile.cpp?ds=inline diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp index 503e5bfa0d..5212066a63 100644 --- a/src/common/ffile.cpp +++ b/src/common/ffile.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: ffile.cpp +// Name: src/common/ffile.cpp // Purpose: wxFFile encapsulates "FILE *" IO stream // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "ffile.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,6 +29,11 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" + #include "wx/crt.h" +#endif + +#ifdef __WINDOWS__ +#include "wx/msw/mslu.h" #endif #include "wx/ffile.h" @@ -45,14 +46,14 @@ // opening the file // ---------------------------------------------------------------------------- -wxFFile::wxFFile(const wxChar *filename, const wxChar *mode) +wxFFile::wxFFile(const wxString& filename, const wxString& mode) { Detach(); (void)Open(filename, mode); } -bool wxFFile::Open(const wxChar *filename, const wxChar *mode) +bool wxFFile::Open(const wxString& filename, const wxString& mode) { wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") ); @@ -62,12 +63,12 @@ bool wxFFile::Open(const wxChar *filename, const wxChar *mode) { wxLogSysError(_("can't open file '%s'"), filename); - return FALSE; + return false; } m_name = filename; - return TRUE; + return true; } bool wxFFile::Close() @@ -78,53 +79,53 @@ bool wxFFile::Close() { wxLogSysError(_("can't close file '%s'"), m_name.c_str()); - return FALSE; + return false; } Detach(); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- // read/write // ---------------------------------------------------------------------------- -bool wxFFile::ReadAll(wxString *str) +bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv) { - wxCHECK_MSG( str, FALSE, wxT("invalid parameter") ); - wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") ); + wxCHECK_MSG( str, false, wxT("invalid parameter") ); + wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") ); + wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") ); + size_t length = wx_truncate_cast(size_t, Length()); + wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") ); clearerr(m_fp); - str->Empty(); - str->Alloc(Length()); + wxCharBuffer buf(length + 1); - wxChar buf[1024]; - static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0' - while ( !Eof() ) - { - size_t nRead = fread(buf, sizeof(wxChar), nSize, m_fp); - if ( (nRead < nSize) && Error() ) - { - wxLogSysError(_("Read error on file '%s'"), m_name.c_str()); + // note that real length may be less than file length for text files with DOS EOLs + // ('\r's get dropped by CRT when reading which means that we have + // realLen = fileLen - numOfLinesInTheFile) + length = fread(buf.data(), sizeof(char), length, m_fp); - return FALSE; - } - //else: just EOF + if ( Error() ) + { + wxLogSysError(_("Read error on file '%s'"), m_name.c_str()); - buf[nRead] = 0; - *str += buf; + return false; } - return TRUE; + buf.data()[length] = 0; + *str = wxString(buf, conv); + + return true; } size_t wxFFile::Read(void *pBuf, size_t nCount) { - wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") ); - wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") ); + wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") ); + wxCHECK_MSG( IsOpened(), 0, wxT("can't read from closed file") ); size_t nRead = fread(pBuf, 1, nCount, m_fp); if ( (nRead < nCount) && Error() ) @@ -137,8 +138,8 @@ size_t wxFFile::Read(void *pBuf, size_t nCount) size_t wxFFile::Write(const void *pBuf, size_t nCount) { - wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") ); - wxCHECK_MSG( IsOpened(), FALSE, wxT("can't write to closed file") ); + wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") ); + wxCHECK_MSG( IsOpened(), 0, wxT("can't write to closed file") ); size_t nWritten = fwrite(pBuf, 1, nCount, m_fp); if ( nWritten < nCount ) @@ -149,30 +150,38 @@ size_t wxFFile::Write(const void *pBuf, size_t nCount) return nWritten; } +bool wxFFile::Write(const wxString& s, const wxMBConv& conv) +{ + const wxWX2MBbuf buf = s.mb_str(conv); + if ( !buf ) + return false; + + const size_t size = strlen(buf); // FIXME: use buf.length() when available + return Write(buf, size) == size; +} + bool wxFFile::Flush() { if ( IsOpened() ) { - // fflush returns non-zero on error - // - if ( fflush(m_fp) ) + if ( fflush(m_fp) != 0 ) { wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str()); - return FALSE; + return false; } } - return TRUE; + return true; } // ---------------------------------------------------------------------------- // seeking // ---------------------------------------------------------------------------- -bool wxFFile::Seek(long ofs, wxSeekMode mode) +bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode) { - wxCHECK_MSG( IsOpened(), FALSE, wxT("can't seek on closed file") ); + wxCHECK_MSG( IsOpened(), false, wxT("can't seek on closed file") ); int origin; switch ( mode ) @@ -194,44 +203,55 @@ bool wxFFile::Seek(long ofs, wxSeekMode mode) break; } - if ( fseek(m_fp, ofs, origin) != 0 ) +#ifndef wxHAS_LARGE_FFILES + if ((long)ofs != ofs) + { + wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str()); + + return false; + } + + if ( wxFseek(m_fp, (long)ofs, origin) != 0 ) +#else + if ( wxFseek(m_fp, ofs, origin) != 0 ) +#endif { wxLogSysError(_("Seek error on file '%s'"), m_name.c_str()); - return FALSE; + return false; } - return TRUE; + return true; } -size_t wxFFile::Tell() const +wxFileOffset wxFFile::Tell() const { - wxCHECK_MSG( IsOpened(), (size_t)-1, - _T("wxFFile::Tell(): file is closed!") ); + wxCHECK_MSG( IsOpened(), wxInvalidOffset, + wxT("wxFFile::Tell(): file is closed!") ); - long rc = ftell(m_fp); - if ( rc == -1 ) + wxFileOffset rc = wxFtell(m_fp); + if ( rc == wxInvalidOffset ) { wxLogSysError(_("Can't find current position in file '%s'"), m_name.c_str()); } - return (size_t)rc; + return rc; } -size_t wxFFile::Length() const +wxFileOffset wxFFile::Length() const { - wxCHECK_MSG( IsOpened(), (size_t)-1, - _T("wxFFile::Length(): file is closed!") ); + wxCHECK_MSG( IsOpened(), wxInvalidOffset, + wxT("wxFFile::Length(): file is closed!") ); - wxFFile& self = *(wxFFile *)this; // const_cast + wxFFile& self = *const_cast(this); - size_t posOld = Tell(); - if ( posOld != (size_t)-1 ) + wxFileOffset posOld = Tell(); + if ( posOld != wxInvalidOffset ) { if ( self.SeekEnd() ) { - size_t len = Tell(); + wxFileOffset len = Tell(); (void)self.Seek(posOld); @@ -239,7 +259,7 @@ size_t wxFFile::Length() const } } - return (size_t)-1; + return wxInvalidOffset; } #endif // wxUSE_FFILE