More COMPATIBILITY_2_4 fixes.

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 4d32e503ea6cf92b1a6c7c261b2ce9a7acc0b346..2770a5df20a5cb9946dc1d641f1a57269cafa3a5 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -1,16 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStream base classes
 // Author:      Guilhem Lavaux
 // 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
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

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

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

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "stream.h"
+    #pragma implementation "stream.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -27,461 +36,611 @@
 #if wxUSE_STREAMS
 
 #include <ctype.h>
 #if wxUSE_STREAMS
 
 #include <ctype.h>

-#include <wx/stream.h>
-#include <wx/datstrm.h>
-#include <wx/objstrm.h>
+#include "wx/stream.h"
+#include "wx/datstrm.h"
+#include "wx/textfile.h"
+#include "wx/log.h"

 
 

-#define BUF_TEMP_SIZE 10000
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the temporary buffer size used when copying from stream to stream
+#define BUF_TEMP_SIZE 4096
+
+// ============================================================================
+// implementation
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 // wxStreamBuffer
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStreamBuffer
 // ----------------------------------------------------------------------------
 

-#define CHECK_ERROR(err) \
-   if (m_stream->m_lasterror == wxStream_NOERROR) \
-     m_stream->m_lasterror = err
-
-wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
-  : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
-    m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
-    m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
-    m_mode(mode), m_destroybuf(FALSE), m_destroystream(FALSE)
+void wxStreamBuffer::SetError(wxStreamError err)

 {
 {

+   if ( m_stream && m_stream->m_lasterror == wxSTREAM_NO_ERROR )
+       m_stream->m_lasterror = err;

 }
 
 }
 

-wxStreamBuffer::wxStreamBuffer(BufMode mode)
-  : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
-    m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
-    m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
-    m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE)
+void wxStreamBuffer::InitBuffer()

 {
 {

-  m_stream = new wxStreamBase();
-}
+    m_buffer_start =
+    m_buffer_end =
+    m_buffer_pos = NULL;
+    m_buffer_size = 0;

 
 

-wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& 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;
-  m_wback = NULL;
-  m_wbacksize = 0;
-  m_wbackcur = 0;
+    // if we are going to allocate the buffer, we should free it later as well
+    m_destroybuf = TRUE;

 }
 
 }
 

-wxStreamBuffer::~wxStreamBuffer()
+void wxStreamBuffer::Init()

 {
 {

-  if (m_wback)
-    free(m_wback);
-  if (m_destroybuf)
-    wxDELETEA(m_buffer_start);
-  if (m_destroystream)
-    delete m_stream;
+    InitBuffer();
+
+    m_fixed = TRUE;

 }
 
 }
 

-size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
+wxStreamBuffer::wxStreamBuffer(BufMode mode)

 {
 {

-  char *ptrback;
+    Init();

 
 

-  if (m_mode != read)
-    return 0;
-
-  ptrback = AllocSpaceWBack(bufsize);
-  if (!ptrback)
-    return 0;
+    m_stream = NULL;
+    m_mode = mode;

 
 

-  memcpy(ptrback, buf, bufsize);
-  return bufsize;
+    m_flushable = FALSE;

 }
 
 }
 

-bool wxStreamBuffer::WriteBack(char c)
+wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)

 {
 {

-  char *ptrback;
+    Init();

 
 

-  ptrback = AllocSpaceWBack(1);
-  if (!ptrback)
-    return FALSE;
+    m_stream = &stream;
+    m_mode = mode;

 
 

-  *ptrback = c;
-  return TRUE;
+    m_flushable = TRUE;

 }
 
 }
 

-void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
+wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)

 {
 {

-  if (m_destroybuf)
-    wxDELETEA(m_buffer_start);
-  m_buffer_start = buffer_start;
-  m_buffer_end   = buffer_end;
+    // doing this has big chances to lead to a crash when the source buffer is
+    // destroyed (otherwise assume the caller knows what he does)
+    wxASSERT_MSG( !buffer.m_destroybuf,
+                  _T("it's a bad idea to copy this buffer") );

 
 

-  m_buffer_size = m_buffer_end-m_buffer_start;
-  m_destroybuf = FALSE;
-  ResetBuffer();
+    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;

 }
 
 }
 

-void wxStreamBuffer::SetBufferIO(size_t bufsize)
+void wxStreamBuffer::FreeBuffer()

 {
 {

-  char *b_start;
+    if ( m_destroybuf )
+        free(m_buffer_start);
+}

 
 

-  if (m_destroybuf)
-    wxDELETEA(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;
-  }
+wxInputStream *wxStreamBuffer::GetInputStream() const
+{
+    return m_mode == write ? NULL : (wxInputStream *)m_stream;
+}

 
 

-  b_start = new char[bufsize];
-  SetBufferIO(b_start, b_start + bufsize);
-  m_destroybuf = TRUE;
+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)

 {
 {

-  m_stream->m_lasterror = wxStream_NOERROR;
-  m_stream->m_lastcount = 0;
-  if (m_mode == read)
-    m_buffer_pos = m_buffer_end;
-  else
-    m_buffer_pos = m_buffer_start;
+    SetBufferIO(buffer_start, (char *)buffer_end - (char *)buffer_start,
+                takeOwnership);

 }
 
 }
 

