XML import corrections

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 8aaa9ac05e64ec4eddf1c2ab06831ad2bcf2c65f..f3f502597390dd11a6fb0112c27fa5d4e4b4b6a9 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -88,6 +88,10 @@
 
 #include  <stdio.h>       // SEEK_xxx constants
 
 
 #include  <stdio.h>       // SEEK_xxx constants
 

+#ifndef __WXWINCE__
+    #include <errno.h>
+#endif
+

 // Windows compilers don't have these constants
 #ifndef W_OK
     enum
 // 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;
 wxFile::wxFile(const wxString& fileName, OpenMode mode)
 {
     m_fd = fd_invalid;

-    m_error = false;
+    m_lasterror = 0;

 
     Open(fileName, mode);
 }
 
 
     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)
 {
 // 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 );
                      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;
     {
         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);
 
 
     int fd = wxOpen( fileName, flags, accessMode);
 

-    if ( fd == -1 )
+    if ( CheckForError(fd) )

     {
         wxLogSysError(_("can't open file '%s'"), fileName);
         return false;
     {
         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() ) {
 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;
         {
             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);
 
 
     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;
     {
         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);
 
 
     ssize_t iRc = wxWrite(m_fd, pBuf, nCount);
 

-    if ( iRc == -1 )
+    if ( CheckForError(iRc) )

     {
         wxLogSysError(_("can't write to file descriptor %d"), m_fd);
     {
         wxLogSysError(_("can't write to file descriptor %d"), m_fd);

-        m_error = true;

         iRc = 0;
     }
 
         iRc = 0;
     }
 


@@ -312,7 +331,12 @@ bool wxFile::Write(const wxString& s, const wxMBConv& conv)
   if ( !buf )
       return false;
 
   if ( !buf )
       return false;
 

+#if wxUSE_UNICODE

   const size_t size = buf.length();
   const size_t size = buf.length();

+#else
+  const size_t size = s.length();
+#endif
+

   return Write(buf, size) == size;
 }
 
   return Write(buf, size) == size;
 }
 


@@ -324,7 +348,7 @@ bool wxFile::Flush()
     // call it then
     if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
     {
     // 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;
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return false;


@@ -366,7 +390,7 @@ wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
     }
 
     wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
     }
 
     wxFileOffset iRc = wxSeek(m_fd, ofs, origin);

-    if ( iRc == wxInvalidOffset )
+    if ( CheckForError(iRc) )

     {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
     }
     {
         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);
     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);
     }
     {
         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 ) {
 
     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 ) {
         if ( iLen != wxInvalidOffset ) {
             // restore old position
             if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {


@@ -425,6 +448,7 @@ wxFileOffset wxFile::Length() const
 
     if ( iRc == wxInvalidOffset )
     {
 
     if ( iRc == wxInvalidOffset )
     {

+        // last error was already set by Tell()

         wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
     }
 
         wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
     }