[ 1936700 ] wxCAL_SHOW_WEEK_NUMBERS, slightly modified

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 1ba27db9f15da8369f29ce952fe81acef960e544..ef27836e890285a6a51871130e301263e37ff7ee 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -86,10 +86,10 @@ 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
+    wxASSERT_MSG( m_file.IsOpened(), _T("can't read closed file") );
 
     // 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
@@ -98,14 +98,35 @@ bool wxTextFile::OnRead(wxMBConv& conv)
     // 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 = m_file.Length() + 4 /* for trailing NULs */;
-    size_t bufPos = 0;
-    wxCharBuffer buf(bufSize - 1 /* it adds 1 internally */);
-
+    size_t bufSize = 0,
+           bufPos = 0;
     char block[1024];
-    for ( bool eof = false; !eof; )
+    wxCharBuffer buf;
+
+    // first determine if the file is seekable or not and so whether we can
+    // determine its length in advance
+    wxFileOffset fileLength;
+    {
+        wxLogNull logNull;
+        fileLength = m_file.Length();
+    }
+
+    // some non-seekable files under /proc under Linux pretend that they're
+    // seekable but always return 0; others do return an error
+    const bool seekable = fileLength != wxInvalidOffset && fileLength != 0;
+    if ( seekable )
+    {
+        // we know the required length, so set the buffer size in advance
+        bufSize = fileLength;
+        if ( !buf.extend(bufSize - 1 /* it adds 1 internally */) )
+            return false;
+
+        // if the file is seekable, also check that we're at its beginning
+        wxASSERT_MSG( m_file.Tell() == 0, _T("should be at start of file") );
+    }
+
+    for ( ;; )
     {
-        // try to read up to the size of the entire block
         ssize_t nRead = m_file.Read(block, WXSIZEOF(block));
 
         if ( nRead == wxInvalidOffset )
@@ -114,35 +135,46 @@ bool wxTextFile::OnRead(wxMBConv& conv)
             return false;
         }
 
-        eof = nRead == 0;
-        if ( eof )
+        if ( nRead == 0 )
         {
-            // append 4 trailing NUL bytes: this is needed to ensure that the
-            // string is going to be NUL-terminated, whatever is the encoding
-            // used (even UTF-32)
-            block[0] =
-            block[1] =
-            block[2] =
-            block[3] = '\0';
-            nRead = 4;
+            // if no bytes have been read, presumably this is a valid-but-empty file
+            if ( bufPos == 0 )
+                return true;
+
+            // otherwise we've finished reading the file
+            break;
         }
 
-        // 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?") );
+        if ( seekable )
+        {
+            // 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?") );
+        }
+        else // !seekable
+        {
+            // for non-seekable files we have to allocate more memory on the go
+            if ( !buf.extend(bufPos + nRead - 1 /* it adds 1 internally */) )
+                return false;
+        }
 
         // append to the buffer
         memcpy(buf.data() + bufPos, block, nRead);
         bufPos += nRead;
     }
 
-    const wxString str(buf, conv);
+    if ( !seekable )
+    {
+        bufSize = bufPos;
+    }
 
-    // this doesn't risk to happen in ANSI build
+    const wxString str(buf, conv, bufPos);
+
+    // there's no risk of this happening in ANSI build
 #if wxUSE_UNICODE
     if ( bufSize > 4 && str.empty() )
     {
-        wxLogError(_("Failed to convert file contents to Unicode."));
+        wxLogError(_("Failed to convert file \"%s\" to Unicode."), GetName());
         return false;
     }
 #endif // wxUSE_UNICODE
@@ -167,7 +199,15 @@ bool wxTextFile::OnRead(wxMBConv& conv)
                 // could be a DOS or Unix EOL
                 if ( chLast == '\r' )
                 {
-                    AddLine(wxString(lineStart, p - 1), wxTextFileType_Dos);
+                    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
                 {
@@ -192,7 +232,15 @@ bool wxTextFile::OnRead(wxMBConv& conv)
                 if ( chLast == '\r' )
                 {
                     // Mac line termination
-                    AddLine(wxString(lineStart, p - 1), wxTextFileType_Mac);
+                    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;
                 }
         }
@@ -211,7 +259,7 @@ bool wxTextFile::OnRead(wxMBConv& conv)
 }
 
 
-bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv)
+bool wxTextFile::OnWrite(wxTextFileType typeNew, const wxMBConv& conv)
 {
     wxFileName fn = m_strBufferName;
 
@@ -241,4 +289,3 @@ bool wxTextFile::OnWrite(wxTextFileType typeNew, wxMBConv& conv)
 }
 
 #endif // wxUSE_TEXTFILE
-