Restore ability to parse hours only with wxDateTime::ParseTime().

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 736bbea55f9717f1778d24470b6851ecb2cab0dd..932498efcd724cc5485088b8747ad03f14823fde 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        ffile.cpp
+// Name:        src/common/ffile.cpp
 // Purpose:     wxFFile encapsulates "FILE *" IO stream
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // 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"
 
@@ -33,6 +29,11 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/crt.h"
+#endif
+
+#ifdef __WINDOWS__
+#include "wx/msw/mslu.h"
 #endif
 
 #include "wx/ffile.h"
@@ -41,30 +42,18 @@
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// seek and tell with large file support if available
-// ----------------------------------------------------------------------------
-
-#ifdef HAVE_FSEEKO
-#   define wxFseek fseeko
-#   define wxFtell ftello
-#else
-#   define wxFseek fseek
-#   define wxFtell ftell
-#endif
-
 // ----------------------------------------------------------------------------
 // opening the file
 // ----------------------------------------------------------------------------
 
-wxFFile::wxFFile(const wxChar *filename, const wxChar *mode)
+wxFFile::wxFFile(const wxString& filename, const wxString& mode)
 {
     Detach();
 
     (void)Open(filename, mode);
 }
 
-bool wxFFile::Open(const wxChar *filename, const wxChar *mode)
+bool wxFFile::Open(const wxString& filename, const wxString& mode)
 {
     wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
 
@@ -103,43 +92,42 @@ bool wxFFile::Close()
 // 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") );
-    size_t length = (size_t)Length();
+    size_t length = wx_truncate_cast(size_t, Length());
     wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
 
     clearerr(m_fp);
 
-    str->Empty();
-    str->Alloc(length);
+    wxCharBuffer buf(length);
 
-    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(), 1, 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;
+
+    wxString strTmp(buf, conv);
+    str->swap(strTmp);
+
     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() )
@@ -152,8 +140,8 @@ size_t wxFFile::Read(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 )
@@ -164,13 +152,21 @@ size_t wxFFile::Write(const void *pBuf, size_t nCount)
     return nWritten;
 }
 
+bool wxFFile::Write(const wxString& s, const wxMBConv& conv)
+{
+  const wxWX2MBbuf buf = s.mb_str(conv);
+  if ( !buf )
+      return false;
+
+  const size_t size = strlen(buf); // FIXME: use buf.length() when available
+  return Write(buf, size) == size;
+}
+
 bool wxFFile::Flush()
 {
     if ( IsOpened() )
     {
-        // fflush returns non-zero on error
-        //
-        if ( fflush(m_fp) )
+        if ( fflush(m_fp) != 0 )
         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
 
@@ -209,7 +205,7 @@ bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
             break;
     }
 
-#ifndef HAVE_FSEEKO
+#ifndef wxHAS_LARGE_FFILES
     if ((long)ofs != ofs)
     {
         wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
@@ -233,7 +229,7 @@ bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
 wxFileOffset wxFFile::Tell() const
 {
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
-                 _T("wxFFile::Tell(): file is closed!") );
+                 wxT("wxFFile::Tell(): file is closed!") );
 
     wxFileOffset rc = wxFtell(m_fp);
     if ( rc == wxInvalidOffset )
@@ -248,9 +244,9 @@ wxFileOffset wxFFile::Tell() const
 wxFileOffset wxFFile::Length() const
 {
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
-                 _T("wxFFile::Length(): file is closed!") );
+                 wxT("wxFFile::Length(): file is closed!") );
 
-    wxFFile& self = *(wxFFile *)this;   // const_cast
+    wxFFile& self = *const_cast<wxFFile *>(this);
 
     wxFileOffset posOld = Tell();
     if ( posOld != wxInvalidOffset )