more timezone stuff - it's a miracle, but it seems to work

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index e18c411643733fd8b92b13c7c8a96317a8534a49..ebe0c5aa1112437b01715f92ce0e7577082d1384 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -494,23 +494,30 @@ wxInputStream::~wxInputStream()
 char *wxInputStream::AllocSpaceWBack(size_t needed_size)
 {
   char *temp_b;
-  size_t old_size;
+  size_t toget;
 
-  old_size = m_wbacksize;
-  m_wbacksize += needed_size;
+  /* get number of bytes left from previous wback buffer */
+  toget = m_wbacksize - m_wbackcur;
 
-  if (!m_wback)
-    temp_b = (char *)malloc(m_wbacksize);
-  else
-    temp_b = (char *)realloc(m_wback, m_wbacksize);
+  /* allocate a buffer large enough to hold prev + new data */
+  temp_b = (char *) malloc(needed_size + toget);
 
   if (!temp_b)
-    return (char*)NULL;
+    return NULL;
+
+  /* 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;
 
-  memmove(m_wback+needed_size, m_wback, old_size);
-  
-  return (char *)(m_wback);
+  return (char *) m_wback;
 }
 
 size_t wxInputStream::GetWBack(char *buf, size_t bsize)
@@ -578,10 +585,10 @@ wxInputStream& wxInputStream::Read(void *buffer, size_t size)
     m_lasterror = wxStream_NOERROR;
     return *this;
   }
-  size     -= retsize;
-  buf      += retsize;
+  size -= retsize;
+  buf  += retsize;
 
-  m_lastcount = OnSysRead(buf, size);
+  m_lastcount = OnSysRead(buf, size) + retsize;
   return *this;
 }
 
@@ -856,6 +863,7 @@ wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s)
 
 wxBufferedOutputStream::~wxBufferedOutputStream()
 {
+  Sync();
   delete m_o_streambuf;
 }
 
@@ -868,6 +876,7 @@ wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
 
 off_t wxBufferedOutputStream::SeekO(off_t pos, wxSeekMode mode)
 {
+  Sync();
   return m_o_streambuf->Seek(pos, mode);
 }