X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcc6dddd1f1da49f94767ff148eaa3f1d3ca9367..cc1487e53905bd534dba2099d33ac2142cec7818:/src/common/sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 9224fe1765..8b16fcca90 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sckstrm.h
+// Name:        src/common/sckstrm.cpp
 // Purpose:     wxSocket*Stream
 // Author:      Guilhem Lavaux
 // Modified by:
@@ -8,23 +8,23 @@
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "sckstrm.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+
+#include "wx/sckstrm.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/stream.h"
 #endif
 
-#include "wx/stream.h"
 #include "wx/socket.h"
-#include "wx/sckstrm.h"
 
 // ---------------------------------------------------------------------------
 // wxSocketOutputStream
@@ -39,10 +39,30 @@ wxSocketOutputStream::~wxSocketOutputStream()
 {
 }
 
-wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-  m_o_socket->Write((const char *)buffer, size);
-  return *this;
+    const char *buf = (const char *)buffer;
+    size_t count = 0;
+
+    while ( count < size && m_o_socket->WaitForWrite() )
+    {
+        const size_t ret = m_o_socket->Write(buf, size - count).LastCount();
+
+        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;
 }
 
 // ---------------------------------------------------------------------------
@@ -58,21 +78,44 @@ wxSocketInputStream::~wxSocketInputStream()
 {
 }
 
-wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
+size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-  m_i_socket->Read((char *)buffer, size);
-  return *this;
+    char *buf = (char *)buffer;
+    size_t count = 0;
+
+    while ( count < size && m_i_socket->WaitForRead() )
+    {
+        const size_t ret = m_i_socket->Read(buf, size - count).LastCount();
+
+        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;
 }
 
 // ---------------------------------------------------------------------------
-// wxSocketStream (IO)
+// wxSocketStream
 // ---------------------------------------------------------------------------
-wxSocketStream::wxSocketStream(wxSocketBase& i_s, wxSocketBase& o_s)
-  : wxSocketInputStream(i_s), wxSocketOutputStream(o_s)
-{
-}
 
 wxSocketStream::wxSocketStream(wxSocketBase& s)
   : wxSocketInputStream(s), wxSocketOutputStream(s)
 {
 }
+
+wxSocketStream::~wxSocketStream()
+{
+}
+
+#endif
+  // wxUSE_STREAMS && wxUSE_SOCKETS