no message

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 1ea04bc61d491c29db75463bd58af939f59335f8..4f24cfc97aeab89cf40b0362a65e701d6e20f1a8 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -30,16 +30,22 @@
 // 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),
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),

-    m_buffer_size(0), m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
+    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)
 {
 }
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
     m_mode(mode), m_destroybuf(FALSE), m_destroystream(FALSE)
 {
 }
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),

-    m_buffer_size(0), m_fixed(TRUE), m_flushable(FALSE), m_stream(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)
 {
   m_stream = new wxStreamBase();
     m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE)
 {
   m_stream = new wxStreamBase();


@@ -57,10 +63,15 @@ wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
   m_mode = buffer.m_mode;
   m_destroybuf = FALSE;
   m_destroystream = FALSE;
   m_mode = buffer.m_mode;
   m_destroybuf = FALSE;
   m_destroystream = FALSE;

+  m_wback = NULL;
+  m_wbacksize = 0;
+  m_wbackcur = 0;

 }
 
 wxStreamBuffer::~wxStreamBuffer()
 {
 }
 
 wxStreamBuffer::~wxStreamBuffer()
 {

+  if (m_wback)
+    free(m_wback);

   if (m_destroybuf)
     wxDELETEA(m_buffer_start);
   if (m_destroystream)
   if (m_destroybuf)
     wxDELETEA(m_buffer_start);
   if (m_destroystream)


@@ -107,7 +118,8 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize)
 {
   char *b_start;
 
 {
   char *b_start;
 

-  wxDELETE(m_buffer_start);
+  if (m_destroybuf)
+    wxDELETEA(m_buffer_start);

 
   if (!bufsize) {
     m_buffer_start = NULL;
 
   if (!bufsize) {
     m_buffer_start = NULL;


@@ -143,13 +155,16 @@ char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size)
 
   if (!temp_b)
     return NULL;
 
   if (!temp_b)
     return NULL;

-  return (char *)((size_t)m_wback+(m_wbacksize-needed_size));
+  m_wback = temp_b;
+  printf("Buffer(0x%x)->Write: 0x%x, %d\n", this, m_wback, m_wbacksize); 
+  return (char *)(m_wback+(m_wbacksize-needed_size));

 }
 
 size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
 {
   size_t s_toget = m_wbacksize-m_wbackcur;
 
 }
 
 size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
 {
   size_t s_toget = m_wbacksize-m_wbackcur;
 

+  printf("Buffer(0x%x): 0x%x, %d\n", this, m_wback, m_wbacksize);

   if (bsize < s_toget)
     s_toget = bsize;
 
   if (bsize < s_toget)
     s_toget = bsize;
 


@@ -233,7 +248,7 @@ void wxStreamBuffer::PutChar(char c)
   }
 
   if (!GetDataLeft() && !FlushBuffer()) {
   }
 
   if (!GetDataLeft() && !FlushBuffer()) {

-    m_stream->m_lasterror = wxStream_EOF;
+    CHECK_ERROR(wxStream_READ_ERR);

     return;
   }
 
     return;
   }
 


@@ -253,7 +268,7 @@ char wxStreamBuffer::GetChar()
   }
 
   if (!GetDataLeft()) {
   }
 
   if (!GetDataLeft()) {

-    m_stream->m_lasterror = wxStream_EOF;
+    CHECK_ERROR(wxStream_READ_ERR);

     return 0;
   }
 
     return 0;
   }
 


@@ -277,9 +292,8 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
 
   buffer = (void *)((char *)buffer+m_stream->m_lastcount);
 
 
   buffer = (void *)((char *)buffer+m_stream->m_lastcount);
 

-  if (!m_buffer_size) {
+  if (!m_buffer_size)

     return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));
     return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));

-  }

 
   // -----------------
   // Buffering enabled
 
   // -----------------
   // Buffering enabled


@@ -297,8 +311,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FillBuffer()) {
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FillBuffer()) {

-        if (m_stream->m_lasterror == wxStream_NOERROR)
-          m_stream->m_lasterror = wxStream_EOF;
+        CHECK_ERROR(wxStream_READ_ERR);

         return (m_stream->m_lastcount = orig_size-size);
       }
     } else {
         return (m_stream->m_lastcount = orig_size-size);
       }
     } else {


@@ -352,8 +365,7 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FlushBuffer()) {
       buffer = (char *)buffer + buf_left; // ANSI C++ violation.
 
       if (!FlushBuffer()) {

-        if (m_stream->m_lasterror == wxStream_NOERROR)
-          m_stream->m_lasterror = wxStream_EOF;
+       CHECK_ERROR(wxStream_WRITE_ERR);

         return (m_stream->m_lastcount = orig_size-size);
       }
 
         return (m_stream->m_lastcount = orig_size-size);
       }
 


@@ -372,13 +384,13 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
 size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
 {
   char buf[BUF_TEMP_SIZE];
 size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
 {
   char buf[BUF_TEMP_SIZE];

-  size_t s = 0, bytes_count = BUF_TEMP_SIZE;
+  size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;

 
   while (bytes_count == BUF_TEMP_SIZE) {
 
   while (bytes_count == BUF_TEMP_SIZE) {

-    if (m_stream->StreamSize() < bytes_count)
-      bytes_count = m_stream->StreamSize();
-    bytes_count = sbuf->Read(buf, bytes_count);
-    bytes_count = Write(buf, bytes_count);
+    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;
     s += bytes_count;
   }
   return s;