X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af58844636f51ca9c9350c66de3baf427d3e8646..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/common/file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index d4514c5693..f3f5025973 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -88,6 +88,10 @@
 
 #include  <stdio.h>       // SEEK_xxx constants
 
+#ifndef __WXWINCE__
+    #include <errno.h>
+#endif
+
 // Windows compilers don't have these constants
 #ifndef W_OK
     enum
@@ -176,11 +180,27 @@ bool wxFile::Access(const wxString& name, OpenMode mode)
 wxFile::wxFile(const wxString& fileName, OpenMode mode)
 {
     m_fd = fd_invalid;
-    m_error = false;
+    m_lasterror = 0;
 
     Open(fileName, mode);
 }
 
+bool wxFile::CheckForError(wxFileOffset rc) const
+{
+    if ( rc != -1 )
+        return false;
+
+    const_cast<wxFile *>(this)->m_lasterror =
+#ifndef __WXWINCE__
+                                                errno
+#else
+                                                ::GetLastError()
+#endif
+                                                ;
+
+    return true;
+}
+
 // create the file, fail if it already exists and bOverwrite
 bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode)
 {
@@ -190,7 +210,7 @@ bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode)
                      O_BINARY | O_WRONLY | O_CREAT |
                      (bOverwrite ? O_TRUNC : O_EXCL),
                      accessMode );
-    if ( fd == -1 )
+    if ( CheckForError(fd) )
     {
         wxLogSysError(_("can't create file '%s'"), fileName);
         return false;
@@ -242,7 +262,7 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
 
     int fd = wxOpen( fileName, flags, accessMode);
 
-    if ( fd == -1 )
+    if ( CheckForError(fd) )
     {
         wxLogSysError(_("can't open file '%s'"), fileName);
         return false;
@@ -256,7 +276,7 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
 bool wxFile::Close()
 {
     if ( IsOpened() ) {
-        if (wxClose(m_fd) == -1)
+        if ( CheckForError(wxClose(m_fd)) )
         {
             wxLogSysError(_("can't close file descriptor %d"), m_fd);
             m_fd = fd_invalid;
@@ -280,7 +300,7 @@ ssize_t wxFile::Read(void *pBuf, size_t nCount)
 
     ssize_t iRc = wxRead(m_fd, pBuf, nCount);
 
-    if ( iRc == -1 )
+    if ( CheckForError(iRc) )
     {
         wxLogSysError(_("can't read from file descriptor %d"), m_fd);
         return wxInvalidOffset;
@@ -296,10 +316,9 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 
     ssize_t iRc = wxWrite(m_fd, pBuf, nCount);
 
-    if ( iRc == -1 )
+    if ( CheckForError(iRc) )
     {
         wxLogSysError(_("can't write to file descriptor %d"), m_fd);
-        m_error = true;
         iRc = 0;
     }
 
@@ -312,7 +331,12 @@ bool wxFile::Write(const wxString& s, const wxMBConv& conv)
   if ( !buf )
       return false;
 
-  const size_t size = strlen(buf); // FIXME: use buf.length() when available
+#if wxUSE_UNICODE
+  const size_t size = buf.length();
+#else
+  const size_t size = s.length();
+#endif
+
   return Write(buf, size) == size;
 }
 
@@ -324,7 +348,7 @@ bool wxFile::Flush()
     // call it then
     if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
     {
-        if ( wxFsync(m_fd) == -1 )
+        if ( CheckForError(wxFsync(m_fd)) )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return false;
@@ -342,15 +366,15 @@ bool wxFile::Flush()
 // seek
 wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
 {
-    wxASSERT_MSG( IsOpened(), _T("can't seek on closed file") );
+    wxASSERT_MSG( IsOpened(), wxT("can't seek on closed file") );
     wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
                  wxInvalidOffset,
-                 _T("invalid absolute file offset") );
+                 wxT("invalid absolute file offset") );
 
     int origin;
     switch ( mode ) {
         default:
-            wxFAIL_MSG(_T("unknown seek origin"));
+            wxFAIL_MSG(wxT("unknown seek origin"));
 
         case wxFromStart:
             origin = SEEK_SET;
@@ -366,7 +390,7 @@ wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
     }
 
     wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
-    if ( iRc == wxInvalidOffset )
+    if ( CheckForError(iRc) )
     {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
     }
@@ -380,7 +404,7 @@ wxFileOffset wxFile::Tell() const
     wxASSERT( IsOpened() );
 
     wxFileOffset iRc = wxTell(m_fd);
-    if ( iRc == wxInvalidOffset )
+    if ( CheckForError(iRc) )
     {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
     }
@@ -410,8 +434,7 @@ wxFileOffset wxFile::Length() const
 
     wxFileOffset iRc = Tell();
     if ( iRc != wxInvalidOffset ) {
-        // have to use const_cast :-(
-        wxFileOffset iLen = ((wxFile *)this)->SeekEnd();
+        wxFileOffset iLen = const_cast<wxFile *>(this)->SeekEnd();
         if ( iLen != wxInvalidOffset ) {
             // restore old position
             if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {
@@ -425,6 +448,7 @@ wxFileOffset wxFile::Length() const
 
     if ( iRc == wxInvalidOffset )
     {
+        // last error was already set by Tell()
         wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
     }
 
@@ -450,14 +474,17 @@ bool wxFile::Eof() const
     iRc = wxEof(m_fd);
 #endif // Windows/Unix
 
-    if ( iRc == 1)
-        {}
-    else if ( iRc == 0 )
+    if ( iRc == 0 )
         return false;
-    else if ( iRc == wxInvalidOffset )
+
+    if ( iRc == wxInvalidOffset )
+    {
         wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
-    else
-        wxFAIL_MSG(_T("invalid eof() return value."));
+    }
+    else if ( iRc != 1 )
+    {
+        wxFAIL_MSG(wxT("invalid eof() return value."));
+    }
 
     return true;
 }