unused parameter warnings suppressed

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 0489da90d90d7942af73d1037c82812064bbd102..6c735d5599757c85ffe63825733bf0ff1ad0cef2 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -20,19 +20,13 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif
-

 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-// wxWindows headers

 #include <wx/string.h>
 #include <wx/list.h>
 #include <wx/utils.h>
 #include <wx/string.h>
 #include <wx/list.h>
 #include <wx/utils.h>

-
-// wxSocket header
-#include "wx/url.h"
+#include <wx/url.h>

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)


@@ -41,64 +35,86 @@ IMPLEMENT_CLASS(wxURL, wxObject)
 
 // Protocols list
 wxProtoInfo *wxURL::g_protocols = NULL;
 
 // Protocols list
 wxProtoInfo *wxURL::g_protocols = NULL;

-wxHTTP wxURL::g_proxy;

 
 

-/////////////////////////////////////////////////////////////////
-// wxURL ////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
+#if wxUSE_SOCKETS
+wxHTTP *wxURL::g_proxy = NULL;
+#endif
+
+// --------------------------------------------------------------
+// wxURL
+// --------------------------------------------------------------

 
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// --------------------------------------------------------------

 
 wxURL::wxURL(const wxString& url)
 {
   m_protocol = NULL;
 
 wxURL::wxURL(const wxString& url)
 {
   m_protocol = NULL;

-  if (g_proxy.IsConnected()) {
-    m_protocol = &g_proxy;
-    m_protoname = "proxy";
-    m_path = url;
-    return;
-  }
-  m_url = url;

   m_error = wxURL_NOERR;
   m_error = wxURL_NOERR;

+  m_url = url;
+#if wxUSE_SOCKETS
+  m_useProxy = (g_proxy != NULL);
+  m_proxy = g_proxy;
+#endif
+  ParseURL();

 }
 
 bool wxURL::ParseURL()
 {
   wxString last_url = m_url;
 
 }
 
 bool wxURL::ParseURL()
 {
   wxString last_url = m_url;
 

-  // Clean up
-  CleanData();
+ // If the URL was already parsed (so m_protocol != NULL), we pass this section.
+  if (!m_protocol) {

 
 

-  // Extract protocol name
-  if (!PrepProto(last_url)) {
-    m_error = wxURL_SNTXERR;
-    return FALSE;
-  }
+    // Clean up
+    CleanData();

 
 

-  // Find and create the protocol object
-  if (!FetchProtocol()) {
-    m_error = wxURL_NOPROTO;
-    return FALSE;
-  }
-
-  // Do we need a host name ?
-  if (m_protoinfo->m_needhost) {
-    // Extract it
-    if (!PrepHost(last_url)) {
+    // Extract protocol name
+    if (!PrepProto(last_url)) {

       m_error = wxURL_SNTXERR;
       return FALSE;
     }
       m_error = wxURL_SNTXERR;
       return FALSE;
     }

+
+    // Find and create the protocol object
+    if (!FetchProtocol()) {
+      m_error = wxURL_NOPROTO;
+      return FALSE;
+    }
+
+    // Do we need a host name ?
+    if (m_protoinfo->m_needhost) {
+      // Extract it
+      if (!PrepHost(last_url)) {
+        m_error = wxURL_SNTXERR;
+        return FALSE;
+      }
+    }
+
+    // Extract full path
+    if (!PrepPath(last_url)) {
+      m_error = wxURL_NOPATH;
+      return FALSE;
+    }

   }
   }

+  // URL parse finished.

 
 

-  // Extract full path
-  if (!PrepPath(last_url)) {
-    m_error = wxURL_NOPATH;
-    return FALSE;
+#if wxUSE_SOCKETS
+  if (m_useProxy) {
+    // We destroy the newly created protocol.
+    CleanData();
+
+    // Third, we rebuild the URL.
+    m_url = m_protoname + _T(":");
+    if (m_protoinfo->m_needhost)
+      m_url = m_url + _T("//") + m_hostname;
+
+    m_url += m_path;
+
+    // We initialize specific variables.
+    m_protocol = m_proxy; // FIXME: we should clone the protocol

   }
   }

+#endif

 
   m_error = wxURL_NOERR;
   return TRUE;
 
   m_error = wxURL_NOERR;
   return TRUE;


@@ -106,26 +122,31 @@ bool wxURL::ParseURL()
 
 void wxURL::CleanData()
 {
 
 void wxURL::CleanData()
 {

-  if (m_protoname != "proxy")
+#if wxUSE_SOCKETS
+  if (!m_useProxy)
+#endif

     delete m_protocol;
 }
 
 wxURL::~wxURL()
 {
   CleanData();
     delete m_protocol;
 }
 
 wxURL::~wxURL()
 {
   CleanData();

+#if wxUSE_SOCKETS
+  if (m_proxy && m_proxy != g_proxy)
+    delete m_proxy;
+#endif

 }
 
 }
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL urls decoders --------------------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL urls decoders --------------------------------
+// --------------------------------------------------------------
+

 bool wxURL::PrepProto(wxString& url)
 {
   int pos;
 
   // Find end
 bool wxURL::PrepProto(wxString& url)
 {
   int pos;
 
   // Find end

-  pos = url.Find(':');
+  pos = url.Find(_T(':'));

   if (pos == -1)
     return FALSE;
 
   if (pos == -1)
     return FALSE;
 


@@ -146,7 +167,7 @@ bool wxURL::PrepHost(wxString& url)
 
   url = url(2, url.Length());
 
 
   url = url(2, url.Length());
 

-  pos = url.Find('/');
+  pos = url.Find(_T('/'));

   if (pos == -1)
     pos = url.Length();
 
   if (pos == -1)
     pos = url.Length();
 


@@ -154,31 +175,30 @@ bool wxURL::PrepHost(wxString& url)
     return FALSE;
 
   temp_url = url(0, pos);
     return FALSE;
 
   temp_url = url(0, pos);

-  url = url(url.Find('/'), url.Length());
+  url = url(url.Find(_T('/')), url.Length());

 
   // Retrieve service number
 
   // Retrieve service number

-  pos2 = temp_url.Find(':', TRUE);
+  pos2 = temp_url.Find(_T(':'), TRUE);

   if (pos2 != -1 && pos2 < pos) {
   if (pos2 != -1 && pos2 < pos) {

-    m_servname = url(pos2, pos);
+    m_servname = temp_url(pos2+1, pos);

     if (!m_servname.IsNumber())
       return FALSE;
     if (!m_servname.IsNumber())
       return FALSE;

-    pos2 = pos;

     temp_url = temp_url(0, pos2);
   }
 
   // Retrieve user and password.
     temp_url = temp_url(0, pos2);
   }
 
   // Retrieve user and password.

-  pos2 = temp_url.Find('@');
+  pos2 = temp_url.Find(_T('@'));

   // Even if pos2 equals -1, this code is right.
   m_hostname = temp_url(pos2+1, temp_url.Length());
 
   // Even if pos2 equals -1, this code is right.
   m_hostname = temp_url(pos2+1, temp_url.Length());
 

-  m_user = "";
-  m_password = "";
+  m_user = _T("");
+  m_password = _T("");

 
   if (pos2 == -1)
     return TRUE;
 
   temp_url = temp_url(0, pos2);
 
   if (pos2 == -1)
     return TRUE;
 
   temp_url = temp_url(0, pos2);

-  pos2 = temp_url.Find(':');
+  pos2 = temp_url.Find(_T(':'));

 
   if (pos2 == -1)
     return FALSE;
 
   if (pos2 == -1)
     return FALSE;


@@ -192,9 +212,9 @@ bool wxURL::PrepHost(wxString& url)
 bool wxURL::PrepPath(wxString& url)
 {
   if (url.Length() != 0)
 bool wxURL::PrepPath(wxString& url)
 {
   if (url.Length() != 0)

-    m_path = url;
+    m_path = ConvertToValidURI(url);

   else
   else

-    m_path = "/";
+    m_path = _T("/");

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -209,7 +229,6 @@ bool wxURL::FetchProtocol()
 
       m_protoinfo = info;
       m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
 
       m_protoinfo = info;
       m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();

-      wxSocketHandler::Master().Register(m_protocol);

       return TRUE;
     }
     info = info->next;
       return TRUE;
     }
     info = info->next;


@@ -217,32 +236,30 @@ bool wxURL::FetchProtocol()
   return FALSE;
 }
 
   return FALSE;
 }
 

-/*
- * --------------------------------------------------------------
- * --------- wxURL get ------------------------------------------
- * --------------------------------------------------------------
- */
+// --------------------------------------------------------------
+// --------- wxURL get ------------------------------------------
+// --------------------------------------------------------------
+

 wxInputStream *wxURL::GetInputStream(void)
 {
 wxInputStream *wxURL::GetInputStream(void)
 {

-  wxIPV4address addr;

   wxInputStream *the_i_stream = NULL;
 
   wxInputStream *the_i_stream = NULL;
 

-  if (!m_protocol)
-    if (!ParseURL())
-      return NULL;
-

   if (!m_protocol) {
     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;
   if (!m_protocol) {
     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;

-  if (m_user != "") {
+  if (m_user != _T("")) {

     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
 
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
 

-  if (m_protoinfo->m_needhost) {
+#if wxUSE_SOCKETS
+    wxIPV4address addr;
+
+  // m_protoinfo is NULL when we use a proxy
+  if (!m_useProxy && m_protoinfo->m_needhost) {

     if (!addr.Hostname(m_hostname)) {
       m_error = wxURL_NOHOST;
       return NULL;
     if (!addr.Hostname(m_hostname)) {
       m_error = wxURL_NOHOST;
       return NULL;


@@ -250,13 +267,20 @@ wxInputStream *wxURL::GetInputStream(void)
 
     addr.Service(m_servname);
 
 
     addr.Service(m_servname);
 

-    if (!m_protocol->Connect(addr)) {
+    if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
+    {

       m_error = wxURL_CONNERR;
       return NULL;
     }
   }
       m_error = wxURL_CONNERR;
       return NULL;
     }
   }

+#endif
+
+  // When we use a proxy, we have to pass the whole URL to it.
+  if (m_useProxy)
+    the_i_stream = m_protocol->GetInputStream(m_url);
+  else
+    the_i_stream = m_protocol->GetInputStream(m_path);

 
 

-  the_i_stream = m_protocol->GetInputStream(m_path);

   if (!the_i_stream) {
     m_error = wxURL_PROTOERR;
     return NULL;
   if (!the_i_stream) {
     m_error = wxURL_PROTOERR;
     return NULL;


@@ -265,50 +289,129 @@ wxInputStream *wxURL::GetInputStream(void)
   return the_i_stream;
 }
 
   return the_i_stream;
 }
 

+#if wxUSE_SOCKETS

 void wxURL::SetDefaultProxy(const wxString& url_proxy)
 {
 void wxURL::SetDefaultProxy(const wxString& url_proxy)
 {

-  g_proxy.Close();
-
-  if (url_proxy.IsNull())
+  if (url_proxy.IsNull()) {
+    g_proxy->Close();
+    delete g_proxy;
+    g_proxy = NULL;

     return;
     return;

+  }

 
   wxString tmp_str = url_proxy;
 
   wxString tmp_str = url_proxy;

-  int pos = tmp_str.Find(':');
+  int pos = tmp_str.Find(_T(':'));
+  if (pos == -1)
+    return;
+

   wxString hostname = tmp_str(0, pos),
   wxString hostname = tmp_str(0, pos),

-           port = tmp_str(pos, tmp_str.Length()-pos);
+           port = tmp_str(pos+1, tmp_str.Length()-pos);

   wxIPV4address addr;
 
   wxIPV4address addr;
 

-  addr.Hostname(hostname);
-  addr.Service(port);
-  
-  g_proxy.Connect(addr);
+  if (!addr.Hostname(hostname))
+    return;
+  if (!addr.Service(port))
+    return;
+
+  if (g_proxy)
+  // Finally, when all is right, we connect the new proxy.
+    g_proxy->Close();
+  else
+    g_proxy = new wxHTTP();
+  g_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason

 }
 
 void wxURL::SetProxy(const wxString& url_proxy)
 {
   if (url_proxy.IsNull()) {
 }
 
 void wxURL::SetProxy(const wxString& url_proxy)
 {
   if (url_proxy.IsNull()) {

-    m_proxy.Close();
+    if (m_proxy) {
+      m_proxy->Close();
+      delete m_proxy;
+    }
+    m_useProxy = FALSE;

     return;
   }
 
     return;
   }
 

-  CleanData();
-

   wxString tmp_str;
   wxString hostname, port;
   int pos;
   wxIPV4address addr;
 
   tmp_str = url_proxy;
   wxString tmp_str;
   wxString hostname, port;
   int pos;
   wxIPV4address addr;
 
   tmp_str = url_proxy;

-  pos = tmp_str.Find(':');
+  pos = tmp_str.Find(_T(':'));
+  // This is an invalid proxy name.
+  if (pos == -1)
+    return;
+

   hostname = tmp_str(0, pos);
   port = tmp_str(pos, tmp_str.Length()-pos);
 
   addr.Hostname(hostname);
   addr.Service(port);
 
   hostname = tmp_str(0, pos);
   port = tmp_str(pos, tmp_str.Length()-pos);
 
   addr.Hostname(hostname);
   addr.Service(port);
 

-  m_proxy.Connect(addr);
+  // Finally, create the whole stuff.
+  if (m_proxy && m_proxy != g_proxy)
+    delete m_proxy;
+  m_proxy = new wxHTTP();
+  m_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
+
+  CleanData();
+  // Reparse url.
+  m_useProxy = TRUE;
+  ParseURL();
+}
+#endif

 
 

-  m_protocol = &m_proxy;
-  m_protoname = "proxy";
-  m_path = url_proxy;
+wxString wxURL::ConvertToValidURI(const wxString& uri)
+{
+  wxString out_str;
+  wxString hexa_code;
+  size_t i;
+
+  for (i=0;i<uri.Len();i++) {
+    wxChar c = uri.GetChar(i);
+
+    if (c == _T(' '))
+      out_str += _T('+');
+    else {
+      if (!isalpha(c) && c != _T('.') && c != _T('+') && c != _T('/')) {
+        hexa_code.Printf(_T("%%%02X"), c);
+        out_str += hexa_code;
+      } else
+        out_str += c;
+    }
+  }
+
+  return out_str;
+}
+
+wxString wxURL::ConvertFromURI(const wxString& uri)
+{
+  int code;
+  int i;
+  wxString new_uri;
+
+  new_uri.Empty();
+  
+  i = 0;
+  while (i<uri.Len()) {
+    if (uri[i] == _T('%')) {
+      i++;
+      if (uri[i] >= _T('A') && uri[i] <= _T('F'))
+        code = (uri[i] - _T('A') + 10) * 16;
+      else
+        code = (uri[i] - _T('0')) * 16;
+      i++;
+      if (uri[i] >= _T('A') && uri[i] <= _T('F'))
+        code += (uri[i] - _T('A')) + 10;
+      else
+        code += (uri[i] - _T('0'));
+      i++;
+      new_uri += (wxChar)code;
+      continue;
+    }
+    new_uri += uri[i];
+    i++;
+  }
+  return new_uri;

 }
 }