Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 3605e2a7071b91c19e617a079665f092f5a16336..9d15b4f9b65d501e7dd71a5bce998b04666b42fa 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -6,10 +6,10 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "wfstream.h"
 #endif
 
 #pragma implementation "wfstream.h"
 #endif
 


@@ -20,12 +20,14 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 
 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 

+#if wxUSE_FILE
+

 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------


@@ -34,26 +36,26 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName)
   : wxInputStream()
 {
     m_file = new wxFile(fileName, wxFile::read);
   : wxInputStream()
 {
     m_file = new wxFile(fileName, wxFile::read);

-    m_file_destroy = TRUE;
+    m_file_destroy = true;

 }
 
 wxFileInputStream::wxFileInputStream()
   : wxInputStream()
 {
 }
 
 wxFileInputStream::wxFileInputStream()
   : wxInputStream()
 {

-    m_file_destroy = FALSE;
+    m_file_destroy = false;

     m_file = NULL;
 }
 
 wxFileInputStream::wxFileInputStream(wxFile& file)
 {
     m_file = &file;
     m_file = NULL;
 }
 
 wxFileInputStream::wxFileInputStream(wxFile& file)
 {
     m_file = &file;

-    m_file_destroy = FALSE;
+    m_file_destroy = false;

 }
 
 wxFileInputStream::wxFileInputStream(int fd)
 {
     m_file = new wxFile(fd);
 }
 
 wxFileInputStream::wxFileInputStream(int fd)
 {
     m_file = new wxFile(fd);

-    m_file_destroy = TRUE;
+    m_file_destroy = true;

 }
 
 wxFileInputStream::~wxFileInputStream()
 }
 
 wxFileInputStream::~wxFileInputStream()


@@ -62,35 +64,43 @@ wxFileInputStream::~wxFileInputStream()
         delete m_file;
 }
 
         delete m_file;
 }
 

-size_t wxFileInputStream::GetSize() const
+wxFileOffset wxFileInputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 {
     return m_file->Length();
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    off_t ret;
+    ssize_t ret = m_file->Read(buffer, size);

 
 

-    ret = m_file->Read(buffer, size);
+    // NB: we can't use a switch here because HP-UX CC doesn't allow
+    //     switching over long long (which size_t is in 64bit mode)

 
 

-    m_lasterror = wxStream_NOERROR;
-    if (m_file->Eof())
-        m_lasterror = wxStream_EOF;
-    if (ret == wxInvalidOffset) 
+    if ( !ret )
+    {
+        // nothing read, so nothing more to read
+        m_lasterror = wxSTREAM_EOF;
+    }
+    else if ( ret == wxInvalidOffset )

     {
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         ret = 0;
     }
         ret = 0;
     }

+    else
+    {
+        // normal case
+        m_lasterror = wxSTREAM_NO_ERROR;
+    }

 
     return ret;
 }
 
 
     return ret;
 }
 

-off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
     return m_file->Seek(pos, mode);
 }
 
 {
     return m_file->Seek(pos, mode);
 }
 

-off_t wxFileInputStream::OnSysTell() const
+wxFileOffset wxFileInputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 {
     return m_file->Tell();
 }


@@ -102,8 +112,8 @@ off_t wxFileInputStream::OnSysTell() const
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
     m_file = new wxFile(fileName, wxFile::write);
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
     m_file = new wxFile(fileName, wxFile::write);

-    m_file_destroy = TRUE;
-    
+    m_file_destroy = true;
+

     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;
     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;


@@ -118,25 +128,25 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {
     m_file = &file;
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {
     m_file = &file;

-    m_file_destroy = FALSE;
+    m_file_destroy = false;

 }
 
 wxFileOutputStream::wxFileOutputStream()
 }
 
 wxFileOutputStream::wxFileOutputStream()

