Committing in .

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 4d798f3c7913893d4a0fe36ef3f03ab0279a8abb..b43ddb3fba3cddc29897d8278995081f8774fb98 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -15,14 +15,17 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS && wxUSE_FILE
+
+#include <stdio.h>
+#include "wx/stream.h"
+#include "wx/wfstream.h"
+

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


@@ -32,7 +35,6 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName)
 {
   m_file = new wxFile(fileName, wxFile::read);
   m_file_destroy = TRUE;
 {
   m_file = new wxFile(fileName, wxFile::read);
   m_file_destroy = TRUE;

-  m_i_streambuf->SetBufferIO(1024);

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


@@ -42,25 +44,43 @@ wxFileInputStream::wxFileInputStream()
   m_file = NULL;
 }
 
   m_file = NULL;
 }
 

-wxFileInputStream::~wxFileInputStream()
+wxFileInputStream::wxFileInputStream(wxFile& file)

 {
 {

-  if (m_file_destroy)
-    delete m_file;
+  m_file = &file;
+  m_file_destroy = FALSE;

 }
 
 }
 

-char wxFileInputStream::Peek()
+wxFileInputStream::wxFileInputStream(int fd)

 {
 {

-  return 0;
+  m_file = new wxFile(fd);
+  m_file_destroy = TRUE;
+}
+
+wxFileInputStream::~wxFileInputStream()
+{
+  if (m_file_destroy)
+    delete m_file;

 }
 
 }
 

-size_t wxFileInputStream::StreamSize() const
+size_t wxFileInputStream::GetSize() 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)
 {

-  return m_file->Read(buffer, 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;
+  } 
+
+  return ret;

 }
 
 off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 }
 
 off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)


@@ -81,24 +101,27 @@ 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;

-  m_o_streambuf->SetBufferIO(1024);

 }
 
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {
   m_file = &file;
   m_file_destroy = FALSE;
 }
 
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
 {
   m_file = &file;
   m_file_destroy = FALSE;

-  m_o_streambuf->SetBufferIO(1024);

 }
 
 wxFileOutputStream::wxFileOutputStream()
   : wxOutputStream()
 {
 }
 
 wxFileOutputStream::wxFileOutputStream()
   : wxOutputStream()
 {

-  m_o_streambuf->SetBufferIO(1024);

   m_file_destroy = FALSE;
   m_file = NULL;
 }
 
   m_file_destroy = FALSE;
   m_file = NULL;
 }
 

+wxFileOutputStream::wxFileOutputStream(int fd)
+{
+  m_file = new wxFile(fd);
+  m_file_destroy = TRUE;
+}
+

 wxFileOutputStream::~wxFileOutputStream()
 {
   if (m_file_destroy) {
 wxFileOutputStream::~wxFileOutputStream()
 {
   if (m_file_destroy) {


@@ -110,7 +133,10 @@ 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);

-  m_lasterror = wxStream_EOF; // TODO
+  if (m_file->Error())
+    m_lasterror = wxStream_WRITE_ERR;
+  else
+    m_lasterror = wxStream_NOERROR;

   return ret;
 }
 
   return ret;
 }
 


@@ -130,7 +156,7 @@ void wxFileOutputStream::Sync()
   m_file->Flush();
 }
 
   m_file->Flush();
 }
 

-size_t wxFileOutputStream::StreamSize() const
+size_t wxFileOutputStream::GetSize() const

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


@@ -142,3 +168,149 @@ wxFileStream::wxFileStream(const wxString& fileName)
  : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file)
 {
 }
  : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file)
 {
 }

+
+// ----------------------------------------------------------------------------
+// wxFFileInputStream
+// ----------------------------------------------------------------------------
+
+wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
+  : wxInputStream()
+{
+  m_file = new wxFFile(fileName, "r");
+  m_file_destroy = TRUE;
+}
+
+wxFFileInputStream::wxFFileInputStream()
+  : wxInputStream()
+{
+  m_file_destroy = FALSE;
+  m_file = NULL;
+}
+
+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;
+}
+
+size_t wxFFileInputStream::GetSize() const
+{
+  return m_file->Length();
+}
+
+size_t wxFFileInputStream::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;
+  } 
+
+  return ret;
+}
+
+off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+  return m_file->Seek(pos, mode);
+}
+
+off_t wxFFileInputStream::OnSysTell() const
+{
+  return m_file->Tell();
+}
+
+// ----------------------------------------------------------------------------
+// wxFFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
+{
+  m_file = new wxFFile(fileName, "w+");
+  m_file_destroy = TRUE;
+}
+
+wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
+{
+  m_file = &file;
+  m_file_destroy = FALSE;
+}
+
+wxFFileOutputStream::wxFFileOutputStream()
+  : wxOutputStream()
+{
+  m_file_destroy = FALSE;
+  m_file = NULL;
+}
+
+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);
+  if (m_file->Error())
+    m_lasterror = wxStream_WRITE_ERR;
+  else
+    m_lasterror = wxStream_NOERROR;
+  return ret;
+}
+
+off_t wxFFileOutputStream::OnSysTell() const
+{
+  return m_file->Tell();
+}
+
+off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+  return m_file->Seek(pos, mode);
+}
+
+void wxFFileOutputStream::Sync()
+{
+  wxOutputStream::Sync();
+  m_file->Flush();
+}
+
+size_t wxFFileOutputStream::GetSize() const
+{
+  return m_file->Length();
+}
+
+// ----------------------------------------------------------------------------
+// wxFFileStream
+// ----------------------------------------------------------------------------
+wxFFileStream::wxFFileStream(const wxString& fileName)
+ : wxFFileInputStream(fileName), wxFFileOutputStream(*wxFFileInputStream::m_file)
+{
+}
+#endif
+  // wxUSE_STREAMS && wxUSE_FILE
+