X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4a8c29f7a3ffa7eb60d9b7f055565eb2df368d9..963a1fcd6e013eef52bf87ed99e19d9ab49563ef:/src/common/stream.cpp

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index f25f6381fb..9763842c4a 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -1,611 +1,1173 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stream.cpp
+// Name:        src/common/stream.cpp
 // Purpose:     wxStream base classes
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: VZ (23.11.00) to fix realloc()ing new[]ed memory,
+//                            general code review
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "stream.h"
+    #pragma implementation "stream.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include <ctype.h>
-#include <wx/stream.h>
-#include <wx/datstrm.h>
-#include <wx/objstrm.h>
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+  #include "wx/defs.h"
+#endif
+
+#if wxUSE_STREAMS
+
+#include <ctype.h>
+#include "wx/stream.h"
+#include "wx/datstrm.h"
+#include "wx/objstrm.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the temporary buffer size used when copying from stream to stream
+#define BUF_TEMP_SIZE 10000
+
+// ============================================================================
+// implementation
+// ============================================================================
+
 // ----------------------------------------------------------------------------
 // wxStreamBuffer
 // ----------------------------------------------------------------------------
 
-wxStreamBuffer::wxStreamBuffer(wxInputStream& i_stream)
-  : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
-    m_buffer_size(0), m_istream(&i_stream), m_ostream(NULL)
+void wxStreamBuffer::SetError(wxStreamError err)
 {
+   if ( m_stream->m_lasterror == wxStream_NOERROR )
+       m_stream->m_lasterror = err;
 }
 
-wxStreamBuffer::wxStreamBuffer(wxOutputStream& o_stream)
-  : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
-    m_buffer_size(0), m_istream(NULL), m_ostream(&o_stream)
+void wxStreamBuffer::InitBuffer()
 {
+    m_buffer_start =
+    m_buffer_end =
+    m_buffer_pos = NULL;
+    m_buffer_size = 0;
+
+    // there is nothing to destroy anyhow
+    m_destroybuf = FALSE;
 }
 
-wxStreamBuffer::~wxStreamBuffer()
+void wxStreamBuffer::Init()
 {
-  wxDELETEA(m_buffer_start);
+    InitBuffer();
+
+    m_fixed = TRUE;
 }
 
-void wxStreamBuffer::WriteBack(char c)
+wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
 {
-  if (m_ostream)
-    return;
+    Init();
 
-  // Assume that if we write "back" we have read a few bytes: so we have some
-  // space.
-  if (m_buffer_pos == m_buffer_start)
-    return;
+    m_stream = &stream;
+    m_mode = mode;
 
-  m_buffer_pos--;
-  *m_buffer_pos = c;
+    m_flushable = TRUE;
+    m_destroystream = FALSE;
 }
 
-void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
+wxStreamBuffer::wxStreamBuffer(BufMode mode)
 {
-  size_t ret;
+    Init();
 
-  m_buffer_start = buffer_start;
-  m_buffer_end   = buffer_end;
+    m_stream = new wxStreamBase;
+    m_mode = mode;
 
-  m_buffer_size = m_buffer_end-m_buffer_start;
+    m_flushable = FALSE;
+    m_destroystream = TRUE;
+}
 
-  if (m_istream) {
-    ret = m_istream->DoRead(m_buffer_start, m_buffer_size);
-    m_buffer_end = m_buffer_start + ret;
-  }
-  m_buffer_pos = m_buffer_start;
+wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
+{
+    // doing this has big chances to lead to a crashwhen the source buffer is
+    // destroyed (otherwise assume the caller knows what he does)
+    wxASSERT_MSG( !buffer.m_destroybuf && !buffer.m_destroystream,
+                  _T("it's a bad idea to copy this buffer") );
+
+    m_buffer_start = buffer.m_buffer_start;
+    m_buffer_end = buffer.m_buffer_end;
+    m_buffer_pos = buffer.m_buffer_pos;
+    m_buffer_size = buffer.m_buffer_size;
+    m_fixed = buffer.m_fixed;
+    m_flushable = buffer.m_flushable;
+    m_stream = buffer.m_stream;
+    m_mode = buffer.m_mode;
+    m_destroybuf = FALSE;
+    m_destroystream = FALSE;
 }
 
-void wxStreamBuffer::SetBufferIO(size_t bufsize)
+void wxStreamBuffer::FreeBuffer()
 {
-  char *b_start;
+    if ( m_destroybuf )
+        free(m_buffer_start);
+}
 
-  wxDELETE(m_buffer_start);
+wxStreamBuffer::~wxStreamBuffer()
+{
+    FreeBuffer();
 
-  if (!bufsize) {
-    m_buffer_start = NULL;
-    m_buffer_end = NULL;
-    m_buffer_pos = NULL;
-    m_buffer_size = 0;
-    return;
-  }
+    if ( m_destroystream )
+        delete m_stream;
+}
 
-  b_start = new char[bufsize];
+wxInputStream *wxStreamBuffer::GetInputStream() const
+{
+    return m_mode == write ? NULL : (wxInputStream *)m_stream;
+}
 
-  SetBufferIO(b_start, b_start + bufsize);
+wxOutputStream *wxStreamBuffer::GetOutputStream() const
+{
+    return m_mode == read ? NULL : (wxOutputStream *)m_stream;
 }
 