-char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size)
+void wxStreamBuffer::SetBufferIO(void *start,
+                                 size_t len,
+                                 bool takeOwnership)

 {
 {

-  char *temp_b;
+    // start by freeing the old buffer
+    FreeBuffer();
+
+    m_buffer_start = (char *)start;
+    m_buffer_end   = m_buffer_start + len;

 
 

-  m_wbacksize += needed_size;
+    m_buffer_size = len;

 
 

-  if (!m_wback)
-    temp_b = (char *)malloc(m_wbacksize);
-  else
-    temp_b = (char *)realloc(m_wback, m_wbacksize);
+    // if we own it, we free it
+    m_destroybuf = takeOwnership;

 
 

-  if (!temp_b)
-    return NULL;
-  m_wback = temp_b;
-  
-  return (char *)(m_wback+(m_wbacksize-needed_size));
+    ResetBuffer();

 }
 
 }
 

-size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
+void wxStreamBuffer::SetBufferIO(size_t bufsize)

 {
 {

-  size_t s_toget = m_wbacksize-m_wbackcur;
+    // start by freeing the old buffer
+    FreeBuffer();

 
 

-  if (bsize < s_toget)
-    s_toget = bsize;
+    if ( bufsize )
+    {
+        SetBufferIO(malloc(bufsize), bufsize, TRUE /* take ownership */);
+    }
+    else // no buffer size => no buffer
+    {
+        InitBuffer();
+    }
+}

 
 

-  memcpy(buf, (m_wback+m_wbackcur), s_toget);
+void wxStreamBuffer::ResetBuffer()
+{
+    if ( m_stream )
+    {
+        m_stream->Reset();
+        m_stream->m_lastcount = 0;
+    }

 
 

-  m_wbackcur += s_toget;
-  if (m_wbackcur == m_wbacksize) {
-    free(m_wback);
-    m_wback = (char *)NULL;
-    m_wbacksize = 0;
-    m_wbackcur = 0;
-  }
-    
-  return s_toget;
+    m_buffer_pos = m_mode == read && m_flushable
+                        ? m_buffer_end
+                        : m_buffer_start;

 }
 
 }
 

+// fill the buffer with as much data as possible (only for read buffers)

 bool wxStreamBuffer::FillBuffer()
 {
 bool wxStreamBuffer::FillBuffer()
 {

-  size_t count;
+    wxInputStream *inStream = GetInputStream();

 
 

-  count = m_stream->OnSysRead(m_buffer_start, m_buffer_size);
-  m_buffer_end = m_buffer_start+count;
-  m_buffer_pos = m_buffer_start;
+    // It's legal to have no stream, so we don't complain about it just return FALSE
+    if ( !inStream )
+        return FALSE;

 
 

-  if (count == 0)
-    return FALSE;
-  return TRUE;
+    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;

 }
 
 }
 

+// write the buffer contents to the stream (only for write buffers)

 bool wxStreamBuffer::FlushBuffer()
 {
 bool wxStreamBuffer::FlushBuffer()
 {

-  size_t count, current;
+    wxCHECK_MSG( m_flushable, FALSE, _T("can't flush this buffer") );
+
+    // FIXME: what is this check for? (VZ)
+    if ( m_buffer_pos == m_buffer_start )
+        return FALSE;

 
 

-  if (m_buffer_pos == m_buffer_start || !m_flushable)
-    return FALSE;
+    wxOutputStream *outStream = GetOutputStream();

 
 

-  current = m_buffer_pos-m_buffer_start;
-  count = m_stream->OnSysWrite(m_buffer_start, current);
-  if (count != current)
-    return FALSE;
-  m_buffer_pos = m_buffer_start;
+    wxCHECK_MSG( outStream, FALSE, _T("should have a stream in wxStreamBuffer") );

 
 

-  return TRUE;
+    size_t current = m_buffer_pos - m_buffer_start;
+    size_t count = outStream->OnSysWrite(m_buffer_start, current);
+    if ( count != current )
+        return FALSE;
+
+    m_buffer_pos = m_buffer_start;
+
+    return TRUE;

 }
 
 }
 

+size_t wxStreamBuffer::GetDataLeft()
+{
+    /* Why is this done? RR. */
+    if ( m_buffer_pos == m_buffer_end && m_flushable)
+        FillBuffer();
+
+    return GetBytesLeft();
+}
+
+// copy up to size bytes from our buffer into the provided one

 void wxStreamBuffer::GetFromBuffer(void *buffer, size_t size)
 {
 void wxStreamBuffer::GetFromBuffer(void *buffer, size_t size)
 {

-  size_t s_toget = m_buffer_end-m_buffer_pos;
+    // don't get more bytes than left in the buffer
+    size_t left = GetBytesLeft();

 
 

-  if (size < s_toget)
-    s_toget = size;
+    if ( size > left )
+        size = left;

 
 

-  memcpy(buffer, m_buffer_pos, s_toget);
-  m_buffer_pos += s_toget;
+    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)
 {
 void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
 {

-  size_t s_toput = m_buffer_end-m_buffer_pos;
+    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;
+        }
+    }

 
 

-  if (s_toput < size && !m_fixed) {
-    m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size+size);
-    // I round a bit
-    m_buffer_size += size;
-    m_buffer_end = m_buffer_start+m_buffer_size;
-    s_toput = size;
-  }
-  if (s_toput > size)
-    s_toput = size;
-  memcpy(m_buffer_pos, buffer, s_toput);
-  m_buffer_pos += s_toput;
+    memcpy(m_buffer_pos, buffer, size);
+    m_buffer_pos += size;

 }
 
 void wxStreamBuffer::PutChar(char c)
 {
 }
 
 void wxStreamBuffer::PutChar(char c)
 {

-  wxASSERT(m_stream != NULL);
+    wxOutputStream *outStream = GetOutputStream();

 
 

-  if (!m_buffer_size) {
-    m_stream->OnSysWrite(&c, 1);
-    return;
-  }
+    wxCHECK_RET( outStream, _T("should have a stream in wxStreamBuffer") );

 
 

-  if (GetDataLeft() == 0 && !FlushBuffer()) {
-    CHECK_ERROR(wxStream_WRITE_ERR);
-    return;
-  }
-
-  PutToBuffer(&c, 1);
-  m_stream->m_lastcount = 1;
+    // if we don't have buffer at all, just forward this call to the stream,
+    if ( !HasBuffer() )
+    {
+        outStream->OnSysWrite(&c, sizeof(c));
+    }
+    else
+    {
+        // otherwise check we have enough space left
+        if ( !GetDataLeft() && !FlushBuffer() )
+        {
+            // we don't
+            SetError(wxSTREAM_WRITE_ERROR);
+        }
+        else
+        {
+            PutToBuffer(&c, sizeof(c));
+            m_stream->m_lastcount = 1;
+        }
+    }

 }
 
 }
 

