fixes for new lib dirs for wxMSW

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 21df7e8997284e0fed06df95342a78d3e5cd476c..8d83bc6dbbde786c0f7bdeec26ad3f469b1edc60 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -6,25 +6,27 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "protocol.h"
 #endif
 
-#ifdef WXPREC
-#include <wx/wxprec.h>
-#else
-#include <wx/wx.h>
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
 #endif
 
+#if wxUSE_PROTOCOL
+
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
+#include "wx/module.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include <stdlib.h>
 
 /////////////////////////////////////////////////////////////////
 // wxProtoInfo
@@ -36,74 +38,143 @@
  * --------------------------------------------------------------
  */
 
-wxProtoInfo::wxProtoInfo(const char *name, const char *serv,
+wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
+           : m_protoname(name),
+             m_servname(serv)
 {
-  m_protoname = name;
-  m_servname = serv;
-  m_cinfo = info;
-  m_needhost = need_host1;
-  next = wxURL::g_protocols;
-  wxURL::g_protocols = this;
+    m_cinfo = info;
+    m_needhost = need_host1;
+    next = wxURL::ms_protocols;
+    wxURL::ms_protocols = this;
 }
 
 /////////////////////////////////////////////////////////////////
 // wxProtocol ///////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
+#if wxUSE_SOCKETS
 IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject)
+#endif
 
 wxProtocol::wxProtocol()
+#if wxUSE_SOCKETS
  : wxSocketClient()
+#endif
 {
 }
 
+#if wxUSE_SOCKETS
 bool wxProtocol::Reconnect()
 {
-  wxIPV4address addr;
-
-  if (!GetPeer(addr)) {
-    Close();
-    return FALSE;
-  }
-  if (!Close())
-    return FALSE;
-  if (!Connect(addr))
-    return FALSE;
-  return TRUE;
-}
+    wxIPV4address addr;
 
-wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
-#define PROTO_BSIZE 2048
-  size_t avail, size;
-  char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
-  char *ret;
-  bool found;
+    if (!GetPeer(addr))
+    {
+        Close();
+        return FALSE;
+    }
 
-  avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
-  if (sock->LastError() != 0 || avail == 0)
-    return wxPROTO_NETERR;
+    if (!Close())
+        return FALSE;
+        
+    if (!Connect(addr))
+        return FALSE;
 
-  memcpy(tmp_str, tmp_buf, avail);
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// Read a line from socket
+// ----------------------------------------------------------------------------
+
+// TODO ReadLine() should use buffers private to wxProtocol for efficiency!
 
-// Not implemented on all systems
-// ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
-  found = FALSE;
-  for (ret=tmp_str;ret < (tmp_str+avail); ret++)
-     if (*ret == '\n') {
-       found = TRUE;
-       break;
-     }
+// static
+wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
+{
+    result.Empty();
+    char ch, chLast = '\0';
+    while ( !socket->Read(&ch, sizeof(ch)).Error() )
+    {
+        switch ( ch )
+        {
+            case '\r':
+                // remember it, if the following is '\n', we're done
+                chLast = '\r';
+                break;
+
+            case '\n':
+                // only ends line if the previous character was '\r'
+                if ( chLast == '\r' )
+                {
+                    // EOL found
+                    return wxPROTO_NOERR;
+                }
+                //else: fall through
+
+            default:
+                // normal char
+                if ( chLast )
+                {
+                    result += wxString::FromAscii( chLast );
+                    chLast = '\0';
+                }
+
+                result += wxString::FromAscii( ch );
+        }
+    }
 
-  if (!found)
-    return wxPROTO_PROTERR;
-  *ret = 0;
+    return wxPROTO_NETERR;
+}
 
-  result = tmp_str;
-  result = result.Left(result.Length()-1);
+wxProtocolError wxProtocol::ReadLine(wxString& result)
+{
+    return ReadLine(this, result);
+}
 
-  size = ret-tmp_str+1;
-  sock->CreatePushbackBefore(&tmp_buf[size], avail-size);
-  return wxPROTO_NOERR;
+// old function which only chops '\n' and not '\r\n'
+wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
+{
+#define PROTO_BSIZE 2048
+    size_t avail, size;
+    char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
+    char *ret;
+    bool found;
+
+    avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
+    if (sock->Error() || avail == 0)
+        return wxPROTO_NETERR;
+
+    memcpy(tmp_str, tmp_buf, avail);
+
+    // Not implemented on all systems
+    // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
+    found = FALSE;
+    for (ret=tmp_str;ret < (tmp_str+avail); ret++)
+        if (*ret == '\n') 
+        {
+            found = TRUE;
+            break;
+        }
+
+    if (!found)
+        return wxPROTO_PROTERR;
+        
+    *ret = 0;
+
+    result = wxString::FromAscii( tmp_str );
+    result = result.Left(result.Length()-1);
+
+    size = ret-tmp_str+1;
+    sock->Unread(&tmp_buf[size], avail-size);
+  
+    return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
+#endif // wxUSE_SOCKETS
+
+#endif // wxUSE_PROTOCOL
+