// Name: textfile.cpp
// Purpose: implementation of wxTextFile class
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 03.04.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// ----------------------------------------------------------------------------
// static variables
// ----------------------------------------------------------------------------
-
+
// default type is the native one
const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
Type_Dos;
#elif defined(__UNIX__)
Type_Unix;
case Type_Unix: nUnix++; break; \
case Type_Dos: nDos++; break; \
case Type_Mac: nMac++; break; \
+ default: wxFAIL_MSG("unknown line terminator"); \
}
uint n;
wxString str;
char ch, chLast = '\0';
+ char buf[1024];
+ int n, nRead;
while ( !m_file.Eof() ) {
- // @@ should really use a buffer for efficiency
- if ( m_file.Read(&ch, sizeof(ch)) == ofsInvalid ) {
- // read error
+ nRead = m_file.Read(buf, WXSIZEOF(buf));
+ if ( nRead == wxInvalidOffset ) {
+ // read error (error message already given in wxFile::Read)
m_file.Close();
return FALSE;
}
#pragma message("wxTextFile::Read() hasn't been tested with Mac files.")
#endif
- switch ( ch ) {
- case '\n':
- // Dos/Unix line termination
- m_aLines.Add(str);
- m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix);
- str.Empty();
- chLast = '\n';
- break;
-
- case '\r':
- if ( chLast == '\r' ) {
- // Mac empty line
- m_aLines.Add("");
- m_aTypes.Add(Type_Mac);
- }
- else
- chLast = '\r';
- break;
-
- default:
- if ( chLast == '\r' ) {
- // Mac line termination
+ for ( n = 0; n < nRead; n++ ) {
+ ch = buf[n];
+ switch ( ch ) {
+ case '\n':
+ // Dos/Unix line termination
m_aLines.Add(str);
- m_aTypes.Add(Type_Mac);
- str = ch;
- }
- else {
- // add to the current line
- str += ch;
- }
+ m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix);
+ str.Empty();
+ chLast = '\n';
+ break;
+
+ case '\r':
+ if ( chLast == '\r' ) {
+ // Mac empty line
+ m_aLines.Add("");
+ m_aTypes.Add(Type_Mac);
+ }
+ else
+ chLast = '\r';
+ break;
+
+ default:
+ if ( chLast == '\r' ) {
+ // Mac line termination
+ m_aLines.Add(str);
+ m_aTypes.Add(Type_Mac);
+ str = ch;
+ }
+ else {
+ // add to the current line
+ str += ch;
+ }
+ }
}
}
uint nCount = m_aLines.Count();
for ( uint n = 0; n < nCount; n++ ) {
- fileTmp.Write(m_aLines[n] +
+ fileTmp.Write(m_aLines[n] +
GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
}
// replace the old file with this one
return fileTmp.Commit();
-}
\ No newline at end of file
+}