-char wxStreamBuffer::GetChar()
+char wxStreamBuffer::Peek()

 {
 {

-  char c;
+    wxCHECK_MSG( m_stream && HasBuffer(), 0,
+                 _T("should have the stream and the buffer in wxStreamBuffer") );

 
 

-  wxASSERT(m_stream != NULL);
-
-  if (!m_buffer_size) {
-    m_stream->OnSysRead(&c, 1);
-    return c;
-  }
+    if ( !GetDataLeft() )
+    {
+        SetError(wxSTREAM_READ_ERROR);
+        return 0;
+    }

 
 

-  if (!GetDataLeft()) {
-    CHECK_ERROR(wxStream_READ_ERR);
-    return 0;
-  }
+    char c;
+    GetFromBuffer(&c, sizeof(c));
+    m_buffer_pos--;

 
 

-  GetFromBuffer(&c, 1);
-  
-  m_stream->m_lastcount = 1;
-  return c;
+    return c;

 }
 
 }
 

-size_t wxStreamBuffer::Read(void *buffer, size_t size)
+char wxStreamBuffer::GetChar()

 {
 {

-  wxASSERT(m_stream != NULL);
-
-  if (m_mode == write)
-    return 0;
+    wxInputStream *inStream = GetInputStream();

 
 

-  // ------------------
-  // Buffering disabled
-  // ------------------
+    wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );

 
 

-  m_stream->m_lasterror = wxStream_NOERROR;
-  m_stream->m_lastcount = GetWBack((char *)buffer, size);
-  size -= m_stream->m_lastcount;
-  if (size == 0)
-    return m_stream->m_lastcount;
+    char c;
+    if ( !HasBuffer() )
+    {
+        inStream->OnSysRead(&c, sizeof(c));
+    }
+    else
+    {
+        if ( !GetDataLeft() )
+        {
+            SetError(wxSTREAM_READ_ERROR);
+            c = 0;
+        }
+        else
+        {
+            GetFromBuffer(&c, sizeof(c));
+            m_stream->m_lastcount = 1;
+        }
+    }

 
 

-  buffer = (void *)((char *)buffer+m_stream->m_lastcount);
+    return c;
+}

 
 

-  if (!m_buffer_size)
-    return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));
+size_t wxStreamBuffer::Read(void *buffer, size_t size)
+{
+    // lasterror is reset before all new IO calls
+    if ( m_stream )
+        m_stream->Reset();

 
 

-  // -----------------
-  // Buffering enabled
-  // -----------------
-  size_t buf_left, orig_size = size;
+    size_t read;
+    if ( !HasBuffer() )
+    {
+        wxInputStream *inStream = GetInputStream();

 
 

-  while (size > 0) {
-    buf_left = GetDataLeft(); 
+        wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );

 
 

-    // First case: the requested buffer is larger than the stream buffer,
-    //             we split it.
-    if (size > buf_left) {
-      GetFromBuffer(buffer, buf_left);
-      size  -= buf_left;
-      buffer = (char *)buffer + buf_left; // ANSI C++ violation.
+        read = 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;
+            }
+        }
+
+        read = orig_size - size;
+    }

 
 

-      if (!FillBuffer()) {
-        CHECK_ERROR(wxStream_READ_ERR);
-        return (m_stream->m_lastcount = orig_size-size);
-      }
-    } else {
+    if ( m_stream )
+        m_stream->m_lastcount = read;

 
 

-      // Second case: we just copy from the stream buffer.
-      GetFromBuffer(buffer, size);
-      break;
-    }
-  }
-  return (m_stream->m_lastcount += orig_size);
+    return read;

 }
 
 }
 

