added vendor display name (for consistency with app display name &c) (patch 1831303)

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index f9694ca3067bdd514d75f8022caeb8bbbe5e9aaa..65e8ceb266e31b9dcf4d391b5fa55a06a9c357d4 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -1,31 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fstream.cpp
+// Name:        src/common/fstream.cpp

 // Purpose:     "File stream" classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Purpose:     "File stream" classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/07/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux 
-// Licence:     wxWindows license
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "wfstream.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 

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

 #include "wx/wfstream.h"
 
 #include "wx/wfstream.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/stream.h"
+#endif
+
+#include <stdio.h>
+
+#if wxUSE_FILE
+

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


@@ -33,64 +35,81 @@
 wxFileInputStream::wxFileInputStream(const wxString& fileName)
   : wxInputStream()
 {
 wxFileInputStream::wxFileInputStream(const wxString& fileName)
   : wxInputStream()
 {

-  m_file = new wxFile(fileName, wxFile::read);
-  m_file_destroy = TRUE;
+    m_file = new wxFile(fileName, wxFile::read);
+    m_file_destroy = true;
+    if ( !m_file->IsOpened() )
+        m_lasterror = wxSTREAM_READ_ERROR;

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

-  m_file_destroy = FALSE;
-  m_file = NULL;
+    m_file_destroy = false;
+    m_file = NULL;

 }
 
 wxFileInputStream::wxFileInputStream(wxFile& file)
 {
 }
 
 wxFileInputStream::wxFileInputStream(wxFile& file)
 {

-  m_file = &file;
-  m_file_destroy = FALSE;
+    m_file = &file;
+    m_file_destroy = false;

 }
 
 wxFileInputStream::wxFileInputStream(int fd)
 {
 }
 
 wxFileInputStream::wxFileInputStream(int fd)
 {

-  m_file = new wxFile(fd);
-  m_file_destroy = TRUE;
+    m_file = new wxFile(fd);
+    m_file_destroy = true;

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

-  if (m_file_destroy)
-    delete m_file;
+    if (m_file_destroy)
+        delete m_file;

 }
 
 }
 

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

 {
 {

-  return m_file->Length();
+    return m_file->Length();

 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 }
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-  off_t ret;
-
-  ret = m_file->Read(buffer, size);
-
-  if (m_file->Eof())
-    m_lasterror = wxStream_EOF;
-  if (ret == wxInvalidOffset) {
-    m_lasterror = wxStream_READ_ERR;
-    ret = 0;
-  } 
+    ssize_t 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)
+
+    if ( !ret )
+    {
+        // nothing read, so nothing more to read
+        m_lasterror = wxSTREAM_EOF;
+    }
+    else if ( ret == wxInvalidOffset )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+        ret = 0;
+    }
+    else
+    {
+        // normal case
+        m_lasterror = wxSTREAM_NO_ERROR;
+    }
+
+    return ret;
+}

 
 