-void wxStreamBuffer::ResetBuffer()
+void wxStreamBuffer::SetBufferIO(void *buffer_start,
+                                 void *buffer_end,
+                                 bool takeOwnership)
 {
-  if (m_istream)
-    m_buffer_pos = m_buffer_end;
-  else
-    m_buffer_pos = m_buffer_start;
+    SetBufferIO(buffer_start, (char *)buffer_end - (char *)buffer_start,
+                takeOwnership);
 }
 
-void wxStreamBuffer::Read(void *buffer, size_t size)
+void wxStreamBuffer::SetBufferIO(void *start,
+                                 size_t len,
+                                 bool takeOwnership)
 {
-  wxASSERT(m_istream != NULL);
+    // start by freeing the old buffer
+    FreeBuffer();
 
-  // ------------------
-  // Buffering disabled
-  // ------------------
+    m_buffer_start = (char *)start;
+    m_buffer_end   = m_buffer_start + len;
 
-  if (!m_buffer_size) {
-    m_istream->m_lastread = m_istream->DoRead(buffer, size);
-    return;
-  }
+    m_buffer_size = len;
 
-  // -----------------
-  // Buffering enabled
-  // -----------------
-  size_t buf_left, orig_size = size;
-  size_t read_ret;
+    // if we own it, we free it
+    m_destroybuf = takeOwnership;
 
-  while (size > 0) {
-    buf_left = m_buffer_end - m_buffer_pos; 
+    ResetBuffer();
+}
 
-    // First case: the requested buffer is larger than the stream buffer,
-    //             we split
-    if (size > buf_left) {
-      memcpy(buffer, m_buffer_pos, buf_left);
-      size -= buf_left;
-      buffer = (char *)buffer + buf_left; // ANSI C++ violation.
+void wxStreamBuffer::SetBufferIO(size_t bufsize)
+{
+    // start by freeing the old buffer
+    FreeBuffer();
 
-      read_ret = m_istream->DoRead(m_buffer_start, m_buffer_size);
+    if ( bufsize )
+    {
+        SetBufferIO(malloc(bufsize), bufsize, TRUE /* take ownership */);
+    }
+    else // no buffer size => no buffer
+    {
+        InitBuffer();
+    }
+}
+
+void wxStreamBuffer::ResetBuffer()
+{
+    wxCHECK_RET( m_stream, _T("should have a stream in wxStreamBuffer") );
 
-      // Read failed: EOF
-      if (read_ret == 0) {
-        m_istream->m_lastread = orig_size-size;
-        m_istream->m_eof = TRUE;
-        m_buffer_pos = m_buffer_end = m_buffer_start;
-        return;
-      } else {
-        m_buffer_end = m_buffer_start+read_ret;
+    m_stream->m_lasterror = wxStream_NOERROR;
+    m_stream->m_lastcount = 0;
+    if (m_mode == read && m_flushable)
+        m_buffer_pos = m_buffer_end;
+    else
         m_buffer_pos = m_buffer_start;
-      }
-    } else {
+}
 
-      // Second case: we just copy from the stream buffer.
-      memcpy(buffer, m_buffer_pos, size);
-      m_buffer_pos += size;
-      break;
-    }
-  }
-  m_istream->m_lastread = orig_size;
+// fill the buffer with as much data as possible (only for read buffers)
+bool wxStreamBuffer::FillBuffer()
+{
+    wxInputStream *inStream = GetInputStream();
+
+    wxCHECK_MSG( inStream, FALSE, _T("should have a stream in wxStreamBuffer") );
+
+    size_t count = inStream->OnSysRead(m_buffer_start, m_buffer_size);
+    if ( !count )
+        return FALSE;
+
+    m_buffer_end = m_buffer_start + count;
+    m_buffer_pos = m_buffer_start;
+
+    return TRUE;
 }
 
