#pragma hdrstop
#endif
+#define BUF_TEMP_SIZE 10000
+
// ----------------------------------------------------------------------------
// 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_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
- m_mode(mode), m_destroybuf(FALSE)
+ 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_buffer_size(0), m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
- m_mode(mode), m_destroybuf(FALSE)
+ 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();
}
wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
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;
}
wxStreamBuffer::~wxStreamBuffer()
{
+ if (m_wback)
+ free(m_wback);
if (m_destroybuf)
wxDELETEA(m_buffer_start);
+ if (m_destroystream)
+ delete m_stream;
}
-bool wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
+size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
{
char *ptrback;
+ if (m_mode != read)
+ return 0;
+
ptrback = AllocSpaceWBack(bufsize);
if (!ptrback)
- return FALSE;
+ return 0;
memcpy(ptrback, buf, bufsize);
- return TRUE;
+ return bufsize;
}
bool wxStreamBuffer::WriteBack(char c)
{
char *b_start;
- wxDELETE(m_buffer_start);
+ if (m_destroybuf)
+ wxDELETEA(m_buffer_start);
if (!bufsize) {
m_buffer_start = NULL;
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 (!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)
return;
}
- if (!GetDataLeft() && !FlushBuffer())
+ if (GetDataLeft() == 0 && !FlushBuffer()) {
+ CHECK_ERROR(wxStream_WRITE_ERR);
return;
+ }
PutToBuffer(&c, 1);
m_stream->m_lastcount = 1;
return c;
}
- if (!GetDataLeft() && !FillBuffer())
+ if (!GetDataLeft()) {
+ CHECK_ERROR(wxStream_READ_ERR);
return 0;
+ }
GetFromBuffer(&c, 1);
m_stream->m_lastcount = 1;
return c;
}
-void wxStreamBuffer::Read(void *buffer, size_t size)
+size_t wxStreamBuffer::Read(void *buffer, size_t size)
{
wxASSERT(m_stream != NULL);
+ if (m_mode == write)
+ return 0;
+
// ------------------
// Buffering disabled
// ------------------
+ m_stream->m_lasterror = wxStream_NOERROR;
m_stream->m_lastcount = GetWBack((char *)buffer, size);
size -= m_stream->m_lastcount;
if (size == 0)
- return;
+ return m_stream->m_lastcount;
buffer = (void *)((char *)buffer+m_stream->m_lastcount);
- if (!m_buffer_size) {
- m_stream->m_lastcount += m_stream->OnSysRead(buffer, size);
- return;
- }
+ if (!m_buffer_size)
+ return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));
// -----------------
// Buffering enabled
buffer = (char *)buffer + buf_left; // ANSI C++ violation.
if (!FillBuffer()) {
- m_stream->m_lastcount = orig_size-size;
- return;
+ CHECK_ERROR(wxStream_READ_ERR);
+ return (m_stream->m_lastcount = orig_size-size);
}
} else {
break;
}
}
- m_stream->m_lastcount += orig_size;
+ return (m_stream->m_lastcount += orig_size);
}
-void wxStreamBuffer::Write(const void *buffer, size_t size)
+size_t wxStreamBuffer::Read(wxStreamBuffer *s_buf)
+{
+ char buf[BUF_TEMP_SIZE];
+ size_t s = 0, bytes_read = BUF_TEMP_SIZE;
+
+ if (m_mode == write)
+ return 0;
+
+ while (bytes_read == BUF_TEMP_SIZE) {
+ bytes_read = Read(buf, bytes_read);
+ bytes_read = s_buf->Write(buf, bytes_read);
+ s += bytes_read;
+ }
+ return s;
+}
+
+size_t wxStreamBuffer::Write(const void *buffer, size_t size)
{
wxASSERT(m_stream != NULL);
+ if (m_mode == read)
+ return 0;
+
// ------------------
// Buffering disabled
// ------------------
- if (!m_buffer_size) {
- m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size);
- return;
- }
+ m_stream->m_lasterror = wxStream_NOERROR;
+ if (!m_buffer_size)
+ return (m_stream->m_lastcount = m_stream->OnSysWrite(buffer, size));
// ------------------
// Buffering enabled
buffer = (char *)buffer + buf_left; // ANSI C++ violation.
if (!FlushBuffer()) {
- m_stream->m_lastcount = orig_size-size;
- return;
+ CHECK_ERROR(wxStream_WRITE_ERR);
+ return (m_stream->m_lastcount = orig_size-size);
}
+
m_buffer_pos = m_buffer_start;
} else {
break;
}
}
- m_stream->m_lastcount = orig_size;
+ return (m_stream->m_lastcount = orig_size);
+}
+
+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;
+
+ 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;
}
off_t wxStreamBuffer::Seek(off_t pos, wxSeekMode mode)
last_access = GetLastAccess();
- if (m_fixed) {
+ if (!m_flushable) {
diff = pos + GetIntPosition();
if (diff < 0 || diff > last_access)
return wxInvalidOffset;
{
off_t pos;
- if (!m_fixed) {
+ if (m_flushable) {
pos = m_stream->OnSysTell();
if (pos == wxInvalidOffset)
return wxInvalidOffset;
return GetIntPosition();
}
-size_t wxStreamBuffer::GetDataLeft() const
+size_t wxStreamBuffer::GetDataLeft()
{
+ if (m_buffer_end == m_buffer_pos && m_flushable)
+ FillBuffer();
return m_buffer_end-m_buffer_pos;
}
{
}
-size_t wxStreamBase::OnSysRead(void *buffer, size_t size)
+size_t wxStreamBase::OnSysRead(void *WXUNUSED(buffer), size_t WXUNUSED(size))
{
return 0;
}
-size_t wxStreamBase::OnSysWrite(const void *buffer, size_t bufsize)
+size_t wxStreamBase::OnSysWrite(const void *WXUNUSED(buffer), size_t WXUNUSED(bufsize))
{
return 0;
}
-off_t wxStreamBase::OnSysSeek(off_t seek, wxSeekMode mode)
+off_t wxStreamBase::OnSysSeek(off_t WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
{
return wxInvalidOffset;
}
char wxInputStream::Peek()
{
- if (!m_i_streambuf->GetDataLeft())
- m_i_streambuf->FillBuffer();
+ m_i_streambuf->GetDataLeft();
return *(m_i_streambuf->GetBufferPos());
}
-#define BUF_TEMP_SIZE 10000
wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
{
char buf[BUF_TEMP_SIZE];
size_t bytes_read = BUF_TEMP_SIZE;
- while (bytes_read == BUF_TEMP_SIZE && stream_out.LastError() != wxStream_NOERROR) {
+ while (bytes_read == BUF_TEMP_SIZE) {
bytes_read = Read(buf, bytes_read).LastRead();
-
- stream_out.Write(buf, bytes_read);
+ bytes_read = stream_out.Write(buf, bytes_read).LastWrite();
}
return *this;
}
wxOutputStream& wxOutputStream::operator<<(wxString& string)
{
+#if wxUSE_UNICODE
+ const wxWX2MBbuf buf = string.mb_str();
+ return *this << buf;
+#else
return Write(string, string.Len());
+#endif
}
wxOutputStream& wxOutputStream::operator<<(char c)
{
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;
- strint.Printf("%i", i);
- return Write(strint, strint.Len());
+ strint.Printf(_T("%i"), i);
+ return *this << strint;
}
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;
- strfloat.Printf("%f", f);
- return Write(strfloat, strfloat.Len());
+ strfloat.Printf(_T("%f"), f);
+ return *this << strfloat;
}
#if wxUSE_SERIAL
projects / wxWidgets.git / blobdiff