-  : wxOutputStream()
+                  : wxOutputStream()

 {
 {

-    m_file_destroy = FALSE;
+    m_file_destroy = false;

     m_file = NULL;
 }
 
 wxFileOutputStream::wxFileOutputStream(int fd)
 {
     m_file = new wxFile(fd);
     m_file = NULL;
 }
 
 wxFileOutputStream::wxFileOutputStream(int fd)
 {
     m_file = new wxFile(fd);

-    m_file_destroy = TRUE;
+    m_file_destroy = true;

 }
 
 wxFileOutputStream::~wxFileOutputStream()
 {
 }
 
 wxFileOutputStream::~wxFileOutputStream()
 {

-    if (m_file_destroy) 
+    if (m_file_destroy)

     {
         Sync();
         delete m_file;
     {
         Sync();
         delete m_file;


@@ -146,19 +156,18 @@ wxFileOutputStream::~wxFileOutputStream()
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);

-    if (m_file->Error())
-        m_lasterror = wxStream_WRITE_ERR;
-    else
-        m_lasterror = wxStream_NOERROR;
+
+    m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+

     return ret;
 }
 
     return ret;
 }
 

-off_t wxFileOutputStream::OnSysTell() const
+wxFileOffset wxFileOutputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 
 {
     return m_file->Tell();
 }
 

-off_t wxFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
     return m_file->Seek(pos, mode);
 }
 {
     return m_file->Seek(pos, mode);
 }


@@ -169,11 +178,38 @@ void wxFileOutputStream::Sync()
     m_file->Flush();
 }
 
     m_file->Flush();
 }
 

-size_t wxFileOutputStream::GetSize() const
+wxFileOffset wxFileOutputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 {
     return m_file->Length();
 }
 

+// ----------------------------------------------------------------------------
+// wxTempFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName)
+{
+    m_file = new wxTempFile(fileName);
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+wxTempFileOutputStream::~wxTempFileOutputStream()
+{
+    if (m_file->IsOpened())
+        Discard();
+    delete m_file;
+}
+
+size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    if (IsOk() && m_file->Write(buffer, size))
+        return size;
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+    return 0;
+}
+

 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------


@@ -184,34 +220,39 @@ wxFileStream::wxFileStream(const wxString& fileName)
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 

+#endif //wxUSE_FILE
+
+#if wxUSE_FFILE
+

 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 

-wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
-  : wxInputStream()
+wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
+                                       const wxChar *mode)
+                  : wxInputStream()

 {
 {

-    m_file = new wxFFile(fileName, "rb");
-    m_file_destroy = TRUE;
+    m_file = new wxFFile(fileName, mode);
+    m_file_destroy = true;

 }
 
 wxFFileInputStream::wxFFileInputStream()
 }
 
 wxFFileInputStream::wxFFileInputStream()

-  : wxInputStream()
+                  : wxInputStream()

 {
 {

-    m_file_destroy = FALSE;

     m_file = NULL;
     m_file = NULL;

+    m_file_destroy = false;

 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)
 {
     m_file = &file;
 }
 
 wxFFileInputStream::wxFFileInputStream(wxFFile& file)
 {
     m_file = &file;

-    m_file_destroy = FALSE;
+    m_file_destroy = false;

 }
 
 wxFFileInputStream::wxFFileInputStream(FILE *file)
 {
     m_file = new wxFFile(file);
 }
 
 wxFFileInputStream::wxFFileInputStream(FILE *file)
 {
     m_file = new wxFFile(file);

-    m_file_destroy = TRUE;
+    m_file_destroy = true;

 }
 
 wxFFileInputStream::~wxFFileInputStream()
 }
 
 wxFFileInputStream::~wxFFileInputStream()


@@ -220,34 +261,33 @@ wxFFileInputStream::~wxFFileInputStream()
         delete m_file;
 }
 
         delete m_file;
 }
 

-size_t wxFFileInputStream::GetSize() const
+wxFileOffset wxFFileInputStream::GetLength() const

 {
     return m_file->Length();
 }
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 {
     return m_file->Length();
 }
 
 size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    off_t ret;
