AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow partial read/writes (patch 1476893)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-05-28 17:27:40 +00:00
parent e978011a40
commit 2f0add5ae0
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/common/sckstrm.cpp
View File

@ -41,11 +41,28 @@ wxSocketOutputStream::~wxSocketOutputStream()
size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
{
size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
const char *buf = (const char *)buffer;
size_t count = 0;
m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
while ( count < size && m_o_socket->WaitForWrite() )
{
const size_t ret = m_o_socket->Write(buf, size - count).LastCount();
return ret;
buf += ret;
count += ret;
if ( m_o_socket->Error() )
{
if (m_o_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
m_lasterror = wxSTREAM_WRITE_ERROR;
return count;
}
}
}
m_lasterror = wxSTREAM_NO_ERROR;
return count;
}
// ---------------------------------------------------------------------------
@ -63,11 +80,28 @@ wxSocketInputStream::~wxSocketInputStream()
size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
{
size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
char *buf = (char *)buffer;
size_t count = 0;
m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
while ( count < size && m_i_socket->WaitForRead() )
{
const size_t ret = m_i_socket->Read(buf, size - count).LastCount();
return ret;
buf += ret;
count += ret;
if ( m_i_socket->Error() )
{
if (m_i_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
m_lasterror = wxSTREAM_READ_ERROR;
return count;
}
}
}
m_lasterror = wxSTREAM_NO_ERROR;
return count;
}
// ---------------------------------------------------------------------------