-size_t wxStreamBuffer::Read(wxStreamBuffer *s_buf)
+// this should really be called "Copy()"
+size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)

 {
 {

-  char buf[BUF_TEMP_SIZE];
-  size_t s = 0, bytes_read = BUF_TEMP_SIZE;
+    wxCHECK_MSG( m_mode != write, 0, _T("can't read from this buffer") );

 
 

-  if (m_mode == write)
-    return 0;
+    char buf[BUF_TEMP_SIZE];
+    size_t nRead,
+           total = 0;

 
 

-  while (bytes_read != 0) {
-    bytes_read = Read(buf, bytes_read);
-    bytes_read = s_buf->Write(buf, bytes_read);
-    s += bytes_read;
-  }
-  return s;
+    do
+    {
+        nRead = Read(dbuf, WXSIZEOF(buf));
+        if ( nRead )
+        {
+            nRead = dbuf->Write(buf, nRead);
+            total += nRead;
+        }
+    }
+    while ( nRead );
+
+    return total;

 }
 
 size_t wxStreamBuffer::Write(const void *buffer, size_t size)
 {
 }
 
 size_t wxStreamBuffer::Write(const void *buffer, size_t size)
 {

-  wxASSERT(m_stream != NULL);
-
-  if (m_mode == read)
-    return 0;
-
-  // ------------------
-  // Buffering disabled
-  // ------------------
-
-  m_stream->m_lasterror = wxStream_NOERROR;
-  if (!m_buffer_size)
-    return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));
-
-  // ------------------
-  // Buffering enabled
-  // ------------------
-
-  size_t buf_left, orig_size = size;
-
-  while (size > 0) {
-    buf_left = m_buffer_end - m_buffer_pos;
+    if (m_stream)
+    {
+        // lasterror is reset before all new IO calls
+        m_stream->Reset();
+    }

 
 

-    // First case: the buffer to write is larger than the stream buffer,
-    //             we split it
-    if (size > buf_left) {
-      PutToBuffer(buffer, buf_left);
-      size -= buf_left;
-      buffer = (char *)buffer + buf_left; // ANSI C++ violation.
+    size_t ret = 0;

 
 

-      if (!FlushBuffer()) {
-       CHECK_ERROR(wxStream_WRITE_ERR);
-        return (m_stream->m_lastcount = orig_size-size);
-      }
+    if ( !HasBuffer() && m_fixed )
+    {
+        wxOutputStream *outStream = GetOutputStream();

 
 

-      m_buffer_pos = m_buffer_start;
+        wxCHECK_MSG( outStream, 0, _T("should have a stream in wxStreamBuffer") );

 
 

-    } else {
+        // no buffer, just forward the call to the stream
+        ret = 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_ERROR);
+
+                    break;
+                }
+
+                m_buffer_pos = m_buffer_start;
+            }
+            else // we can do it in one gulp
+            {
+                PutToBuffer(buffer, size);
+                size = 0;
+            }
+        }
+
+        ret = orig_size - size;
+    }

 
 

-      // Second case: just copy it in the stream buffer.
-      PutToBuffer(buffer, size);
-      break;
+    if (m_stream)
+    {
+        // i am not entirely sure what we do this for
+        m_stream->m_lastcount = ret;

     }
     }

-  }
-  return (m_stream->m_lastcount = orig_size);
+
+    return ret;

 }
 
 size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
 {
 }
 
 size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
 {

-  char buf[BUF_TEMP_SIZE];
-  size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;
-
-  if (m_mode == read)
-    return 0;
+    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) );

 
 