-
-    ret = m_file->Read(buffer, size);
+    ssize_t ret = m_file->Read(buffer, size);

 
 

-    if (m_file->Eof())
-        m_lasterror = wxStream_EOF;
-    if (ret == wxInvalidOffset) 
+    // It is not safe to call Eof() if the file is not opened.
+    if (!m_file->IsOpened() || m_file->Eof())
+        m_lasterror = wxSTREAM_EOF;
+    if (ret == wxInvalidOffset)

     {
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         ret = 0;
     }
 
     return ret;
 }
 
         ret = 0;
     }
 
     return ret;
 }
 

-off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
 {

-    return m_file->Seek(pos, mode);
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;

 }
 
 }
 

-off_t wxFFileInputStream::OnSysTell() const
+wxFileOffset wxFFileInputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 {
     return m_file->Tell();
 }


@@ -256,11 +296,12 @@ off_t wxFFileInputStream::OnSysTell() const
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 

-wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
+wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
+                                         const wxChar *mode)

 {
 {

-    m_file = new wxFFile(fileName, "w+b");
-    m_file_destroy = TRUE;
-    
+    m_file = new wxFFile(fileName, mode);
+    m_file_destroy = true;
+

     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;
     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;


@@ -275,25 +316,25 @@ wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
 {
     m_file = &file;
 wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
 {
     m_file = &file;

-    m_file_destroy = FALSE;
+    m_file_destroy = false;

 }
 
 wxFFileOutputStream::wxFFileOutputStream()
 }
 
 wxFFileOutputStream::wxFFileOutputStream()

-  : wxOutputStream()
+                   : wxOutputStream()

 {
 {

-    m_file_destroy = FALSE;

     m_file = NULL;
     m_file = NULL;

+    m_file_destroy = false;

 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 {
     m_file = new wxFFile(file);
 }
 
 wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 {
     m_file = new wxFFile(file);

-    m_file_destroy = TRUE;
+    m_file_destroy = true;

 }
 
 wxFFileOutputStream::~wxFFileOutputStream()
 {
 }
 
 wxFFileOutputStream::~wxFFileOutputStream()
 {

-    if (m_file_destroy) 
+    if (m_file_destroy)

     {
         Sync();
         delete m_file;
     {
         Sync();
         delete m_file;


@@ -303,21 +344,22 @@ wxFFileOutputStream::~wxFFileOutputStream()
 size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);
 size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);

-    if (m_file->Error())
-        m_lasterror = wxStream_WRITE_ERR;
+    // It is not safe to call Error() if the file is not opened.
+    if (!m_file->IsOpened() || m_file->Error())
+        m_lasterror = wxSTREAM_WRITE_ERROR;

     else
     else

-        m_lasterror = wxStream_NOERROR;
+        m_lasterror = wxSTREAM_NO_ERROR;

     return ret;
 }
 
     return ret;
 }
 

-off_t wxFFileOutputStream::OnSysTell() const
+wxFileOffset wxFFileOutputStream::OnSysTell() const

 {
     return m_file->Tell();
 }
 
 {
     return m_file->Tell();
 }
 

-off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)

 {
 {

-    return m_file->Seek(pos, mode);
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;

 }
 
 void wxFFileOutputStream::Sync()
 }
 
 void wxFFileOutputStream::Sync()


@@ -326,7 +368,7 @@ void wxFFileOutputStream::Sync()
     m_file->Flush();
 }
 
     m_file->Flush();
 }
 

-size_t wxFFileOutputStream::GetSize() const
+wxFileOffset wxFFileOutputStream::GetLength() const

 {
     return m_file->Length();
 }
 {
     return m_file->Length();
 }


@@ -341,6 +383,7 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 

-#endif
-  // wxUSE_STREAMS && wxUSE_FILE
+#endif //wxUSE_FFILE
+
+#endif // wxUSE_STREAMS