-void wxStreamBuffer::Write(const void *buffer, size_t size)
+// write the buffer contents to the stream (only for write buffers)
+bool wxStreamBuffer::FlushBuffer()
 {
-  wxASSERT(m_ostream != NULL);
+    wxCHECK_MSG( m_flushable, FALSE, _T("can't flush this buffer") );
 
-  // ------------------
-  // Buffering disabled
-  // ------------------
+    // FIXME: what is this check for? (VZ)
+    if ( m_buffer_pos == m_buffer_start )
+        return FALSE;
 
-  if (!m_buffer_size) {
-    m_ostream->m_lastwrite = m_ostream->DoWrite(buffer, size);
-    return;
-  }
+    wxOutputStream *outStream = GetOutputStream();
 
-  // ------------------
-  // Buffering enabled
-  // ------------------
+    wxCHECK_MSG( outStream, FALSE, _T("should have a stream in wxStreamBuffer") );
 
-  size_t buf_left, orig_size = size;
-  size_t write_ret;
+    size_t current = m_buffer_pos - m_buffer_start;
+    size_t count = outStream->OnSysWrite(m_buffer_start, current);
+    if ( count != current )
+        return FALSE;
 
-  while (size > 0) {
-    buf_left = m_buffer_end - m_buffer_pos;
+    m_buffer_pos = m_buffer_start;
 
-    // First case: the buffer to write is larger than the stream buffer,
-    //             we split it
-    if (size > buf_left) {
-      memcpy(m_buffer_pos, buffer, buf_left);
-      size -= buf_left;
-      buffer = (char *)buffer + buf_left; // ANSI C++ violation.
+    return TRUE;
+}
 
-      write_ret = m_ostream->DoWrite(m_buffer_start, m_buffer_size);
-      if (write_ret != m_buffer_size) {
-        m_ostream->m_bad = TRUE;
-        m_ostream->m_lastwrite = orig_size-size;
-        m_buffer_pos = m_buffer_end = m_buffer_start;
-        return;
-      }
-      m_buffer_pos = m_buffer_start;
+size_t wxStreamBuffer::GetDataLeft()
+{
+    /* Why is this done? RR. */
+    if ( m_buffer_pos == m_buffer_end && m_flushable)
+        FillBuffer();
 
-    } else {
+    return GetBytesLeft();
+}
+
+// copy up to size bytes from our buffer into the provided one
+void wxStreamBuffer::GetFromBuffer(void *buffer, size_t size)
+{
+    // don't get more bytes than left in the buffer
+    size_t left = GetBytesLeft();
 
-      // Second case: just copy it in the stream buffer.
+    if ( size > left )
+        size = left;
 
-      memcpy(m_buffer_pos, buffer, size);
-      m_buffer_pos += size;
-      break;
+    memcpy(buffer, m_buffer_pos, size);
+    m_buffer_pos += size;
+}
+
+// copy the contents of the provided buffer into this one
+void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
+{
+    size_t left = GetBytesLeft();
+    if ( size > left )
+    {
+        if ( m_fixed )
+        {
+            // we can't realloc the buffer, so just copy what we can
+            size = left;
+        }
+        else // !m_fixed
+        {
+            // realloc the buffer to have enough space for the data
+            size_t delta = m_buffer_pos - m_buffer_start;
+
+            char *startOld = m_buffer_start;
+            m_buffer_size += size;
+            m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size);
+            if ( !m_buffer_start )
+            {
+                // don't leak memory if realloc() failed
+                m_buffer_start = startOld;
+                m_buffer_size -= size;
+
+                // what else can we do?
+                return;
+            }
+
+            // adjust the pointers invalidated by realloc()
+            m_buffer_pos = m_buffer_start + delta;
+            m_buffer_end = m_buffer_start + m_buffer_size;
+        }
     }
-  }
-  m_ostream->m_lastwrite = orig_size;
+
+    memcpy(m_buffer_pos, buffer, size);
+    m_buffer_pos += size;
 }
 
-// ----------------------------------------------------------------------------
-// wxInputStream
-// ----------------------------------------------------------------------------
+void wxStreamBuffer::PutChar(char c)
+{
+    wxOutputStream *outStream = GetOutputStream();
 
-wxInputStream::wxInputStream()
+    wxCHECK_RET( outStream, _T("should have a stream in wxStreamBuffer") );
+
+    // if we don't have buffer at all, just forward this call to the stream,
+    if ( !HasBuffer() )
+    {
+        outStream->OnSysWrite(&c, 1);
+    }
+    else
+    {
+        // otherwise check we have enough space left
+        if ( !GetDataLeft() && !FlushBuffer() )
+        {
+            // we don't
+            SetError(wxStream_WRITE_ERR);
+        }
+        else
+        {
+            PutToBuffer(&c, 1);
+            m_stream->m_lastcount = 1;
+        }
+    }
+}
+
+char wxStreamBuffer::Peek()
 {
-  m_i_destroybuf = TRUE;
-  m_i_streambuf = new wxStreamBuffer(*this);
-  m_eof = FALSE;
-  m_lastread = 0;
+    wxCHECK_MSG( m_stream && HasBuffer(), 0,
+                 _T("should have the stream and the buffer in wxStreamBuffer") );
+
+    if ( !GetDataLeft() )
+    {
+        SetError(wxStream_READ_ERR);
+        return 0;
+    }
+
+    char c;
+    GetFromBuffer(&c, 1);
+    m_buffer_pos--;
+
+    return c;
 }
 
-wxInputStream::wxInputStream(wxStreamBuffer *buffer)
+char wxStreamBuffer::GetChar()
 {
-  m_i_destroybuf = FALSE;
-  m_i_streambuf = buffer;
-  m_eof = FALSE;
-  m_lastread = 0;
+    wxInputStream *inStream = GetInputStream();
+
+    wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
+
+    char c;
+    if ( !HasBuffer() )
+    {
+        inStream->OnSysRead(&c, 1);
+    }
+    else
+    {
+        if ( !GetDataLeft() )
+        {
+            SetError(wxStream_READ_ERR);
+            c = 0;
+        }
+        else
+        {
+            GetFromBuffer(&c, 1);
+            m_stream->m_lastcount = 1;
+        }
+    }
+
+    return c;
 }
 
-wxInputStream::~wxInputStream()
+size_t wxStreamBuffer::Read(void *buffer, size_t size)
 {
-  if (m_i_destroybuf)
-    delete m_i_streambuf;
+    wxInputStream *inStream = GetInputStream();
+
+    wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
+
+    // lasterror is reset before all new IO calls
+    m_stream->m_lasterror = wxStream_NOERROR;
+
+    if ( !HasBuffer() )
+    {
+        m_stream->m_lastcount = inStream->OnSysRead(buffer, size);
+    }
+    else // we have a buffer, use it
+    {
+        size_t orig_size = size;
+
+        while ( size > 0 )
+        {
+            size_t left = GetDataLeft();
+
+            // if the requested number of bytes if greater than the buffer
+            // size, read data in chunks
+            if ( size > left )
+            {
+                GetFromBuffer(buffer, left);
+                size -= left;
+                buffer = (char *)buffer + left;
+
+                if ( !FillBuffer() )
+                {
+                    SetError(wxStream_EOF);
+                    break;
+                }
+            }
+            else // otherwise just do it in one gulp
+            {
+                GetFromBuffer(buffer, size);
+                size = 0;
+            }
+        }
+
+        m_stream->m_lastcount = orig_size - size;
+    }
+
+    return m_stream->m_lastcount;
 }
 
