old makefiles removed

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index fcd0e85e0067a966fd75491bb721864049148621..d5954d71d8c2340fd3383968df78354c960b6793 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -36,14 +36,16 @@
 
 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();


@@ -61,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)


@@ -75,6 +82,9 @@ size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
 {
   char *ptrback;
 
 {
   char *ptrback;
 

+  if (m_mode != read)
+    return 0;
+

   ptrback = AllocSpaceWBack(bufsize);
   if (!ptrback)
     return 0;
   ptrback = AllocSpaceWBack(bufsize);
   if (!ptrback)
     return 0;


@@ -129,6 +139,8 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize)
 
 void wxStreamBuffer::ResetBuffer()
 {
 
 void wxStreamBuffer::ResetBuffer()
 {

+  m_stream->m_lasterror = wxStream_NOERROR;
+  m_stream->m_lastcount = 0;

   if (m_mode == read)
     m_buffer_pos = m_buffer_end;
   else
   if (m_mode == read)
     m_buffer_pos = m_buffer_end;
   else


@@ -148,7 +160,9 @@ 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;
+  
+  return (char *)(m_wback+(m_wbacksize-needed_size));

 }
 
 size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
 }
 
 size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)


@@ -237,8 +251,8 @@ void wxStreamBuffer::PutChar(char c)
     return;
   }
 
     return;
   }
 

-  if (!GetDataLeft() && !FlushBuffer()) {
-    CHECK_ERROR(wxStream_READ_ERR);
+  if (GetDataLeft() == 0 && !FlushBuffer()) {
+    CHECK_ERROR(wxStream_WRITE_ERR);

     return;
   }
 
     return;
   }
 


@@ -271,10 +285,14 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
 {
   wxASSERT(m_stream != NULL);
 
 {
   wxASSERT(m_stream != NULL);
 

+  if (m_mode == write)
+    return 0;
+

   // ------------------
   // Buffering disabled
   // ------------------
 
   // ------------------
   // Buffering disabled
   // ------------------
 

+  m_stream->m_lasterror = wxStream_NOERROR;

   m_stream->m_lastcount = GetWBack((char *)buffer, size);
   size -= m_stream->m_lastcount;
   if (size == 0)
   m_stream->m_lastcount = GetWBack((char *)buffer, size);
   size -= m_stream->m_lastcount;
   if (size == 0)


@@ -319,7 +337,10 @@ size_t wxStreamBuffer::Read(wxStreamBuffer *s_buf)
   char buf[BUF_TEMP_SIZE];
   size_t s = 0, bytes_read = BUF_TEMP_SIZE;
 
   char buf[BUF_TEMP_SIZE];
   size_t s = 0, bytes_read = BUF_TEMP_SIZE;
 

-  while (bytes_read == BUF_TEMP_SIZE) {
+  if (m_mode == write)
+    return 0;
+
+  while (bytes_read != 0) {

     bytes_read = Read(buf, bytes_read);
     bytes_read = s_buf->Write(buf, bytes_read);
     s += bytes_read;
     bytes_read = Read(buf, bytes_read);
     bytes_read = s_buf->Write(buf, bytes_read);
     s += bytes_read;


@@ -331,10 +352,14 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size)
 {
   wxASSERT(m_stream != NULL);
 
 {
   wxASSERT(m_stream != NULL);
 

+  if (m_mode == read)
+    return 0;
+

   // ------------------
   // Buffering disabled
   // ------------------
 
   // ------------------
   // Buffering disabled
   // ------------------
 

+  m_stream->m_lasterror = wxStream_NOERROR;

   if (!m_buffer_size)
     return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));
 
   if (!m_buffer_size)
     return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));
 


@@ -374,15 +399,16 @@ 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_size;
+  size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;
+
+  if (m_mode == read)
+    return 0;

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

-    s_size = (sbuf->GetDataLeft() < GetDataLeft()) ? sbuf->GetDataLeft() : GetDataLeft();
-    if (s_size < bytes_count)
-      bytes_count = s_size;
-    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;


@@ -726,7 +752,12 @@ wxOutputStream& wxOutputStream::operator<<(const char *string)
 
 wxOutputStream& wxOutputStream::operator<<(wxString& string)
 {
 
 wxOutputStream& wxOutputStream::operator<<(wxString& string)
 {

+#if wxUSE_UNICODE
+  const wxWX2MBbuf buf = string.mb_str();
+  return *this << buf;
+#else

   return Write(string, string.Len());
   return Write(string, string.Len());

+#endif

 }
 
 wxOutputStream& wxOutputStream::operator<<(char c)
 }
 
 wxOutputStream& wxOutputStream::operator<<(char c)


@@ -738,32 +769,32 @@ wxOutputStream& wxOutputStream::operator<<(short i)
 {
   wxString strint;
 
 {
   wxString strint;
 

-  strint.Printf("%i", i);
-  return Write(strint, strint.Len());
+  strint.Printf(_T("%i"), i);
+  return *this << strint;

 }
 
 wxOutputStream& wxOutputStream::operator<<(int i)
 {
   wxString strint;
 
 }
 
 wxOutputStream& wxOutputStream::operator<<(int i)
 {
   wxString strint;
 

-  strint.Printf("%i", i);
-  return Write(strint, strint.Len());
+  strint.Printf(_T("%i"), i);
+  return *this << strint;

 }
 
 wxOutputStream& wxOutputStream::operator<<(long i)
 {
   wxString strlong;
 
 }
 
 wxOutputStream& wxOutputStream::operator<<(long i)
 {
   wxString strlong;
 

-  strlong.Printf("%i", i);
-  return Write((const char *)strlong, strlong.Len());
+  strlong.Printf(_T("%i"), i);
+  return *this << strlong;

 }
 
 wxOutputStream& wxOutputStream::operator<<(double f)
 {
   wxString strfloat;
 
 }
 
 wxOutputStream& wxOutputStream::operator<<(double f)
 {
   wxString strfloat;
 

-  strfloat.Printf("%f", f);
-  return Write(strfloat, strfloat.Len());
+  strfloat.Printf(_T("%f"), f);
+  return *this << strfloat;

 }
 
 #if wxUSE_SERIAL
 }
 
 #if wxUSE_SERIAL