-  return ret;
+wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode);

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-off_t wxFileInputStream::OnSysTell() const
+bool wxFileInputStream::IsOk() const

 {
 {

-  return m_file->Tell();
+    return wxInputStream::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -99,76 +118,299 @@ off_t wxFileInputStream::OnSysTell() const
 
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
 
 wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {

-  m_file = new wxFile(fileName, wxFile::write);
-  m_file_destroy = TRUE;
+    m_file = new wxFile(fileName, wxFile::write);
+    m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;

 }
 
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {
 }
 
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {

-  m_file = &file;
-  m_file_destroy = FALSE;
+    m_file = &file;
+    m_file_destroy = false;

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

-  : wxOutputStream()
+                  : wxOutputStream()

 {
 {

-  m_file_destroy = FALSE;
-  m_file = NULL;
+    m_file_destroy = false;
+    m_file = NULL;

 }
 
 wxFileOutputStream::wxFileOutputStream(int fd)
 {
 }
 
 wxFileOutputStream::wxFileOutputStream(int fd)
 {

-  m_file = new wxFile(fd);
-  m_file_destroy = TRUE;
+    m_file = new wxFile(fd);
+    m_file_destroy = true;

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

-  if (m_file_destroy) {
-    Sync();
-    delete m_file;
-  }
+    if (m_file_destroy)
+    {
+        Sync();
+        delete m_file;
+    }

 }
 
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t 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;
-  return ret;
+    size_t ret = m_file->Write(buffer, size);
+
+    m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+
+    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);

 }
 
 void wxFileOutputStream::Sync()
 {
 }
 
 void wxFileOutputStream::Sync()
 {

-  wxOutputStream::Sync();
-  m_file->Flush();
+    wxOutputStream::Sync();
+    m_file->Flush();
+}
+
+wxFileOffset wxFileOutputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+bool wxFileOutputStream::IsOk() const
+{
+    return wxOutputStream::IsOk() && m_file->IsOpened();
+}
+
+// ----------------------------------------------------------------------------
+// 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 wxFileOutputStream::GetSize() const
+size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)

 {
 {

-  return m_file->Length();
+    if (IsOk() && m_file->Write(buffer, size))
+        return size;
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+    return 0;

 }
 
 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // wxFileStream
 // ----------------------------------------------------------------------------

+

 wxFileStream::wxFileStream(const wxString& fileName)
 wxFileStream::wxFileStream(const wxString& fileName)

- : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file)
+            : wxFileInputStream(fileName)

 {
 {

+    wxFileOutputStream::m_file = wxFileInputStream::m_file;

 }
 
 }
 

-#endif
-  // wxUSE_STREAMS && wxUSE_FILE
+bool wxFileStream::IsOk() const
+{
+    return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk();
+}
+
+#endif // wxUSE_FILE
+
+#if wxUSE_FFILE
+
+// ----------------------------------------------------------------------------
+// wxFFileInputStream
+// ----------------------------------------------------------------------------
+
+wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
+                                       const wxString& mode)
+                  : wxInputStream()
+{
+    m_file = new wxFFile(fileName, mode);
+    m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+wxFFileInputStream::wxFFileInputStream()
+                  : wxInputStream()
+{
+    m_file = NULL;
+    m_file_destroy = false;
+}
+
+wxFFileInputStream::wxFFileInputStream(wxFFile& file)
+{
+    m_file = &file;
+    m_file_destroy = false;
+}
+
+wxFFileInputStream::wxFFileInputStream(FILE *file)
+{
+    m_file = new wxFFile(file);
+    m_file_destroy = true;
+}
+
+wxFFileInputStream::~wxFFileInputStream()
+{
+    if (m_file_destroy)
+        delete m_file;
+}
+
+wxFileOffset wxFFileInputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
+{
+    ssize_t ret = m_file->Read(buffer, size);
+
+    // 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_ERROR;
+        ret = 0;
+    }
+
+    return ret;
+}
+
+wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;
+}
+
+wxFileOffset wxFFileInputStream::OnSysTell() const
+{
+    return m_file->Tell();
+}
+
+bool wxFFileInputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();
+}
+
+// ----------------------------------------------------------------------------
+// wxFFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
+                                         const wxString& mode)
+{
+    m_file = new wxFFile(fileName, mode);
+    m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+    {
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+    else
+    {
+        if (m_file->Error())
+            m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+}
+
+wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
+{
+    m_file = &file;
+    m_file_destroy = false;
+}
+
+wxFFileOutputStream::wxFFileOutputStream()
+                   : wxOutputStream()
+{
+    m_file = NULL;
+    m_file_destroy = false;
+}
+
+wxFFileOutputStream::wxFFileOutputStream(FILE *file)
+{
+    m_file = new wxFFile(file);
+    m_file_destroy = true;
+}
+
+wxFFileOutputStream::~wxFFileOutputStream()
+{
+    if (m_file_destroy)
+    {
+        Sync();
+        delete m_file;
+    }
+}
+
+size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    size_t ret = m_file->Write(buffer, size);
+    // 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
+        m_lasterror = wxSTREAM_NO_ERROR;
+    return ret;
+}
+
+wxFileOffset wxFFileOutputStream::OnSysTell() const
+{
+    return m_file->Tell();
+}
+
+wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;
+}
+
+void wxFFileOutputStream::Sync()
+{
+    wxOutputStream::Sync();
+    m_file->Flush();
+}
+
+wxFileOffset wxFFileOutputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+bool wxFFileOutputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();
+}
+
+// ----------------------------------------------------------------------------
+// wxFFileStream
+// ----------------------------------------------------------------------------
+
+wxFFileStream::wxFFileStream(const wxString& fileName)
+             : wxFFileInputStream(fileName)
+{
+    wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
+}
+
+bool wxFFileStream::IsOk() const
+{
+    return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk();
+}
+
+#endif //wxUSE_FFILE

 
 

+#endif // wxUSE_STREAMS