-char wxInputStream::GetC()
+// this should really be called "Copy()"
+size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
 {
-  char c;
-  m_i_streambuf->Read(&c, 1);
-  return c;
+    wxCHECK_MSG( m_mode != write, 0, _T("can't read from this buffer") );
+
+    char buf[BUF_TEMP_SIZE];
+    size_t nRead,
+           total = 0;
+
+    do
+    {
+        nRead = Read(dbuf, WXSIZEOF(buf));
+        if ( nRead )
+        {
+            nRead = dbuf->Write(buf, nRead);
+            total += nRead;
+        }
+    }
+    while ( nRead );
+
+    return total;
 }
 
-wxInputStream& wxInputStream::Read(void *buffer, size_t size)
+size_t wxStreamBuffer::Write(const void *buffer, size_t size)
 {
-  m_i_streambuf->Read(buffer, size);
-  // wxStreamBuffer sets all variables for us
-  return *this;
+    wxOutputStream *outStream = GetOutputStream();
+
+    wxCHECK_MSG( outStream, 0, _T("should have a stream in wxStreamBuffer") );
+
+    // lasterror is reset before all new IO calls
+    m_stream->m_lasterror = wxStream_NOERROR;
+
+    if ( !HasBuffer() && m_fixed )
+    {
+        // no buffer, just forward the call to the stream
+        m_stream->m_lastcount = outStream->OnSysWrite(buffer, size);
+    }
+    else // we [may] have a buffer, use it
+    {
+        size_t orig_size = size;
+
+        while ( size > 0 )
+        {
+            size_t left = GetBytesLeft();
+
+            // if the buffer is too large to fit in the stream buffer, split
+            // it in smaller parts
+            //
+            // NB: If stream buffer isn't fixed (as for wxMemoryOutputStream),
+            //     we always go to the second case.
+            //
+            // FIXME: fine, but if it fails we should (re)try writing it by
+            //        chunks as this will (hopefully) always work (VZ)
+            if ( size > left && m_fixed )
+            {
+                PutToBuffer(buffer, left);
+                size -= left;
+                buffer = (char *)buffer + left;
+
+                if ( !FlushBuffer() )
+                {
+                    SetError(wxStream_WRITE_ERR);
+
+                    break;
+                }
+
+                m_buffer_pos = m_buffer_start;
+            }
+            else // we can do it in one gulp
+            {
+                PutToBuffer(buffer, size);
+                size = 0;
+            }
+        }
+
+        m_stream->m_lastcount = orig_size - size;
+    }
+
+    return m_stream->m_lastcount;
 }
 
-#define BUF_TEMP_SIZE 10000
+size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
+{
+    wxCHECK_MSG( m_mode != read, 0, _T("can't write to this buffer") );
+    wxCHECK_MSG( sbuf->m_mode != write, 0, _T("can't read from that buffer") );
+
+    char buf[BUF_TEMP_SIZE];
+    size_t nWrite,
+           total = 0;
+
+    do
+    {
+        size_t nRead = sbuf->Read(buf, WXSIZEOF(buf));
+        if ( nRead )
+        {
+            nWrite = Write(buf, nRead);
+            if ( nWrite < nRead )
+            {
+                // put back data we couldn't copy
+                wxInputStream *in_stream = (wxInputStream *)sbuf->GetStream();
+
+                in_stream->Ungetch(buf + nWrite, nRead - nWrite);
+            }
+
+            total += nWrite;
+        }
+        else
+        {
+            nWrite = 0;
+        }
+    }
+    while ( nWrite == WXSIZEOF(buf) );
 
-wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
+    return total;
+}
+
+off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)
+{
+    off_t ret_off, diff;
+
+    off_t last_access = GetLastAccess();
+
+    if ( !m_flushable )
+    {
+        switch (mode)
+        {
+            case wxFromStart:
+                diff = pos;
+                break;
+
+            case wxFromCurrent:
+                diff = pos + GetIntPosition();
+                break;
+
+            case wxFromEnd:
+                diff = pos + last_access;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("invalid seek mode") );
+
+                return wxInvalidOffset;
+        }
+        if (diff < 0 || diff > last_access)
+            return wxInvalidOffset;
+        SetIntPosition(diff);
+        return diff;
+    }
+
+    switch ( mode )
+    {
+        case wxFromStart:
+            // We'll try to compute an internal position later ...
+            ret_off = m_stream->OnSysSeek(pos, wxFromStart);
+            ResetBuffer();
+            return ret_off;
+
+        case wxFromCurrent:
+            diff = pos + GetIntPosition();
+
+            if ( (diff > last_access) || (diff < 0) )
+            {
+                // We must take into account the fact that we have read
+                // something previously.
+                ret_off = m_stream->OnSysSeek(diff-last_access, wxFromCurrent);
+                ResetBuffer();
+                return ret_off;
+            }
+            else
+            {
+                SetIntPosition(diff);
+                return pos;
+            }
+
+        case wxFromEnd:
+            // Hard to compute: always seek to the requested position.
+            ret_off = m_stream->OnSysSeek(pos, wxFromEnd);
+            ResetBuffer();
+            return ret_off;
+    }
+
+    return wxInvalidOffset;
+}
+
+off_t wxStreamBuffer::Tell() const
 {
-  char buf[BUF_TEMP_SIZE]; 
-  size_t bytes_read = BUF_TEMP_SIZE;
+    off_t pos = m_stream->OnSysTell();
+    if ( pos == wxInvalidOffset )
+        return wxInvalidOffset;
+
+    pos += GetIntPosition();
 
-  while (bytes_read == BUF_TEMP_SIZE && !stream_out.Bad()) {
-    bytes_read = Read(buf, bytes_read).LastRead();
+    if ( m_mode == read && m_flushable )
+        pos -= GetLastAccess();
 
-    stream_out.Write(buf, bytes_read);
-  }
-  return *this;
+    return pos;
 }
 
