// Created: 03.04.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ============================================================================
-#ifdef __GNUG__
- #pragma implementation "textfile.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/textfile.h"
#include "wx/filename.h"
+#include "wx/buffer.h"
// ============================================================================
// wxTextFile class implementation
}
-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 wxUSE_UNICODE
- char conv_mbBuf[2];
- wchar_t conv_wcBuf[2];
- conv_mbBuf[1] = 0;
-#else
- (void)conv;
-#endif
+ if ( nRead == wxInvalidOffset )
+ {
+ // read error (error message already given in wxFile::Read)
+ return false;
+ }
+
+ if ( nRead == 0 )
+ break;
- 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;
+ // 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?") );
+
+ // 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;
+ // this doesn't risk to happen in ANSI build
#if wxUSE_UNICODE
- conv_mbBuf[0] = ch;
- 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
-#if wxUSE_UNICODE
- conv_mbBuf[0] = ch;
- 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;
}
- } while ( nRead == WXSIZEOF(buf) );
+#endif // wxUSE_UNICODE
+
+ free(buf.release()); // we don't need this memory any more
+
+
+ // now break the buffer in lines
- // anything in the last line?
- if ( !str.IsEmpty() ) {
- AddLine(str, wxTextFileType_None); // no line terminator
- }
+ // last processed character, we need to know if it was a CR or not
+ wxChar chLast = '\0';
- return TRUE;
+ // 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' )
+ {
+ if ( p - 1 >= lineStart )
+ {
+ AddLine(wxString(lineStart, p - 1), wxTextFileType_Dos);
+ }
+ else
+ {
+ // there were two line endings, so add an empty line:
+ AddLine(wxEmptyString, 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
+ if ( p - 1 >= lineStart )
+ {
+ AddLine(wxString(lineStart, p - 1), wxTextFileType_Mac);
+ }
+ else
+ {
+ // there were two line endings, so add an empty line:
+ AddLine(wxEmptyString, wxTextFileType_Mac);
+ }
+ lineStart = p;
+ }
+ }
+
+ chLast = ch;
+ }
+
+ // anything in the last line?
+ if ( lineStart != end )
+ {
+ // add unterminated last line
+ AddLine(wxString(lineStart, end), wxTextFileType_None);
+ }
+
+ return true;
}
-bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv)
+bool wxTextFile::OnWrite(wxTextFileType typeNew, const wxMBConv& conv)
{
wxFileName fn = m_strBufferName;
+
+ // We do NOT want wxPATH_NORM_CASE here, or the case will not
+ // be preserved.
if ( !fn.IsAbsolute() )
- fn.Normalize();
+ fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE |
+ wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG);
- wxTempFile fileTmp(fn.GetFullName());
+ 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();
}
#endif // wxUSE_TEXTFILE
-
projects / wxWidgets.git / blobdiff