X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3a584a7a6ade199990dd4463488e4bbf3545349..91885f468ae257fd295ae46750e91719646fa381:/src/common/textfile.cpp?ds=sidebyside diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index f0e08b4012..3334375b44 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -6,17 +6,13 @@ // Created: 03.04.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ // headers // ============================================================================ -#ifdef __GNUG__ - #pragma implementation "textfile.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -31,13 +27,15 @@ #if wxUSE_TEXTFILE #ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/intl.h" - #include "wx/file.h" - #include "wx/log.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/file.h" + #include "wx/log.h" #endif #include "wx/textfile.h" +#include "wx/filename.h" +#include "wx/buffer.h" // ============================================================================ // wxTextFile class implementation @@ -61,20 +59,22 @@ bool wxTextFile::OnExists() const bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode OpenMode) { - wxFile::OpenMode FileOpenMode = wxFile::read; - - switch (OpenMode) - { + wxFile::OpenMode FileOpenMode; + + switch ( OpenMode ) + { + default: + wxFAIL_MSG( _T("unknown open mode in wxTextFile::Open") ); + // fall through + case ReadAccess : FileOpenMode = wxFile::read; break; + case WriteAccess : FileOpenMode = wxFile::write; break; - default : - wxASSERT(0); // Should not happen. - break; - } + } return m_file.Open(strBufferName.c_str(), FileOpenMode); } @@ -86,93 +86,136 @@ bool wxTextFile::OnClose() } -bool wxTextFile::OnRead(wxMBConv& conv) +bool wxTextFile::OnRead(const wxMBConv& conv) { - // file should be opened and we must be in it's beginning - wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 ); + // file should be opened and we must be in it's beginning + wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 ); + + // read the entire file in memory: this is not the most efficient thing to + // do but there is no good way to avoid it in Unicode build because if we + // read the file block by block we can't convert each block to Unicode + // separately (the last multibyte char in the block might be only partially + // read and so the conversion would fail) and, as the file contents is kept + // in memory by wxTextFile anyhow, it shouldn't be a big problem to read + // the file entirely + const size_t bufSize = (size_t)(m_file.Length() + 4 /* for trailing NULs */ ); + size_t bufPos = 0; + wxCharBuffer buf(bufSize - 1 /* it adds 1 internally */); + + char block[1024]; + for ( bool eof = false; !eof; ) + { + // try to read up to the size of the entire block + ssize_t nRead = m_file.Read(block, WXSIZEOF(block)); + + if ( nRead == wxInvalidOffset ) + { + // read error (error message already given in wxFile::Read) + return false; + } + + if ( nRead == 0 ) + break; -#if wxUSE_UNICODE - char conv_mbBuf[2]; - wchar_t conv_wcBuf[2]; - conv_mbBuf[1] = 0; -#else - (void)conv; -#endif + // this shouldn't happen but don't overwrite the buffer if it does + wxCHECK_MSG( bufPos + nRead <= bufSize, false, + _T("read more than file length?") ); - wxString str; - char ch, chLast = '\0'; - char buf[1024]; - int n, nRead; - do { - nRead = m_file.Read(buf, WXSIZEOF(buf)); - if ( nRead == wxInvalidOffset ) { - // read error (error message already given in wxFile::Read) - return FALSE; + // append to the buffer + memcpy(buf.data() + bufPos, block, nRead); + bufPos += nRead; } - for ( n = 0; n < nRead; n++ ) { - ch = buf[n]; - switch ( ch ) { - case '\n': - // Dos/Unix line termination - AddLine(str, chLast == '\r' ? wxTextFileType_Dos - : wxTextFileType_Unix); - str.Empty(); - chLast = '\n'; - break; - - case '\r': - if ( chLast == '\r' ) { - // Mac empty line - AddLine(wxEmptyString, wxTextFileType_Mac); - } - else - chLast = '\r'; - break; + const wxString str(buf, conv, bufPos); - default: - if ( chLast == '\r' ) { - // Mac line termination - AddLine(str, wxTextFileType_Mac); - chLast = ch; -#if wxUSE_UNICODE - if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1) - conv_wcBuf[0] = ch; - str = conv_wcBuf[0]; -#else - str = ch; -#endif - } - else { - // add to the current line + // this doesn't risk to happen in ANSI build #if wxUSE_UNICODE - if (conv.MB2WC(conv_wcBuf, conv_mbBuf, 2) == (size_t)-1) - conv_wcBuf[0] = ch; - str += conv_wcBuf[0]; -#else - str += ch; -#endif - } - } + if ( bufSize > 4 && str.empty() ) + { + wxLogError(_("Failed to convert file contents to Unicode.")); + return false; + } +#endif // wxUSE_UNICODE + + free(buf.release()); // we don't need this memory any more + + + // now break the buffer in lines + + // last processed character, we need to know if it was a CR or not + wxChar chLast = '\0'; + + // the beginning of the current line, changes inside the loop + wxString::const_iterator lineStart = str.begin(); + const wxString::const_iterator end = str.end(); + for ( wxString::const_iterator p = lineStart; p != end; p++ ) + { + const wxChar ch = *p; + switch ( ch ) + { + case '\n': + // could be a DOS or Unix EOL + if ( chLast == '\r' ) + { + AddLine(wxString(lineStart, p - 1), wxTextFileType_Dos); + } + else // bare '\n', Unix style + { + AddLine(wxString(lineStart, p), wxTextFileType_Unix); + } + + lineStart = p + 1; + break; + + case '\r': + if ( chLast == '\r' ) + { + // Mac empty line + AddLine(wxEmptyString, wxTextFileType_Mac); + lineStart = p + 1; + } + //else: we don't know what this is yet -- could be a Mac EOL or + // start of DOS EOL so wait for next char + break; + + default: + if ( chLast == '\r' ) + { + // Mac line termination + AddLine(wxString(lineStart, p - 1), wxTextFileType_Mac); + lineStart = p; + } + } + + chLast = ch; } - } while ( nRead == WXSIZEOF(buf) ); - // anything in the last line? - if ( !str.IsEmpty() ) { - AddLine(str, wxTextFileType_None); // no line terminator - } + // anything in the last line? + if ( lineStart != end ) + { + // add unterminated last line + AddLine(wxString(lineStart, end), wxTextFileType_None); + } - return TRUE; + return true; } -bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv) +bool wxTextFile::OnWrite(wxTextFileType typeNew, const wxMBConv& conv) { - wxTempFile fileTmp(m_strBufferName); + wxFileName fn = m_strBufferName; + + // We do NOT want wxPATH_NORM_CASE here, or the case will not + // be preserved. + if ( !fn.IsAbsolute() ) + fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | + wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG); + + wxTempFile fileTmp(fn.GetFullPath()); if ( !fileTmp.IsOpened() ) { wxLogError(_("can't write buffer '%s' to disk."), m_strBufferName.c_str()); - return FALSE; + return false; } size_t nCount = GetLineCount(); @@ -188,4 +231,3 @@ bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv) } #endif // wxUSE_TEXTFILE -