-wxInputStream& wxInputStream::operator>>(wxString& line)
+// ----------------------------------------------------------------------------
+// wxStreamBase
+// ----------------------------------------------------------------------------
+
+wxStreamBase::wxStreamBase()
 {
-  wxDataInputStream s(*this);
+    m_lasterror = wxStream_NOERROR;
+    m_lastcount = 0;
+}
 
-  line = s.ReadLine();
-  return *this;
+wxStreamBase::~wxStreamBase()
+{
 }
 
-wxInputStream& wxInputStream::operator>>(char& c)
+off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {
-  c = GetC();
-  return *this;
+    return wxInvalidOffset;
 }
 
-wxInputStream& wxInputStream::operator>>(short& i)
+off_t wxStreamBase::OnSysTell() const
 {
-  long l;
+    return wxInvalidOffset;
+}
 
-  *this >> l;
-  i = (short)l;
-  return *this;
+// ----------------------------------------------------------------------------
+// wxInputStream
+// ----------------------------------------------------------------------------
+
+wxInputStream::wxInputStream()
+{
+    m_wback = NULL;
+    m_wbacksize =
+    m_wbackcur = 0;
 }
 
-wxInputStream& wxInputStream::operator>>(int& i)
+wxInputStream::~wxInputStream()
 {
-  long l;
+    free(m_wback);
+}
 
-  *this >> l;
-  i = (short)l;
-  return *this;
+size_t wxInputStream::OnSysRead(void * WXUNUSED(buffer),
+                                size_t WXUNUSED(bufsize))
+{
+    return 0;
 }
 
-wxInputStream& wxInputStream::operator>>(long& i)
+bool wxInputStream::Eof() const
 {
-  /* I only implemented a simple integer parser */
-  int c, sign;
+    wxInputStream *self = wxConstCast(this, wxInputStream);
+
+    char c;
+    self->Read(&c, 1);
+
+    // some streams can know that they're at EOF before actually trying to
+    // read beyond the end of stream (e.g. files) while others have no way of
+    // knowing it, so to provide the same behaviour in all cases we only
+    // return TRUE from here if the character really couldn't be read
+    if ( !self->LastRead() && GetLastError() == wxSTREAM_EOF )
+    {
+        return TRUE;
+    }
 
-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
+    self->Ungetch(c);
 
-  i = 0;
-  if (! (c == '-' || isdigit(c)) ) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
+    return FALSE;
+}
 
-  if (c == '-') {
-    sign = -1;
-    c = GetC();
-  } else
-    sign = 1;
+char *wxInputStream::AllocSpaceWBack(size_t needed_size)
+{
+    // get number of bytes left from previous wback buffer
+    size_t toget = m_wbacksize - m_wbackcur;
 
-  while (isdigit(c)) {
-    i = i*10 + c;
-    c = GetC();
-  }
+    // allocate a buffer large enough to hold prev + new data
+    char *temp_b = (char *)malloc(needed_size + toget);
 
-  i *= sign;
+    if (!temp_b)
+        return NULL;
 
-  return *this;
+    /* copy previous data (and free old buffer) if needed */
+    if (m_wback)
+    {
+        memmove(temp_b + needed_size, m_wback + m_wbackcur, toget);
+        free(m_wback);
+    }
+
+    /* done */
+    m_wback = temp_b;
+    m_wbackcur = 0;
+    m_wbacksize = needed_size + toget;
+
+    return m_wback;
 }
 
