X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3883022093c42e3fb7b248ea2cb4bbd1e056a75b..28be2e8a170979d476a5ea4f585505b8a2f5af27:/src/common/stream.cpp?ds=sidebyside diff --git a/src/common/stream.cpp b/src/common/stream.cpp index b054abb9f7..310f1ee7e0 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -27,9 +27,9 @@ #if wxUSE_STREAMS #include -#include -#include -#include +#include "wx/stream.h" +#include "wx/datstrm.h" +#include "wx/objstrm.h" #define BUF_TEMP_SIZE 10000 @@ -43,16 +43,14 @@ 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_buffer_size(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_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0), - m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL), + m_buffer_size(0), m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL), m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE) { m_stream = new wxStreamBase(); @@ -70,48 +68,16 @@ wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer) m_mode = buffer.m_mode; m_destroybuf = FALSE; m_destroystream = FALSE; - m_wback = NULL; - m_wbacksize = 0; - m_wbackcur = 0; } wxStreamBuffer::~wxStreamBuffer() { - if (m_wback) - free(m_wback); if (m_destroybuf) wxDELETEA(m_buffer_start); if (m_destroystream) delete m_stream; } -size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize) -{ - char *ptrback; - - if (m_mode != read) - return 0; - - ptrback = AllocSpaceWBack(bufsize); - if (!ptrback) - return 0; - - memcpy(ptrback, buf, bufsize); - return bufsize; -} - -bool wxStreamBuffer::WriteBack(char c) -{ - char *ptrback; - - ptrback = AllocSpaceWBack(1); - if (!ptrback) - return FALSE; - - *ptrback = c; - return TRUE; -} - void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end) { if (m_destroybuf) @@ -132,9 +98,9 @@ void wxStreamBuffer::SetBufferIO(size_t bufsize) wxDELETEA(m_buffer_start); if (!bufsize) { - m_buffer_start = NULL; - m_buffer_end = NULL; - m_buffer_pos = NULL; + m_buffer_start = (char*)NULL; + m_buffer_end = (char*)NULL; + m_buffer_pos = (char*)NULL; m_buffer_size = 0; return; } @@ -148,50 +114,12 @@ void wxStreamBuffer::ResetBuffer() { m_stream->m_lasterror = wxStream_NOERROR; m_stream->m_lastcount = 0; - if (m_mode == read) + if (m_mode == read && m_flushable) m_buffer_pos = m_buffer_end; else m_buffer_pos = m_buffer_start; } -char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size) -{ - char *temp_b; - - m_wbacksize += needed_size; - - if (!m_wback) - temp_b = (char *)malloc(m_wbacksize); - else - temp_b = (char *)realloc(m_wback, m_wbacksize); - - if (!temp_b) - return NULL; - m_wback = temp_b; - - 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; - - if (bsize < s_toget) - s_toget = bsize; - - memcpy(buf, (m_wback+m_wbackcur), s_toget); - - 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; -} - bool wxStreamBuffer::FillBuffer() { size_t count; @@ -237,10 +165,17 @@ void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size) size_t s_toput = m_buffer_end-m_buffer_pos; 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; + if (!m_buffer_start) + SetBufferIO(size); + else { + size_t delta = m_buffer_pos-m_buffer_start; + + m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size+size); + m_buffer_pos = m_buffer_start + delta; + // I round a bit + m_buffer_size += size; + m_buffer_end = m_buffer_start+m_buffer_size; + } s_toput = size; } if (s_toput > size) @@ -267,6 +202,23 @@ void wxStreamBuffer::PutChar(char c) m_stream->m_lastcount = 1; } +char wxStreamBuffer::Peek() +{ + char c; + + wxASSERT(m_stream != NULL && m_buffer_size != 0); + + if (!GetDataLeft()) { + CHECK_ERROR(wxStream_READ_ERR); + return 0; + } + + GetFromBuffer(&c, 1); + m_buffer_pos--; + + return c; +} + char wxStreamBuffer::GetChar() { char c; @@ -284,6 +236,7 @@ char wxStreamBuffer::GetChar() } GetFromBuffer(&c, 1); + m_stream->m_lastcount = 1; return c; } @@ -300,13 +253,6 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size) // ------------------ 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; - - buffer = (void *)((char *)buffer+m_stream->m_lastcount); - if (!m_buffer_size) return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size)); @@ -316,7 +262,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size) size_t buf_left, orig_size = size; while (size > 0) { - buf_left = GetDataLeft(); + buf_left = GetDataLeft(); // First case: the requested buffer is larger than the stream buffer, // we split it. @@ -326,7 +272,7 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size) buffer = (char *)buffer + buf_left; // ANSI C++ violation. if (!FillBuffer()) { - CHECK_ERROR(wxStream_READ_ERR); + CHECK_ERROR(wxStream_EOF); return (m_stream->m_lastcount = orig_size-size); } } else { @@ -367,7 +313,7 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size) // ------------------ m_stream->m_lasterror = wxStream_NOERROR; - if (!m_buffer_size) + if (!m_buffer_size && m_fixed) return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size)); // ------------------ @@ -381,7 +327,9 @@ size_t wxStreamBuffer::Write(const void *buffer, size_t size) // First case: the buffer to write is larger than the stream buffer, // we split it - if (size > buf_left) { + // NB: If stream buffer isn't fixed (as for wxMemoryOutputStream), + // we always go to the second case. + if (size > buf_left && m_fixed) { PutToBuffer(buffer, buf_left); size -= buf_left; buffer = (char *)buffer + buf_left; // ANSI C++ violation. @@ -407,15 +355,18 @@ size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf) { char buf[BUF_TEMP_SIZE]; size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2; + wxInputStream *in_stream; if (m_mode == read) return 0; + in_stream = (wxInputStream *)sbuf->Stream(); + 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); + in_stream->Ungetch(buf+bytes_count, b_count2-bytes_count); s += bytes_count; } return s; @@ -428,7 +379,12 @@ off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode) last_access = GetLastAccess(); if (!m_flushable) { - diff = pos + GetIntPosition(); + switch (mode) { + case wxFromStart: diff = pos; break; + case wxFromCurrent: diff = pos + GetIntPosition(); break; + case wxFromEnd: diff = pos + last_access; break; + default: return wxInvalidOffset; + } if (diff < 0 || diff > last_access) return wxInvalidOffset; SetIntPosition(diff); @@ -446,7 +402,9 @@ off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode) diff = pos + GetIntPosition(); if ( (diff > last_access) || (diff < 0) ) { - ret_off = m_stream->OnSysSeek(pos, wxFromCurrent); + // 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 { @@ -465,22 +423,25 @@ off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode) off_t wxStreamBuffer::Tell() const { - off_t pos; - - if (m_flushable) { - pos = m_stream->OnSysTell(); + off_t pos = m_stream->OnSysTell(); if (pos == wxInvalidOffset) - return wxInvalidOffset; - return pos - GetLastAccess() + GetIntPosition(); - } else - return GetIntPosition(); + return wxInvalidOffset; + + pos += GetIntPosition(); + + if (m_mode == read && m_flushable) + pos -= GetLastAccess(); + + return pos; } size_t wxStreamBuffer::GetDataLeft() { - if (m_buffer_end == m_buffer_pos && m_flushable) - FillBuffer(); - return m_buffer_end-m_buffer_pos; + /* Why is this done? RR. */ + if (m_buffer_end == m_buffer_pos && m_flushable) + FillBuffer(); + + return m_buffer_end-m_buffer_pos; } // ---------------------------------------------------------------------------- @@ -489,8 +450,8 @@ size_t wxStreamBuffer::GetDataLeft() wxStreamBase::wxStreamBase() { - m_lasterror = wxStream_NOERROR; - m_lastcount = 0; + m_lasterror = wxStream_NOERROR; + m_lastcount = 0; } wxStreamBase::~wxStreamBase() @@ -499,22 +460,22 @@ wxStreamBase::~wxStreamBase() size_t wxStreamBase::OnSysRead(void *WXUNUSED(buffer), size_t WXUNUSED(size)) { - return 0; + return 0; } size_t wxStreamBase::OnSysWrite(const void *WXUNUSED(buffer), size_t WXUNUSED(bufsize)) { - return 0; + return 0; } off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode)) { - return wxInvalidOffset; + return wxInvalidOffset; } off_t wxStreamBase::OnSysTell() const { - return wxInvalidOffset; + return wxInvalidOffset; } // ---------------------------------------------------------------------------- @@ -522,387 +483,465 @@ off_t wxStreamBase::OnSysTell() const // ---------------------------------------------------------------------------- wxInputStream::wxInputStream() - : wxStreamBase() + : wxStreamBase(), + m_wback(NULL), m_wbacksize(0), m_wbackcur(0) { - m_i_destroybuf = TRUE; - m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read); } -wxInputStream::wxInputStream(wxStreamBuffer *buffer) - : wxStreamBase() +wxInputStream::~wxInputStream() { - m_i_destroybuf = FALSE; - m_i_streambuf = buffer; + if (m_wback) + free(m_wback); } -wxInputStream::~wxInputStream() +bool wxInputStream::Eof() const { - if (m_i_destroybuf) - delete m_i_streambuf; + wxInputStream *self = (wxInputStream *)this; // const_cast + + char c; + self->Read(&c, 1); + if ( GetLastError() == wxSTREAM_EOF ) + { + return TRUE; + } + + self->Ungetch(c); + + return FALSE; +} + +char *wxInputStream::AllocSpaceWBack(size_t needed_size) +{ + /* get number of bytes left from previous wback buffer */ + size_t toget = m_wbacksize - m_wbackcur; + + /* allocate a buffer large enough to hold prev + new data */ + char *temp_b = (char *) malloc(needed_size + toget); + + if (!temp_b) + 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; + + return (char *) m_wback; +} + +size_t wxInputStream::GetWBack(char *buf, size_t bsize) +{ + size_t s_toget = m_wbacksize-m_wbackcur; + + if (!m_wback) + return 0; + + if (bsize < s_toget) + s_toget = bsize; + + memcpy(buf, (m_wback+m_wbackcur), s_toget); + + 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; +} + +size_t wxInputStream::Ungetch(const void *buf, size_t bufsize) +{ + char *ptrback = AllocSpaceWBack(bufsize); + if (!ptrback) + return 0; + + memcpy(ptrback, buf, bufsize); + return bufsize; +} + +bool wxInputStream::Ungetch(char c) +{ + char * ptrback = AllocSpaceWBack(1); + if (!ptrback) + return FALSE; + + *ptrback = c; + return TRUE; } char wxInputStream::GetC() { - char c; - m_i_streambuf->Read(&c, 1); - return c; + char c; + Read(&c, 1); + return c; } wxInputStream& wxInputStream::Read(void *buffer, size_t size) { - m_i_streambuf->Read(buffer, size); - // wxStreamBuffer sets all variables for us - return *this; + char *buf = (char *)buffer; + + size_t retsize = GetWBack(buf, size); + if (retsize == size) + { + m_lastcount = size; + m_lasterror = wxStream_NOERROR; + return *this; + } + size -= retsize; + buf += retsize; + + m_lastcount = OnSysRead(buf, size) + retsize; + return *this; } char wxInputStream::Peek() { - m_i_streambuf->GetDataLeft(); + char c; + Read(&c, 1); + if (m_lasterror == wxStream_NOERROR) + { + Ungetch(c); + return c; + } - return *(m_i_streambuf->GetBufferPos()); + return 0; } - wxInputStream& wxInputStream::Read(wxOutputStream& stream_out) { - char buf[BUF_TEMP_SIZE]; - size_t bytes_read = BUF_TEMP_SIZE; + 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(); - } - return *this; + while (bytes_read == BUF_TEMP_SIZE) + { + bytes_read = Read(buf, bytes_read).LastRead(); + bytes_read = stream_out.Write(buf, bytes_read).LastWrite(); + } + return *this; } off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode) { - return m_i_streambuf->Seek(pos, 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 = (char*) NULL; + m_wbacksize = 0; + m_wbackcur = 0; + } + + return OnSysSeek(pos, mode); } off_t wxInputStream::TellI() const { - return m_i_streambuf->Tell(); + /* 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 // -------------------- -wxInputStream& wxInputStream::operator>>(wxString& line) +#if wxUSE_SERIAL +wxInputStream& wxInputStream::operator>>(wxObject *& obj) { - wxDataInputStream s(*this); - - line = s.ReadLine(); - return *this; + wxObjectInputStream obj_s(*this); + obj = obj_s.LoadObject(); + return *this; } +#endif + -wxInputStream& wxInputStream::operator>>(char& c) +// ---------------------------------------------------------------------------- +// wxOutputStream +// ---------------------------------------------------------------------------- +wxOutputStream::wxOutputStream() + : wxStreamBase() { - c = GetC(); - return *this; } -wxInputStream& wxInputStream::operator>>(signed short& i) +wxOutputStream::~wxOutputStream() { - signed long l; - - *this >> l; - i = (signed short)l; - return *this; } -wxInputStream& wxInputStream::operator>>(signed int& i) +void wxOutputStream::PutC(char c) { - signed long l; - - *this >> l; - i = (signed int)l; - return *this; + Write((void *) &c, 1); } -wxInputStream& wxInputStream::operator>>(signed long& i) +wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size) { - /* I only implemented a simple integer parser */ - char c; - int sign; - - while (isspace( c = GetC() ) ) - /* Do nothing */ ; - - i = 0; - if (! (c == '-' || isdigit(c)) ) { - InputStreamBuffer()->WriteBack(c); + m_lastcount = OnSysWrite(buffer, size); return *this; - } - - if (c == '-') { - sign = -1; - c = GetC(); - } else - sign = 1; - - while (isdigit(c)) { - i = i*10 + c; - c = GetC(); - } - - i *= sign; - - return *this; } -wxInputStream& wxInputStream::operator>>(unsigned short& i) +wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in) { - unsigned long l; - - *this >> l; - i = (unsigned short)l; - return *this; + stream_in.Read(*this); + return *this; } -wxInputStream& wxInputStream::operator>>(unsigned int& i) +off_t wxOutputStream::TellO() const { - unsigned long l; - - *this >> l; - i = (unsigned int)l; - return *this; + return OnSysTell(); } -wxInputStream& wxInputStream::operator>>(unsigned long& i) +off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode) { - /* I only implemented a simple integer parser */ - char c; + return OnSysSeek(pos, mode); +} - while (isspace( c = GetC() ) ) - /* Do nothing */ ; +void wxOutputStream::Sync() +{ +} - i = 0; - if (!isdigit(c)) { - InputStreamBuffer()->WriteBack(c); +#if wxUSE_SERIAL +wxOutputStream& wxOutputStream::operator<<(wxObject& obj) +{ + wxObjectOutputStream obj_s(*this); + obj_s.SaveObject(obj); return *this; - } +} +#endif - while (isdigit(c)) { - i = i*10 + c; - c = GetC(); - } +// ---------------------------------------------------------------------------- +// wxCountingOutputStream +// ---------------------------------------------------------------------------- - return *this; +wxCountingOutputStream::wxCountingOutputStream () + : wxOutputStream() +{ + m_currentPos = 0; } -wxInputStream& wxInputStream::operator>>(double& f) +size_t wxCountingOutputStream::GetSize() const { - /* I only implemented a simple float parser */ - int c, sign; - - while (isspace( c = GetC() ) ) - /* Do nothing */ ; - - 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 - '0'); - c = GetC(); - } + return m_lastcount; +} - if (c == '.') { - double f_multiplicator = (double) 0.1; - c = GetC(); +size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer), size_t size) +{ + m_currentPos += size; + if (m_currentPos > m_lastcount) m_lastcount = m_currentPos; + return m_currentPos; +} - while (isdigit(c)) { - f += (c-'0')*f_multiplicator; - f_multiplicator /= 10; - c = GetC(); - } - } +off_t wxCountingOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) +{ + if (mode == wxFromStart) + m_currentPos = pos; + if (mode == wxFromEnd) + m_currentPos = m_lastcount + pos; + else + m_currentPos += pos; - 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() + : wxInputStream() { - m_o_destroybuf = TRUE; - m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write); } -wxOutputStream::wxOutputStream(wxStreamBuffer *buffer) - : wxStreamBase() +wxFilterInputStream::wxFilterInputStream(wxInputStream& stream) + : wxInputStream() { - 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() + : wxOutputStream() { - m_o_streambuf->Write(buffer, size); - return *this; } -wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in) +wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream) + : wxOutputStream() { - 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) + : wxFilterInputStream(s) { - return m_o_streambuf->Seek(pos, mode); + m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read); + m_i_streambuf->SetBufferIO(1024); } -void wxOutputStream::Sync() +wxBufferedInputStream::~wxBufferedInputStream() { - m_o_streambuf->FlushBuffer(); + off_t unused_bytes=m_i_streambuf->GetBufferPos()-m_i_streambuf->GetBufferEnd(); + m_parent_i_stream->SeekI(unused_bytes,wxFromCurrent); + + delete m_i_streambuf; } -wxOutputStream& wxOutputStream::operator<<(const char *string) +char wxBufferedInputStream::Peek() { - return Write(string, strlen(string)); + return m_i_streambuf->Peek(); } -wxOutputStream& wxOutputStream::operator<<(wxString& string) +wxInputStream& wxBufferedInputStream::Read(void *buffer, size_t size) { -#if wxUSE_UNICODE - const wxWX2MBbuf buf = string.mb_str(); - return *this << buf; -#else - return Write(string, string.Len()); -#endif + size_t retsize; + char *buf = (char *)buffer; + + retsize = GetWBack(buf, size); + m_lastcount = retsize; + if (retsize == size) + { + m_lasterror = wxStream_NOERROR; + return *this; + } + size -= retsize; + buf += retsize; + + m_i_streambuf->Read(buf, size); + + return *this; } -wxOutputStream& wxOutputStream::operator<<(char c) +off_t wxBufferedInputStream::SeekI(off_t pos, wxSeekMode mode) { - return Write(&c, 1); + return m_i_streambuf->Seek(pos, mode); } -wxOutputStream& wxOutputStream::operator<<(signed short i) +off_t wxBufferedInputStream::TellI() const { - signed long l = (signed long)i; - return *this << l; + return m_i_streambuf->Tell(); } -wxOutputStream& wxOutputStream::operator<<(signed int 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 long i) +off_t wxBufferedInputStream::OnSysSeek(off_t seek, wxSeekMode mode) { - wxString strlong; - strlong.Printf(_T("%ld"), i); - return *this << strlong; + return m_parent_i_stream->SeekI(seek, mode); } -wxOutputStream& wxOutputStream::operator<<(unsigned short i) +off_t wxBufferedInputStream::OnSysTell() const { - unsigned long l = (unsigned long)i; - return *this << l; + return m_parent_i_stream->TellI(); } -wxOutputStream& wxOutputStream::operator<<(unsigned int i) + +// ---------------------------------------------------------------------------- +// wxBufferedOutputStream +// ---------------------------------------------------------------------------- + +wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s) + : wxFilterOutputStream(s) { - unsigned long l = (unsigned long)i; - return *this << l; + 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; - - strfloat.Printf(_T("%f"), f); - return *this << strfloat; + m_lastcount = 0; + m_o_streambuf->Write(buffer, size); + return *this; } -#if wxUSE_SERIAL -wxOutputStream& wxOutputStream::operator<<(wxObject& obj) +off_t wxBufferedOutputStream::SeekO(off_t pos, wxSeekMode mode) { - wxObjectOutputStream obj_s(*this); - obj_s.SaveObject(obj); - return *this; + Sync(); + return m_o_streambuf->Seek(pos, mode); } -#endif -// ---------------------------------------------------------------------------- -// wxFilterInputStream -// ---------------------------------------------------------------------------- -wxFilterInputStream::wxFilterInputStream() - : wxInputStream(NULL) +off_t wxBufferedOutputStream::TellO() const { - // WARNING streambuf set to NULL ! + return m_o_streambuf->Tell(); } -wxFilterInputStream::wxFilterInputStream(wxInputStream& stream) - : wxInputStream(stream.InputStreamBuffer()) +void wxBufferedOutputStream::Sync() { - m_parent_i_stream = &stream; + m_o_streambuf->FlushBuffer(); + m_parent_o_stream->Sync(); } -wxFilterInputStream::~wxFilterInputStream() +size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize) { + return m_parent_o_stream->Write(buffer, bufsize).LastWrite(); } -// ---------------------------------------------------------------------------- -// wxFilterOutputStream -// ---------------------------------------------------------------------------- -wxFilterOutputStream::wxFilterOutputStream() - : wxOutputStream(NULL) +off_t wxBufferedOutputStream::OnSysSeek(off_t seek, wxSeekMode mode) { + return m_parent_o_stream->SeekO(seek, mode); } -wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream) - : wxOutputStream(stream.OutputStreamBuffer()) +off_t wxBufferedOutputStream::OnSysTell() const { - m_parent_o_stream = &stream; + return m_parent_o_stream->TellO(); } -wxFilterOutputStream::~wxFilterOutputStream() +size_t wxBufferedOutputStream::GetSize() const { + return m_parent_o_stream->GetSize() + m_o_streambuf->GetIntPosition(); } // ---------------------------------------------------------------------------- @@ -913,9 +952,13 @@ 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