don't crash on weird line endings like \r\r\n

[wxWidgets.git] / src / common / ffile.cpp

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 7887d45fe5742f5c0f06d786788765049dec48b0..997bf03d2b56a5bb7a3fbb2cde74a9a5d7b72865 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,6 +31,10 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#ifdef __WINDOWS__
+#include "wx/msw/mslu.h"
+#endif
+

 #include "wx/ffile.h"
 
 // ============================================================================
 #include "wx/ffile.h"
 
 // ============================================================================


@@ -103,43 +103,40 @@ bool wxFFile::Close()
 // read/write
 // ----------------------------------------------------------------------------
 
 // 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( Length() >= 0, false, wxT("invalid length") );
 {
     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 = (size_t)Length();
-    wxCHECK_MSG( length == Length(), false, wxT("huge file not supported") );
+    size_t length = wx_truncate_cast(size_t, Length());
+    wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );

 
     clearerr(m_fp);
 
 
     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;

     }
 
     }
 

+    buf.data()[length] = 0;
+    *str = wxString(buf, conv);
+

     return true;
 }
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
 {
     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() )
 
     size_t nRead = fread(pBuf, 1, nCount, m_fp);
     if ( (nRead < nCount) && Error() )


@@ -152,8 +149,8 @@ size_t wxFFile::Read(void *pBuf, size_t nCount)
 
 size_t wxFFile::Write(const 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 )
 
     size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
     if ( nWritten < nCount )