-wxInputStream& wxInputStream::operator>>(float& f)
+size_t wxInputStream::GetWBack(void *buf, size_t bsize)
 {
-  /* I only implemented a simple float parser */
-  int c, sign;
+    size_t toget = m_wbacksize-m_wbackcur;
 
-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
+    if (!m_wback)
+        return 0;
 
-  f = 0.0;
-  if (! (c == '-' || isdigit(c)) ) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
-
-  if (c == '-') {
-    sign = -1;
-    c = GetC();
-  } else
-    sign = 1;
-
-  while (isdigit(c)) {
-    f = f*10 + c;
-    c = GetC();
-  }
-
-  if (c == '.') {
-    float f_multiplicator = 0.1;
-    c = GetC();
-
-    while (isdigit(c)) {
-      f += c*f_multiplicator;
-      f_multiplicator /= 10;
-      c = GetC();
+    if (bsize < toget)
+       toget = bsize;
+
+    memcpy(buf, (m_wback+m_wbackcur), toget);
+
+    m_wbackcur += toget;
+    if (m_wbackcur == m_wbacksize)
+    {
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
     }
-  }
 
-  f *= sign;
+    return toget;
+}
+
+size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
+{
+    char *ptrback = AllocSpaceWBack(bufsize);
+    if (!ptrback)
+        return 0;
 
-  return *this;
+    memcpy(ptrback, buf, bufsize);
+    return bufsize;
 }
 
-wxInputStream& wxInputStream::operator>>(wxObject *& obj)
+bool wxInputStream::Ungetch(char c)
 {
-  wxObjectInputStream obj_s(*this);
-  obj = obj_s.LoadObject();
-  return *this;
+    void *ptrback = AllocSpaceWBack(1);
+    if (!ptrback)
+        return FALSE;
+
+    *(char *)ptrback = c;
+    return TRUE;
 }
 
-off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
+char wxInputStream::GetC()
 {
-  off_t ret_off, diff, last_access;
+    char c;
+    Read(&c, 1);
+    return c;
+}
 
-  last_access = m_i_streambuf->GetLastAccess();
+wxInputStream& wxInputStream::Read(void *buf, size_t size)
+{
+    size_t retsize = GetWBack(buf, size);
+    if (retsize == size)
+    {
+        m_lastcount = size;
+        m_lasterror = wxStream_NOERROR;
+        return *this;
+    }
+    size -= retsize;
+    buf = (char *)buf + retsize;
+
+    m_lastcount = OnSysRead(buf, size) + retsize;
+    return *this;
+}
 
-  switch (mode) {
-  case wxFromStart:
-    diff = DoTellInput() - pos;
-    if ( diff < 0 || diff > last_access  ) {
-      ret_off = DoSeekInput(pos, wxFromStart);
-      m_i_streambuf->ResetBuffer();
-      return ret_off;
-    } else {
-      m_i_streambuf->SetIntPosition(last_access - diff);
-      return pos;
+char wxInputStream::Peek()
+{
+    char c;
+    Read(&c, 1);
+    if (m_lasterror == wxStream_NOERROR)
+    {
+        Ungetch(c);
+        return c;
     }
-  case wxFromCurrent:
-    diff = pos + m_i_streambuf->GetIntPosition();
-
-    if ( (diff > last_access) || (diff < 0) ) {
-      ret_off = DoSeekInput(pos, wxFromCurrent);
-      m_i_streambuf->ResetBuffer();
-      return ret_off;
-    } else {
-      m_i_streambuf->SetIntPosition(diff);
-      return pos;
+
+    return 0;
+}
+
+wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
+{
+    char buf[BUF_TEMP_SIZE];
+    size_t bytes_read = BUF_TEMP_SIZE;
+
+    while (bytes_read == BUF_TEMP_SIZE)
+    {
+        bytes_read = Read(buf, bytes_read).LastRead();
+        bytes_read = stream_out.Write(buf, bytes_read).LastWrite();
     }
-  case wxFromEnd:
-    // Hard to compute: always seek to the requested position.
-    ret_off = DoSeekInput(pos, wxFromEnd);
-    m_i_streambuf->ResetBuffer();
-    return ret_off;
-  }
-  return wxInvalidOffset;
+    return *this;
+}
+
+off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
+{
+    /* Should be check and improve, just to remove a slight bug !
+       I don't know whether it should be put as well in wxFileInputStream::OnSysSeek ? */
+    if (m_lasterror==wxSTREAM_EOF)
+        m_lasterror=wxSTREAM_NOERROR;
+
+    /* A call to SeekI() will automatically invalidate any previous call
+       to Ungetch(), otherwise it would be possible to SeekI() to one
+       one position, unread some bytes there, SeekI() to another position
+       and the data would be corrupted.
+
+       GRG: Could add code here to try to navigate within the wback
+       buffer if possible, but is it really needed? It would only work
+       when seeking in wxFromCurrent mode, else it would invalidate
+       anyway...
+     */
+    if (m_wback)
+    {
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    return OnSysSeek(pos, mode);
 }
 
 off_t wxInputStream::TellI() const
 {
-  return DoTellInput() - m_i_streambuf->GetLastAccess() +
-                         m_i_streambuf->GetIntPosition();
+    /* GRG: Changed to make it compatible with the wback buffer */
+    off_t pos = OnSysTell();
+
+    if (pos != wxInvalidOffset)
+        pos -= (m_wbacksize - m_wbackcur);
+
+    return pos;
 }
 
+// --------------------
+// Overloaded operators
+// --------------------
+
+#if wxUSE_SERIAL
+wxInputStream& wxInputStream::operator>>(wxObject *& obj)
+{
+    wxObjectInputStream obj_s(*this);
+    obj = obj_s.LoadObject();
+    return *this;
+}
+#endif // wxUSE_SERIAL
+
+
 // ----------------------------------------------------------------------------
 // wxOutputStream
 // ----------------------------------------------------------------------------
+
 wxOutputStream::wxOutputStream()
 {
-  m_o_destroybuf = TRUE;
-  m_o_streambuf = new wxStreamBuffer(*this);
-  m_bad = FALSE;
-  m_lastwrite = 0;
 }
 
-wxOutputStream::wxOutputStream(wxStreamBuffer *buffer)
+wxOutputStream::~wxOutputStream()
+{
+}
+
+size_t wxOutputStream::OnSysWrite(const void * WXUNUSED(buffer),
+                                  size_t WXUNUSED(bufsize))
 {
-  m_o_destroybuf = FALSE;
-  m_o_streambuf = buffer;
-  m_bad = FALSE;
-  m_lastwrite = 0;
+    return 0;
 }
 
-wxOutputStream::~wxOutputStream()
+void wxOutputStream::PutC(char c)
 {
-  if (m_o_destroybuf)
-    delete m_o_streambuf;
+    Write(&c, 1);
 }
 
 wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
 {
-  m_o_streambuf->Write(buffer, size);
-  return *this;
+    m_lastcount = OnSysWrite(buffer, size);
+    return *this;
 }
 
 wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
 {
-  stream_in.Read(*this);
-  return *this;
+    stream_in.Read(*this);
+    return *this;
 }
 
-off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
+off_t wxOutputStream::TellO() const
 {
-  off_t ret_off;
-
-  switch (mode) {
-  case wxFromStart:
-    if ( (unsigned)abs (DoTellOutput()-pos) > m_o_streambuf->GetLastAccess()  ) {
-      ret_off = DoSeekOutput(pos, wxFromStart);
-      m_o_streambuf->ResetBuffer();
-      return ret_off;
-    } else {
-      m_o_streambuf->SetIntPosition( DoTellOutput() - pos);
-      return pos;
-    }
-  case wxFromCurrent:
-    if ( ((unsigned)pos > m_o_streambuf->GetLastAccess()) || (pos < 0) ) {
-      ret_off = DoSeekOutput(pos, wxFromCurrent);
-      m_o_streambuf->ResetBuffer();
-      return ret_off;
-    } else {
-      m_o_streambuf->SetIntPosition(pos);
-      return pos;
-    }
-  case wxFromEnd:
-    // Hard to compute: always seek to the requested position.
-    ret_off = DoSeekOutput(pos, wxFromEnd);
-    m_o_streambuf->ResetBuffer();
-    return ret_off;
-  }
-  return wxInvalidOffset;
+    return OnSysTell();
 }
 
-off_t wxOutputStream::TellO() const
+off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
 {
-  return DoTellOutput() - m_o_streambuf->GetLastAccess()
-                        + m_o_streambuf->GetIntPosition();
+    return OnSysSeek(pos, mode);
 }
 
 void wxOutputStream::Sync()
 {
-  DoWrite(m_o_streambuf->GetBufferStart(), m_o_streambuf->GetIntPosition());
+}
 
-  m_o_streambuf->ResetBuffer();
+#if wxUSE_SERIAL
+wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
+{
+    wxObjectOutputStream obj_s(*this);
+    obj_s.SaveObject(obj);
+    return *this;
 }
+#endif // wxUSE_SERIAL
 
-wxOutputStream& wxOutputStream::operator<<(const char *string)
+// ----------------------------------------------------------------------------
+// wxCountingOutputStream
+// ----------------------------------------------------------------------------
+
+wxCountingOutputStream::wxCountingOutputStream ()
 {
-  return Write(string, strlen(string));
+     m_currentPos = 0;
 }
 
-wxOutputStream& wxOutputStream::operator<<(wxString& string)
+size_t wxCountingOutputStream::GetSize() const
 {
-  return Write(string, string.Len());
+    return m_lastcount;
 }
 
-wxOutputStream& wxOutputStream::operator<<(char c)
+size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
+                                          size_t size)
 {
-  return Write(&c, 1);
+    m_currentPos += size;
+    if (m_currentPos > m_lastcount)
+        m_lastcount = m_currentPos;
+
+    return m_currentPos;
 }
 
-wxOutputStream& wxOutputStream::operator<<(short i)
+off_t wxCountingOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
-  wxString strint;
+    switch ( mode )
+    {
+        case wxFromStart:
+            m_currentPos = pos;
+            break;
+
+        case wxFromEnd:
+            m_currentPos = m_lastcount + pos;
+            break;
+
+        case wxFromCurrent:
+            m_currentPos += pos;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("invalid seek mode") );
+            return wxInvalidOffset;
+    }
+
+    if (m_currentPos > m_lastcount)
+        m_lastcount = m_currentPos;
 
-  strint.Printf("%i", i);
-  return Write(strint, strint.Len());
+    return m_currentPos;
 }
 
-wxOutputStream& wxOutputStream::operator<<(int i)
+off_t wxCountingOutputStream::OnSysTell() const
 {
-  wxString strint;
+    return m_currentPos;
+}
 
-  strint.Printf("%i", i);
-  return Write(strint, strint.Len());
+// ----------------------------------------------------------------------------
+// wxFilterInputStream
+// ----------------------------------------------------------------------------
+
+wxFilterInputStream::wxFilterInputStream()
+{
+    m_parent_i_stream = NULL;
 }
 
-wxOutputStream& wxOutputStream::operator<<(long i)
+wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
 {
-  wxString strlong;
+    m_parent_i_stream = &stream;
+}
 
-  strlong.Printf("%i", i);
-  return Write((const char *)strlong, strlong.Len());
+wxFilterInputStream::~wxFilterInputStream()
+{
 }
 
-wxOutputStream& wxOutputStream::operator<<(double f)
+// ----------------------------------------------------------------------------
+// wxFilterOutputStream
+// ----------------------------------------------------------------------------
+
+wxFilterOutputStream::wxFilterOutputStream()
 {
-  wxString strfloat;
+    m_parent_o_stream = NULL;
+}
 
-  strfloat.Printf("%f", f);
-  return Write(strfloat, strfloat.Len());
+wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
+{
+    m_parent_o_stream = &stream;
 }
 
-wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
+wxFilterOutputStream::~wxFilterOutputStream()
 {
-  wxObjectOutputStream obj_s(*this);
-  obj_s.SaveObject(obj);
-  return *this;
 }
 
 // ----------------------------------------------------------------------------
-// wxFilterInputStream
+// wxBufferedInputStream
 // ----------------------------------------------------------------------------
-wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
-  : wxInputStream(NULL)
+
+wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s,
+                                             wxStreamBuffer *buffer)
+                     : wxFilterInputStream(s)
 {
-  m_parent_i_stream = &stream;
-  m_i_streambuf = stream.InputStreamBuffer();
+    if ( buffer )
+    {
+        // use the buffer provided by the user
+        m_i_streambuf = buffer;
+    }
+    else // create a default buffer
+    {
+        m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
+
+        m_i_streambuf->SetBufferIO(1024);
+    }
 }
 