-  while (bytes_count == BUF_TEMP_SIZE) {
-    b_count2 = sbuf->Read(buf, bytes_count);
-    bytes_count = Write(buf, b_count2);
-    if (b_count2 > bytes_count)
-      sbuf->WriteBack(buf+bytes_count, b_count2-bytes_count);
-    s += bytes_count;
-  }
-  return s;
+    return total;

 }
 
 off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)
 {
 }
 
 off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)
 {

-  off_t ret_off, diff, last_access;
+    off_t ret_off, diff;

 
 

-  last_access = GetLastAccess();
+    off_t last_access = GetLastAccess();

 
 

-  if (!m_flushable) {
-    diff = pos + GetIntPosition();
-    if (diff < 0 || diff > last_access)
-      return wxInvalidOffset;
-    SetIntPosition(diff);
-    return diff;
-  }
+    if ( !m_flushable )
+    {
+        switch (mode)
+        {
+            case wxFromStart:
+                diff = pos;
+                break;

 
 

-  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) ) {
-      ret_off = m_stream->OnSysSeek(pos, 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;
+            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
 {
 }
 
 off_t wxStreamBuffer::Tell() const
 {

-  off_t pos;
+    off_t pos;

 
 

-  if (m_flushable) {
-    pos = m_stream->OnSysTell();
-    if (pos == wxInvalidOffset)
-      return wxInvalidOffset;
-    return pos - GetLastAccess() + GetIntPosition();
-  } else
-    return GetIntPosition();
-}
+    // ask the stream for position if we have a real one
+    if ( m_stream )
+    {
+        pos = m_stream->OnSysTell();
+        if ( pos == wxInvalidOffset )
+            return wxInvalidOffset;
+    }
+    else // no associated stream
+    {
+        pos = 0;
+    }

 
 

-size_t wxStreamBuffer::GetDataLeft()
-{
-  if (m_buffer_end == m_buffer_pos && m_flushable)
-    FillBuffer();
-  return m_buffer_end-m_buffer_pos;
+    pos += GetIntPosition();
+
+    if ( m_mode == read && m_flushable )
+        pos -= GetLastAccess();
+
+    return pos;

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


@@ -490,32 +649,22 @@ size_t wxStreamBuffer::GetDataLeft()
 
 wxStreamBase::wxStreamBase()
 {
 
 wxStreamBase::wxStreamBase()
 {

-  m_lasterror = wxStream_NOERROR;
-  m_lastcount = 0;
+    m_lasterror = wxSTREAM_NO_ERROR;
+    m_lastcount = 0;

 }
 
 wxStreamBase::~wxStreamBase()
 {
 }
 
 }
 
 wxStreamBase::~wxStreamBase()
 {
 }
 

-size_t wxStreamBase::OnSysRead(void *WXUNUSED(buffer), size_t WXUNUSED(size))
-{
-  return 0;
-}
-
-size_t wxStreamBase::OnSysWrite(const void *WXUNUSED(buffer), size_t WXUNUSED(bufsize))
-{
-  return 0;
-}
-

 off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {
 off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {

-  return wxInvalidOffset;
+    return wxInvalidOffset;

 }
 
 off_t wxStreamBase::OnSysTell() const
 {
 }
 
 off_t wxStreamBase::OnSysTell() const
 {

-  return wxInvalidOffset;
+    return wxInvalidOffset;

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


@@ -523,440 +672,563 @@ off_t wxStreamBase::OnSysTell() const
 // ----------------------------------------------------------------------------
 
 wxInputStream::wxInputStream()
 // ----------------------------------------------------------------------------
 
 wxInputStream::wxInputStream()

-  : wxStreamBase()

 {
 {

-  m_i_destroybuf = TRUE;
-  m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
+    m_wback = NULL;
+    m_wbacksize =
+    m_wbackcur = 0;

 }
 
 }
 

-wxInputStream::wxInputStream(wxStreamBuffer *buffer)
-  : wxStreamBase()
+wxInputStream::~wxInputStream()

 {
 {

-  m_i_destroybuf = FALSE;
-  m_i_streambuf = buffer;
+    free(m_wback);

 }
 
 }
 

-wxInputStream::~wxInputStream()
+bool wxInputStream::CanRead() const

 {
 {

-  if (m_i_destroybuf)
-    delete m_i_streambuf;
+    // we don't know if there is anything to read or not and by default we
+    // prefer to be optimistic and try to read data unless we know for sure
+    // there is no more of it
+    return m_lasterror != wxSTREAM_EOF;

 }
 
 }
 

-char wxInputStream::GetC()
+bool wxInputStream::Eof() const

 {
 {

-  char c;
-  m_i_streambuf->Read(&c, 1);
-  return c;
+    // the only way the base class can know we're at EOF is when we'd already
+    // tried to read beyond it in which case last error is set accordingly
+    return GetLastError() == wxSTREAM_EOF;

 }
 
 }
 

-
-wxString wxInputStream::ReadLine()
+char *wxInputStream::AllocSpaceWBack(size_t needed_size)

 {
 {

-  char c, last_endl = 0;
-  bool end_line = FALSE;
-  wxString line;
+    // get number of bytes left from previous wback buffer
+    size_t toget = m_wbacksize - m_wbackcur;

 
 

-  while (!end_line) {
-    c = GetC();
-    if (LastError() != wxStream_NOERROR)
-      break;
+    // allocate a buffer large enough to hold prev + new data
+    char *temp_b = (char *)malloc(needed_size + toget);

 
 

-    switch (c) {
-    case '\n':
-      end_line = TRUE;
-      break;
-    case '\r':
-      last_endl = '\r';
-      break;
-    default:
-      if (last_endl == '\r') {
-        end_line = TRUE;
-        InputStreamBuffer()->WriteBack(c);
-        break;
-      }
-      line += c;
-      break;
-    } 
-  }
-  return line;
-}
+    if (!temp_b)
+        return NULL;

 
 

-wxInputStream& wxInputStream::Read(void *buffer, size_t size)
-{
-  m_i_streambuf->Read(buffer, size);
-  // wxStreamBuffer sets all variables for us
-  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;

 }
 
 }
 

-char wxInputStream::Peek()
+size_t wxInputStream::GetWBack(void *buf, size_t size)

 {
 {

-  m_i_streambuf->GetDataLeft();
+    if (!m_wback)
+        return 0;

 
 

-  return *(m_i_streambuf->GetBufferPos());
-}
+    // how many bytes do we have in the buffer?
+    size_t toget = m_wbacksize - m_wbackcur;

 
 

+    if ( size < toget )
+    {
+        // we won't read everything
+        toget = size;
+    }

 
 

-wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
+    // copy the data from the cache
+    memcpy(buf, m_wback + m_wbackcur, toget);
+
+    m_wbackcur += toget;
+    if ( m_wbackcur == m_wbacksize )
+    {
+        // TODO: should we really free it here all the time? maybe keep it?
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    // return the number of bytes copied
+    return toget;
+}
+
+size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)

 {
 {

-  char buf[BUF_TEMP_SIZE]; 
-  size_t bytes_read = BUF_TEMP_SIZE;
+    if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF )
+    {
+        // can't operate on this stream until the error is cleared
+        return 0;
+    }
+
+    char *ptrback = AllocSpaceWBack(bufsize);
+    if (!ptrback)
+        return 0;
+
+    // Eof() shouldn't return TRUE any longer
+    if ( m_lasterror == wxSTREAM_EOF )
+        m_lasterror = wxSTREAM_NO_ERROR;

 
 

-  while (bytes_read == BUF_TEMP_SIZE) {
-    bytes_read = Read(buf, bytes_read).LastRead();
-    bytes_read = stream_out.Write(buf, bytes_read).LastWrite();
-  }
-  return *this;
+    memcpy(ptrback, buf, bufsize);
+    return bufsize;

 }
 
 }
 

-off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
+bool wxInputStream::Ungetch(char c)

 {
 {

-  return m_i_streambuf->Seek(pos, mode);
+    return Ungetch(&c, sizeof(c)) != 0;

 }
 
 }
 

-off_t wxInputStream::TellI() const
+char wxInputStream::GetC()

 {
 {

-  return m_i_streambuf->Tell();
+    char c;
+    Read(&c, sizeof(c));
+    return c;

 }
 
 }
 

-// --------------------
-// Overloaded operators
-// --------------------
+wxInputStream& wxInputStream::Read(void *buf, size_t size)
+{
+    char *p = (char *)buf;
+    m_lastcount = 0;
+
+    size_t read = GetWBack(buf, size);
+    for ( ;; )
+    {
+        size -= read;
+        m_lastcount += read;
+        p += read;
+
+        if ( !size )
+        {
+            // we read the requested amount of data
+            break;
+        }
+
+        if ( p != buf && !CanRead() )
+        {
+            // we have already read something and we would block in OnSysRead()
+            // now: don't do it but return immediately
+            break;
+        }
+
+        read = OnSysRead(p, size);
+        if ( !read )
+        {
+            // no more data available
+            break;
+        }
+    }

 
 

-wxInputStream& wxInputStream::operator>>(wxString& line)
-{
-  line = ReadLine();
-  return *this;
+    return *this;

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(char& c)
+char wxInputStream::Peek()

 {
 {

-  c = GetC();
-  return *this;
+    char c;
+    Read(&c, sizeof(c));
+    if (m_lasterror == wxSTREAM_NO_ERROR)
+    {
+        Ungetch(c);
+        return c;
+    }
+
+    return 0;

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(signed short& i)
+wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)

 {
 {

-  signed long l;
+    char buf[BUF_TEMP_SIZE];
+
+    for ( ;; )
+    {
+        size_t bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
+        if ( !bytes_read )
+            break;

 
 

-  *this >> l;
-  i = (signed short)l;
-  return *this;
+        if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read )
+            break;
+    }
+
+    return *this;

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(signed int& i)
+off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)

 {
 {

-  signed long l;
+    // RR: This code is duplicated in wxBufferedInputStream. This is
+    // not really a good design, but buffered stream are different
+    // from all other in that they handle two stream-related objects,
+    // the stream buffer and parent stream.
+
+    // I don't know whether it should be put as well in wxFileInputStream::OnSysSeek
+    if (m_lasterror==wxSTREAM_EOF)
+        m_lasterror=wxSTREAM_NO_ERROR;
+
+    /* RR: A call to SeekI() will automatically invalidate any previous
+       call to Ungetch(), otherwise it would be possible to SeekI() to
+       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)
+    {
+        wxLogDebug( wxT("Seeking in stream which has data written back to it.") );
+
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }

 
 

-  *this >> l;
-  i = (signed int)l;
-  return *this;
+    return OnSysSeek(pos, mode);

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(signed long& i)
+off_t wxInputStream::TellI() const

 {
 {

-  /* I only implemented a simple integer parser */
-  int c; 
-  int sign;
+    off_t pos = OnSysTell();

 
 

-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
+    if (pos != wxInvalidOffset)
+        pos -= (m_wbacksize - m_wbackcur);

 
 

-  i = 0;
-  if (! (c == '-' || isdigit(c)) ) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
+    return pos;
+}

 
 

-  if (c == '-') {
-    sign = -1;
-    c = GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = GetC();
-  } else {
-    sign = 1;
-  }

 
 

-  while (isdigit(c)) {
-    i = i*10 + (c - (int)'0');
-    c = GetC();
-  }
+// ----------------------------------------------------------------------------
+// wxOutputStream
+// ----------------------------------------------------------------------------

 
 

-  i *= sign;
+wxOutputStream::wxOutputStream()
+{
+}

 
 

-  return *this;
+wxOutputStream::~wxOutputStream()
+{

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(unsigned short& i)
+size_t wxOutputStream::OnSysWrite(const void * WXUNUSED(buffer),
+                                  size_t WXUNUSED(bufsize))

 {
 {

-  unsigned long l;
+    return 0;
+}

 
 

-  *this >> l;
-  i = (unsigned short)l;
-  return *this;
+void wxOutputStream::PutC(char c)
+{
+    Write(&c, sizeof(c));

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(unsigned int& i)
+wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)

 {
 {

-  unsigned long l;
+    m_lastcount = OnSysWrite(buffer, size);
+    return *this;
+}

 
 

-  *this >> l;
-  i = (unsigned int)l;
-  return *this;
+wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
+{
+    stream_in.Read(*this);
+    return *this;

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(unsigned long& i)
+off_t wxOutputStream::TellO() const

 {
 {

-  /* I only implemented a simple integer parser */
-  int c;
+    return OnSysTell();
+}

 
 

-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
+off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
+{
+    return OnSysSeek(pos, mode);
+}

 
 

-  i = 0;
-  if (!isdigit(c)) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
+void wxOutputStream::Sync()
+{
+}

 
 

-  while (isdigit(c)) {
-    i = i*10 + c - '0';
-    c = GetC();
-  }

 
 

-  return *this;
+// ----------------------------------------------------------------------------
+// wxCountingOutputStream
+// ----------------------------------------------------------------------------
+
+wxCountingOutputStream::wxCountingOutputStream ()
+{
+     m_currentPos = 0;

 }
 
 }
 

-wxInputStream& wxInputStream::operator>>(double& f)
+size_t wxCountingOutputStream::GetSize() const

 {
 {

-  /* I only implemented a simple float parser */
-  int c, sign;
+    return m_lastcount;
+}

 
 

-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
+size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
+                                          size_t size)
+{
+    m_currentPos += size;
+    if (m_currentPos > m_lastcount)
+        m_lastcount = m_currentPos;

 
 

-  f = 0.0;
-  if (! (c == '-' || isdigit(c)) ) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
+    return m_currentPos;
+}

 
 

-  if (c == '-') {
-    sign = -1;
-    c = GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = GetC();
-  } else {
-    sign = 1;
-  }
+off_t wxCountingOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+    switch ( mode )
+    {
+        case wxFromStart:
+            m_currentPos = pos;
+            break;

 
 

-  while (isdigit(c)) {
-    f = f*10 + (c - '0');
-    c = GetC();
-  }
+        case wxFromEnd:
+            m_currentPos = m_lastcount + pos;
+            break;

 
 

-  if (c == '.') {
-    double f_multiplicator = (double) 0.1;
-    c = GetC();
+        case wxFromCurrent:
+            m_currentPos += pos;
+            break;

 
 

-    while (isdigit(c)) {
-      f += (c-'0')*f_multiplicator;
-      f_multiplicator /= 10;
-      c = GetC();
+        default:
+            wxFAIL_MSG( _T("invalid seek mode") );
+            return wxInvalidOffset;

     }
     }

-  }

 
 

-  f *= sign;
+    if (m_currentPos > m_lastcount)
+        m_lastcount = m_currentPos;

 
 

-  return *this;
+    return m_currentPos;

 }
 
 }
 

-#if wxUSE_SERIAL
-wxInputStream& wxInputStream::operator>>(wxObject *& obj)
+off_t wxCountingOutputStream::OnSysTell() const

 {
 {

-  wxObjectInputStream obj_s(*this);
-  obj = obj_s.LoadObject();
-  return *this;
+    return m_currentPos;

 }
 }

-#endif
-

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxOutputStream
+// wxFilterInputStream

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-wxOutputStream::wxOutputStream()
-  : wxStreamBase()
+
+wxFilterInputStream::wxFilterInputStream()

 {
 {

-  m_o_destroybuf = TRUE;
-  m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+    m_parent_i_stream = NULL;

 }
 
 }
 

-wxOutputStream::wxOutputStream(wxStreamBuffer *buffer)
-  : wxStreamBase()
+wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)

 {
 {

-  m_o_destroybuf = FALSE;
-  m_o_streambuf = buffer;
+    m_parent_i_stream = &stream;

 }
 
 }
 

-wxOutputStream::~wxOutputStream()
+wxFilterInputStream::~wxFilterInputStream()

 {
 {

-  if (m_o_destroybuf)
-    delete m_o_streambuf;

 }
 
 }
 

-wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
+// ----------------------------------------------------------------------------
+// wxFilterOutputStream
+// ----------------------------------------------------------------------------
+
+wxFilterOutputStream::wxFilterOutputStream()

 {
 {

-  m_o_streambuf->Write(buffer, size);
-  return *this;
+    m_parent_o_stream = NULL;

 }
 
 }
 

-wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
+wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)

 {
 {

-  stream_in.Read(*this);
-  return *this;
+    m_parent_o_stream = &stream;

 }
 
 }
 

-off_t wxOutputStream::TellO() const
+wxFilterOutputStream::~wxFilterOutputStream()

 {
 {

-  return m_o_streambuf->Tell();

 }
 
 }
 

-off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
+// ----------------------------------------------------------------------------
+// wxBufferedInputStream
+// ----------------------------------------------------------------------------
+
+wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s,
+                                             wxStreamBuffer *buffer)
+                     : wxFilterInputStream(s)

 {
 {

-  return m_o_streambuf->Seek(pos, mode);
+    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);
+    }

 }
 
 }
 

-void wxOutputStream::Sync()
+wxBufferedInputStream::~wxBufferedInputStream()

 {
 {

-  m_o_streambuf->FlushBuffer();
+    m_parent_i_stream->SeekI(-(off_t)m_i_streambuf->GetBytesLeft(),
+                             wxFromCurrent);
+
+    delete m_i_streambuf;

 }
 
 }
 

-void wxOutputStream::WriteLine(const wxString& line)
+char wxBufferedInputStream::Peek()

 {
 {

-#ifdef __WXMSW__
-  wxString tmp_string = line + _T("\r\n");
-#else
-#ifdef __WXMAC__
-  wxString tmp_string = line + _T('\r');
-#else
-  wxString tmp_string = line + _T('\n');
-#endif
-#endif
-
-  Write((const wxChar *) tmp_string, tmp_string.Length()*sizeof(wxChar));
+    return m_i_streambuf->Peek();

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(const char *string)
+wxInputStream& wxBufferedInputStream::Read(void *buf, size_t size)

 {
 {

-  return Write(string, strlen(string));
+    // reset the error flag
+    Reset();
+
+    // first read from the already cached data
+    m_lastcount = GetWBack(buf, size);
+
+    // do we have to read anything more?
+    if ( m_lastcount < size )
+    {
+        size -= m_lastcount;
+        buf = (char *)buf + m_lastcount;
+
+        // the call to wxStreamBuffer::Read() below will reset our m_lastcount,
+        // so save it
+        size_t countOld = m_lastcount;
+
+        m_i_streambuf->Read(buf, size);
+
+        m_lastcount += countOld;
+    }
+
+    return *this;

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(wxString& string)
+off_t wxBufferedInputStream::SeekI(off_t pos, wxSeekMode mode)

 {
 {

-#if wxUSE_UNICODE
-  const wxWX2MBbuf buf = string.mb_str();
-  return *this << buf;
-#else
-  return Write(string, string.Len());
-#endif
+    // RR: Look at wxInputStream for comments.
+
+    if (m_lasterror==wxSTREAM_EOF)
+        Reset();
+
+    if (m_wback)
+    {
+        wxLogDebug( wxT("Seeking in stream which has data written back to it.") );
+
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    return m_i_streambuf->Seek(pos, mode);

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(char c)
+off_t wxBufferedInputStream::TellI() const

 {
 {

-  return Write(&c, 1);
+    off_t pos = m_i_streambuf->Tell();
+
+    if (pos != wxInvalidOffset)
+        pos -= (m_wbacksize - m_wbackcur);
+
+    return pos;

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(signed short i)
+size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize)

 {
 {

-  signed long l = (signed long)i;
-  return *this << l;
+    return m_parent_i_stream->Read(buffer, bufsize).LastRead();

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(signed int i)
+off_t wxBufferedInputStream::OnSysSeek(off_t seek, wxSeekMode mode)

 {
 {

-  signed long l = (signed long)i;
-  return *this << l;
+    return m_parent_i_stream->SeekI(seek, mode);

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(signed long i)
+off_t wxBufferedInputStream::OnSysTell() const

 {
 {

-  wxString strlong;
-  strlong.Printf(_T("%ld"), i);
-  return *this << strlong;
+    return m_parent_i_stream->TellI();

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(unsigned short i)
+void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)

 {
 {

-  unsigned long l = (unsigned long)i;
-  return *this << l;
+    wxCHECK_RET( buffer, _T("wxBufferedInputStream needs buffer") );
+
+    delete m_i_streambuf;
+    m_i_streambuf = buffer;

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(unsigned int i)
+// ----------------------------------------------------------------------------
+// wxBufferedOutputStream
+// ----------------------------------------------------------------------------
+
+wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s,
+                                               wxStreamBuffer *buffer)
+                      : wxFilterOutputStream(s)

 {
 {

-  unsigned long l = (unsigned long)i;
-  return *this << l;
+    if ( buffer )
+    {
+        m_o_streambuf = buffer;
+    }
+    else // create a default one
+    {
+        m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+
+        m_o_streambuf->SetBufferIO(1024);
+    }

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(unsigned long i)
+wxBufferedOutputStream::~wxBufferedOutputStream()

 {
 {

-  wxString strlong;
-  strlong.Printf(_T("%lu"), i);
-  return *this << strlong;
+    Sync();
+    delete m_o_streambuf;

 }
 
 }
 

-wxOutputStream& wxOutputStream::operator<<(double f)
+wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)

 {
 {

-  wxString strfloat;
+    m_lastcount = 0;
+    m_o_streambuf->Write(buffer, size);
+    return *this;
+}

 
 

-  strfloat.Printf(_T("%f"), f);
-  return *this << strfloat;
+off_t wxBufferedOutputStream::SeekO(off_t pos, wxSeekMode mode)
+{
+    Sync();
+    return m_o_streambuf->Seek(pos, mode);

 }
 
 }
 

-#if wxUSE_SERIAL
-wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
+off_t wxBufferedOutputStream::TellO() const

 {
 {

-  wxObjectOutputStream obj_s(*this);
-  obj_s.SaveObject(obj);
-  return *this;
+    return m_o_streambuf->Tell();

 }
 }

-#endif

 
 

-// ----------------------------------------------------------------------------
-// wxFilterInputStream
-// ----------------------------------------------------------------------------
-wxFilterInputStream::wxFilterInputStream()
-  : wxInputStream(NULL)
+void wxBufferedOutputStream::Sync()

 {
 {

-  // WARNING streambuf set to NULL !
+    m_o_streambuf->FlushBuffer();
+    m_parent_o_stream->Sync();

 }
 
 }
 

-wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
-  : wxInputStream(stream.InputStreamBuffer())
+size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize)

 {
 {

-  m_parent_i_stream = &stream;
+    return m_parent_o_stream->Write(buffer, bufsize).LastWrite();

 }
 
 }
 

-wxFilterInputStream::~wxFilterInputStream()
+off_t wxBufferedOutputStream::OnSysSeek(off_t seek, wxSeekMode mode)

 {
 {

+    return m_parent_o_stream->SeekO(seek, mode);

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxFilterOutputStream
-// ----------------------------------------------------------------------------
-wxFilterOutputStream::wxFilterOutputStream()
-  : wxOutputStream(NULL)
+off_t wxBufferedOutputStream::OnSysTell() const

 {
 {

+    return m_parent_o_stream->TellO();

 }
 
 }
 

-wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
-  : wxOutputStream(stream.OutputStreamBuffer())
+size_t wxBufferedOutputStream::GetSize() const

 {
 {

-  m_parent_o_stream = &stream;
+   return m_parent_o_stream->GetSize() + m_o_streambuf->GetIntPosition();

 }
 
 }
 

-wxFilterOutputStream::~wxFilterOutputStream()
+void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)

 {
 {

+    wxCHECK_RET( buffer, _T("wxBufferedOutputStream needs buffer") );
+
+    delete m_o_streambuf;
+    m_o_streambuf = buffer;

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


@@ -965,15 +1237,9 @@ wxFilterOutputStream::~wxFilterOutputStream()
 
 wxOutputStream& wxEndL(wxOutputStream& stream)
 {
 
 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
+    static const wxChar *eol = wxTextFile::GetEOL();
+
+    return stream.Write(eol, wxStrlen(eol));

 }
 
 #endif
 }
 
 #endif