-wxFilterInputStream::~wxFilterInputStream()
+wxBufferedInputStream::~wxBufferedInputStream()
 {
+    m_parent_i_stream->SeekI(-(off_t)m_i_streambuf->GetBytesLeft(),
+                             wxFromCurrent);
+
+    delete m_i_streambuf;
 }
 
-size_t wxFilterInputStream::DoRead(void *buffer, size_t size)
+char wxBufferedInputStream::Peek()
 {
-  return m_parent_i_stream->Read(buffer, size).LastRead();
+    return m_i_streambuf->Peek();
 }
 
-off_t wxFilterInputStream::DoSeekInput(off_t pos, wxSeekMode mode)
+wxInputStream& wxBufferedInputStream::Read(void *buf, size_t size)
 {
-  return m_parent_i_stream->SeekI(pos, mode);
+    size_t retsize;
+
+    retsize = GetWBack(buf, size);
+    m_lastcount = retsize;
+    if ( retsize == size )
+    {
+        m_lasterror = wxStream_NOERROR;
+        return *this;
+    }
+    size -= retsize;
+    buf = (char *)buf + retsize;
+
+    m_i_streambuf->Read(buf, size);
+
+    return *this;
 }
 
-off_t wxFilterInputStream::DoTellInput() const
+off_t wxBufferedInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
-  return m_parent_i_stream->TellI();
+    return m_i_streambuf->Seek(pos, mode);
 }
 
+off_t wxBufferedInputStream::TellI() const
+{
+    return m_i_streambuf->Tell();
+}
+
+size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize)
+{
+    return m_parent_i_stream->Read(buffer, bufsize).LastRead();
+}
+
+off_t wxBufferedInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
+{
+    return m_parent_i_stream->SeekI(seek, mode);
+}
+
+off_t wxBufferedInputStream::OnSysTell() const
+{
+    return m_parent_i_stream->TellI();
+}
+
+void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)
+{
+    wxCHECK_RET( buffer, _T("wxBufferedInputStream needs buffer") );
+
+    delete m_i_streambuf;
+    m_i_streambuf = buffer;
+}
 
 // ----------------------------------------------------------------------------
-// wxFilterOutputStream
+// wxBufferedOutputStream
 // ----------------------------------------------------------------------------
-wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
-  : wxOutputStream(NULL)
+
+wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s,
+                                               wxStreamBuffer *buffer)
+                      : wxFilterOutputStream(s)
 {
-  m_parent_o_stream = &stream;
-  m_o_streambuf = stream.OutputStreamBuffer();
+    if ( buffer )
+    {
+        m_o_streambuf = buffer;
+    }
+    else // create a default one
+    {
+        m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+
+        m_o_streambuf->SetBufferIO(1024);
+    }
 }
 
-wxFilterOutputStream::~wxFilterOutputStream()
+wxBufferedOutputStream::~wxBufferedOutputStream()
+{
+    Sync();
+    delete m_o_streambuf;
+}
+
+wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
+{
+    m_lastcount = 0;
+    m_o_streambuf->Write(buffer, size);
+    return *this;
+}
+
+off_t wxBufferedOutputStream::SeekO(off_t pos, wxSeekMode mode)
+{
+    Sync();
+    return m_o_streambuf->Seek(pos, mode);
+}
+
+off_t wxBufferedOutputStream::TellO() const
+{
+    return m_o_streambuf->Tell();
+}
+
+void wxBufferedOutputStream::Sync()
 {
+    m_o_streambuf->FlushBuffer();
+    m_parent_o_stream->Sync();
 }
 
-size_t wxFilterOutputStream::DoWrite(const void *buffer, size_t size)
+size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
 {
-  return m_parent_o_stream->Write(buffer, size).LastWrite();
+    return m_parent_o_stream->Write(buffer, bufsize).LastWrite();
 }
 
-off_t wxFilterOutputStream::DoSeekOutput(off_t pos, wxSeekMode mode)
+off_t wxBufferedOutputStream::OnSysSeek(off_t seek, wxSeekMode mode)
 {
-  return m_parent_o_stream->SeekO(pos, mode);
+    return m_parent_o_stream->SeekO(seek, mode);
 }
 
-off_t wxFilterOutputStream::DoTellOutput() const
+off_t wxBufferedOutputStream::OnSysTell() const
 {
-  return m_parent_o_stream->TellO();
+    return m_parent_o_stream->TellO();
+}
+
+size_t wxBufferedOutputStream::GetSize() const
+{
+   return m_parent_o_stream->GetSize() + m_o_streambuf->GetIntPosition();
+}
+
+void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
+{
+    wxCHECK_RET( buffer, _T("wxBufferedOutputStream needs buffer") );
+
+    delete m_o_streambuf;
+    m_o_streambuf = buffer;
 }
 
 // ----------------------------------------------------------------------------
@@ -616,7 +1178,14 @@ wxOutputStream& wxEndL(wxOutputStream& stream)
 {
 #ifdef __MSW__
   return stream.Write("\r\n", 2);
+#else
+#ifdef __WXMAC__
+  return stream.Write("\r", 1);
 #else
   return stream.Write("\n", 1);
 #endif
+#endif
 }
+
+#endif
+  // wxUSE_STREAMS