wxTextOutputStream::PutChar and text stream test

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 25268e90d4a75011648c7a6f0049d5ad6162cf01..2c30bffffcc3964e23b67718fa1ae3b2802bdc86 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -6,10 +6,10 @@
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     20/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 "url.h"
 #endif
 
 #pragma implementation "url.h"
 #endif
 


@@ -20,48 +20,74 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include <string.h>
-#include <ctype.h>
+#if wxUSE_URL

 
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/utils.h"
 
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/utils.h"

+#include "wx/module.h"

 #include "wx/url.h"
 
 #include "wx/url.h"
 

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

 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)

-IMPLEMENT_CLASS(wxURL, wxObject)
+IMPLEMENT_CLASS(wxURL, wxURI)

 
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;
 
 
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;
 

+// Enforce linking of protocol classes:
+USE_PROTOCOL(wxFileProto)
+

 #if wxUSE_SOCKETS
 #if wxUSE_SOCKETS

+USE_PROTOCOL(wxHTTP)
+USE_PROTOCOL(wxFTP)
+

     wxHTTP *wxURL::ms_proxyDefault = NULL;
     wxHTTP *wxURL::ms_proxyDefault = NULL;

-    bool wxURL::ms_useDefaultProxy = FALSE;
+    bool wxURL::ms_useDefaultProxy = false;

 #endif
 
 // --------------------------------------------------------------
 #endif
 
 // --------------------------------------------------------------

-// wxURL
+//
+//                          wxURL
+//

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 
 // --------------------------------------------------------------

-// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// Construction

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 

-wxURL::wxURL(const wxString& url)
+wxURL::wxURL(const wxString& url) : wxURI(url)
+{
+    Init(url);
+    ParseURL();
+}
+
+wxURL::wxURL(const wxURI& url) : wxURI(url)
+{
+    Init(url.BuildURI());
+    ParseURL();
+}
+
+void wxURL::Init(const wxString& url)

 {
     m_protocol = NULL;
     m_error = wxURL_NOERR;
     m_url = url;
 {
     m_protocol = NULL;
     m_error = wxURL_NOERR;
     m_url = url;

+#if wxUSE_URL_NATIVE
+    m_nativeImp = CreateNativeImpObject();
+#endif

 
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {
 
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {

-        SetDefaultProxy(getenv("HTTP_PROXY"));
+        SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );

 
         if ( !ms_proxyDefault )
         {
             // don't try again
 
         if ( !ms_proxyDefault )
         {
             // don't try again

-            ms_useDefaultProxy = FALSE;
+            ms_useDefaultProxy = false;

         }
     }
 
         }
     }
 


@@ -69,59 +95,77 @@ wxURL::wxURL(const wxString& url)
     m_proxy = ms_proxyDefault;
 #endif // wxUSE_SOCKETS
 
     m_proxy = ms_proxyDefault;
 #endif // wxUSE_SOCKETS
 

-    ParseURL();

 }
 
 }
 

-bool wxURL::ParseURL()
+// --------------------------------------------------------------
+// Assignment
+// --------------------------------------------------------------
+
+wxURL& wxURL::operator = (const wxURI& url)
+{
+    wxURI::operator = (url);
+    Init(url.BuildURI());
+    ParseURL();
+    return *this;
+}
+wxURL& wxURL::operator = (const wxString& url)

 {
 {

-  wxString last_url = m_url;
+    wxURI::operator = (url);
+    Init(url);
+    ParseURL();
+    return *this;
+}

 
 

- // If the URL was already parsed (so m_protocol != NULL), we pass this section.
-  if (!m_protocol) {
+// --------------------------------------------------------------
+// ParseURL
+//
+// Builds the URL and takes care of the old protocol stuff
+// --------------------------------------------------------------

 
 

+bool wxURL::ParseURL()
+{
+  // If the URL was already parsed (m_protocol != NULL), pass this section.
+  if (!m_protocol)
+  {

     // Clean up
     CleanData();
 
     // Clean up
     CleanData();
 

-    // Extract protocol name
-    if (!PrepProto(last_url)) {
+    // Make sure we have a protocol/scheme
+    if (!HasScheme())
+    {

       m_error = wxURL_SNTXERR;
       m_error = wxURL_SNTXERR;

-      return FALSE;
+      return false;

     }
 
     // Find and create the protocol object
     }
 
     // Find and create the protocol object

-    if (!FetchProtocol()) {
+    if (!FetchProtocol())
+    {

       m_error = wxURL_NOPROTO;
       m_error = wxURL_NOPROTO;

-      return FALSE;
+      return false;

     }
 
     // Do we need a host name ?
     }
 
     // Do we need a host name ?

-    if (m_protoinfo->m_needhost) {
-      // Extract it
-      if (!PrepHost(last_url)) {
+    if (m_protoinfo->m_needhost)
+    {
+      //  Make sure we have one, then
+      if (!HasServer())
+      {

         m_error = wxURL_SNTXERR;
         m_error = wxURL_SNTXERR;

-        return FALSE;
+        return false;

       }
     }
       }
     }

-
-    // Extract full path
-    if (!PrepPath(last_url)) {
-      m_error = wxURL_NOPATH;
-      return FALSE;
-    }

   }
   }

-  // URL parse finished.

 
 #if wxUSE_SOCKETS
 
 #if wxUSE_SOCKETS

-  if (m_useProxy) {
-    // We destroy the newly created protocol.
-    CleanData();
+  if (m_useProxy)
+  {
+    // destroy the previously created protocol as we'll be using m_proxy
+    delete m_protocol;

 
     // Third, we rebuild the URL.
 
     // Third, we rebuild the URL.

-    m_url = m_protoname + wxT(":");
+    m_url = m_scheme + wxT(":");

     if (m_protoinfo->m_needhost)
     if (m_protoinfo->m_needhost)

-      m_url = m_url + wxT("//") + m_hostname;
-
-    m_url += m_path;
+      m_url = m_url + wxT("//") + m_server;

 
     // We initialize specific variables.
     m_protocol = m_proxy; // FIXME: we should clone the protocol
 
     // We initialize specific variables.
     m_protocol = m_proxy; // FIXME: we should clone the protocol


@@ -129,9 +173,13 @@ bool wxURL::ParseURL()
 #endif
 
   m_error = wxURL_NOERR;
 #endif
 
   m_error = wxURL_NOERR;

-  return TRUE;
+  return true;

 }
 
 }
 

+// --------------------------------------------------------------
+// Destruction/Cleanup
+// --------------------------------------------------------------
+

 void wxURL::CleanData()
 {
 #if wxUSE_SOCKETS
 void wxURL::CleanData()
 {
 #if wxUSE_SOCKETS


@@ -142,144 +190,93 @@ void wxURL::CleanData()
 
 wxURL::~wxURL()
 {
 
 wxURL::~wxURL()
 {

-  CleanData();
+    CleanData();

 #if wxUSE_SOCKETS
 #if wxUSE_SOCKETS

-  if (m_proxy && m_proxy != ms_proxyDefault)
-    delete m_proxy;
+    if (m_proxy && m_proxy != ms_proxyDefault)
+        delete m_proxy;
+#endif
+#if wxUSE_URL_NATIVE
+    delete m_nativeImp;

 #endif
 }
 
 // --------------------------------------------------------------
 #endif
 }
 
 // --------------------------------------------------------------

-// --------- wxURL urls decoders --------------------------------
+// FetchProtocol

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 

-bool wxURL::PrepProto(wxString& url)
-{
-  int pos;
-
-  // Find end
-  pos = url.Find(wxT(':'));
-  if (pos == -1)
-    return FALSE;
-
-  m_protoname = url(0, pos);
-
-  url = url(pos+1, url.Length());
-
-  return TRUE;
-}
-
-bool wxURL::PrepHost(wxString& url)
-{
-  wxString temp_url;
-  int pos, pos2;
-
-  if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))
-    return FALSE;
-
-  url = url(2, url.Length());
-
-  pos = url.Find(wxT('/'));
-  if (pos == -1)
-    pos = url.Length();
-
-  if (pos == 0)
-    return FALSE;
-
-  temp_url = url(0, pos);
-  url = url(url.Find(wxT('/')), url.Length());
-
-  // Retrieve service number
-  pos2 = temp_url.Find(wxT(':'), TRUE);
-  if (pos2 != -1 && pos2 < pos) {
-    m_servname = temp_url(pos2+1, pos);
-    if (!m_servname.IsNumber())
-      return FALSE;
-    temp_url = temp_url(0, pos2);
-  }
-
-  // Retrieve user and password.
-  pos2 = temp_url.Find(wxT('@'));
-  // Even if pos2 equals -1, this code is right.
-  m_hostname = temp_url(pos2+1, temp_url.Length());
-
-  m_user = wxT("");
-  m_password = wxT("");
-
-  if (pos2 == -1)
-    return TRUE;
-
-  temp_url = temp_url(0, pos2);
-  pos2 = temp_url.Find(wxT(':'));
-
-  if (pos2 == -1)
-    return FALSE;
-
-  m_user = temp_url(0, pos2);
-  m_password = temp_url(pos2+1, url.Length());
-
-  return TRUE;
-}
-
-bool wxURL::PrepPath(wxString& url)
-{
-  if (url.Length() != 0)
-    m_path = ConvertToValidURI(url);
-  else
-    m_path = wxT("/");
-  return TRUE;
-}
-

 bool wxURL::FetchProtocol()
 {
   wxProtoInfo *info = ms_protocols;
 
 bool wxURL::FetchProtocol()
 {
   wxProtoInfo *info = ms_protocols;
 

-  while (info) {
-    if (m_protoname == info->m_protoname) {
-      if (m_servname.IsNull())
-        m_servname = info->m_servname;
-
-      m_protoinfo = info;
-      m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
-      return TRUE;
+  while (info)
+  {
+    if (m_scheme == info->m_protoname)
+    {
+        if (m_port.IsNull())
+            m_port = info->m_servname;
+        m_protoinfo = info;
+        m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
+        return true;

     }
     info = info->next;
   }
     }
     info = info->next;
   }

-  return FALSE;
+  return false;

 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------

-// --------- wxURL get ------------------------------------------
+// GetInputStream

 // --------------------------------------------------------------
 
 wxInputStream *wxURL::GetInputStream()
 {
 // --------------------------------------------------------------
 
 wxInputStream *wxURL::GetInputStream()
 {

-  wxInputStream *the_i_stream = NULL;
-
-  if (!m_protocol) {
+  if (!m_protocol)
+  {

     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;
     m_error = wxURL_NOPROTO;
     return NULL;
   }
 
   m_error = wxURL_NOERR;

-  if (m_user != wxT("")) {
-    m_protocol->SetUser(m_user);
-    m_protocol->SetPassword(m_password);
+  if (HasUser())
+  {
+      size_t dwPasswordPos = m_user.find(':');
+
+      if (dwPasswordPos == wxString::npos)
+          m_protocol->SetUser(m_user);
+      else
+      {
+          m_protocol->SetUser(m_user(0, dwPasswordPos));
+          m_protocol->SetPassword(m_user(dwPasswordPos+1, m_user.length() + 1));
+      }

   }
 
   }
 

+#if wxUSE_URL_NATIVE
+  // give the native implementation to return a better stream
+  // such as the native WinINet functionality under MS-Windows
+  if (m_nativeImp)
+  {
+    wxInputStream *rc;
+    rc = m_nativeImp->GetInputStream(this);
+    if (rc != 0)
+        return rc;
+  }
+  // else use the standard behaviour
+#endif // wxUSE_URL_NATIVE
+

 #if wxUSE_SOCKETS
     wxIPV4address addr;
 
   // m_protoinfo is NULL when we use a proxy
 #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)) {
+  if (!m_useProxy && m_protoinfo->m_needhost)
+  {
+    if (!addr.Hostname(m_server))
+    {

       m_error = wxURL_NOHOST;
       return NULL;
     }
 
       m_error = wxURL_NOHOST;
       return NULL;
     }
 

-    addr.Service(m_servname);
+    addr.Service(m_port);

 
 

-    if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
+    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;


@@ -288,12 +285,27 @@ wxInputStream *wxURL::GetInputStream()
 #endif
 
   // When we use a proxy, we have to pass the whole URL to it.
 #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);
+  wxInputStream *the_i_stream;
+  
+  if (!m_useProxy)
+  {
+      the_i_stream = m_protocol->GetInputStream(m_url);
+  }

   else
   else

-    the_i_stream = m_protocol->GetInputStream(m_path);
+  {
+      wxString fullPath = m_path;
+
+      if (HasQuery())
+          fullPath += wxT("?") + m_query;
+      
+      if (HasFragment())
+          fullPath += wxT("#") + m_fragment;
+      
+      the_i_stream = m_protocol->GetInputStream(fullPath);
+  }

 
 

-  if (!the_i_stream) {
+  if (!the_i_stream)
+  {

     m_error = wxURL_PROTOERR;
     return NULL;
   }
     m_error = wxURL_PROTOERR;
     return NULL;
   }


@@ -317,7 +329,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   {
       wxString tmp_str = url_proxy;
       int pos = tmp_str.Find(wxT(':'));
   {
       wxString tmp_str = url_proxy;
       int pos = tmp_str.Find(wxT(':'));

-      if (pos == -1)
+      if (pos == wxNOT_FOUND)

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


@@ -334,7 +346,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
           ms_proxyDefault->Close();
       else
           ms_proxyDefault = new wxHTTP();
           ms_proxyDefault->Close();
       else
           ms_proxyDefault = new wxHTTP();

-      ms_proxyDefault->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
+      ms_proxyDefault->Connect(addr, true); // Watcom needs the 2nd arg for some reason

   }
 }
 
   }
 }
 


@@ -348,7 +360,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             delete m_proxy;
         }
 
             delete m_proxy;
         }
 

-        m_useProxy = FALSE;
+        m_useProxy = false;

     }
     else
     {
     }
     else
     {


@@ -360,11 +372,11 @@ void wxURL::SetProxy(const wxString& url_proxy)
         tmp_str = url_proxy;
         pos = tmp_str.Find(wxT(':'));
         // This is an invalid proxy name.
         tmp_str = url_proxy;
         pos = tmp_str.Find(wxT(':'));
         // This is an invalid proxy name.

-        if (pos == -1)
+        if (pos == wxNOT_FOUND)

             return;
 
         hostname = tmp_str(0, pos);
             return;
 
         hostname = tmp_str(0, pos);

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

 
         addr.Hostname(hostname);
         addr.Service(port);
 
         addr.Hostname(hostname);
         addr.Service(port);


@@ -373,68 +385,19 @@ void wxURL::SetProxy(const wxString& url_proxy)
         if (m_proxy && m_proxy != ms_proxyDefault)
             delete m_proxy;
         m_proxy = new wxHTTP();
         if (m_proxy && m_proxy != ms_proxyDefault)
             delete m_proxy;
         m_proxy = new wxHTTP();

-        m_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
+        m_proxy->Connect(addr, true); // Watcom needs the 2nd arg for some reason

 
         CleanData();
         // Reparse url.
 
         CleanData();
         // Reparse url.

-        m_useProxy = TRUE;
+        m_useProxy = true;

         ParseURL();
     }
 }
 #endif // wxUSE_SOCKETS
 
         ParseURL();
     }
 }
 #endif // wxUSE_SOCKETS
 

-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 == wxT(' '))
-      out_str += wxT('+');
-    else {
-      if (!isalpha(c) && c != wxT('.') && c != wxT('+') && c != wxT('/')) {
-        hexa_code.Printf(wxT("%%%02X"), c);
-        out_str += hexa_code;
-      } else
-        out_str += c;
-    }
-  }
-
-  return out_str;
-}
-
-wxString wxURL::ConvertFromURI(const wxString& uri)
-{
-  wxString new_uri;
-
-  size_t i = 0;
-  while (i<uri.Len()) {
-    int code;
-    if (uri[i] == wxT('%')) {
-      i++;
-      if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
-        code = (uri[i] - wxT('A') + 10) * 16;
-      else
-        code = (uri[i] - wxT('0')) * 16;
-      i++;
-      if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
-        code += (uri[i] - wxT('A')) + 10;
-      else
-        code += (uri[i] - wxT('0'));
-      i++;
-      new_uri += (wxChar)code;
-      continue;
-    }
-    new_uri += uri[i];
-    i++;
-  }
-  return new_uri;
-}
-

 // ----------------------------------------------------------------------
 // ----------------------------------------------------------------------

+// wxURLModule
+//

 // A module which deletes the default proxy if we created it
 // ----------------------------------------------------------------------
 
 // A module which deletes the default proxy if we created it
 // ----------------------------------------------------------------------
 


@@ -458,12 +421,13 @@ bool wxURLModule::OnInit()
     // set, but don't try to create this proxy right now because it will slow
     // down the program startup (especially if there is no DNS server
     // available, in which case it may take up to 1 minute)
     // set, but don't try to create this proxy right now because it will slow
     // down the program startup (especially if there is no DNS server
     // available, in which case it may take up to 1 minute)

+

     if ( getenv("HTTP_PROXY") )
     {
     if ( getenv("HTTP_PROXY") )
     {

-        wxURL::ms_useDefaultProxy = TRUE;
+        wxURL::ms_useDefaultProxy = true;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxURLModule::OnExit()
 }
 
 void wxURLModule::OnExit()


@@ -473,3 +437,6 @@ void wxURLModule::OnExit()
 }
 
 #endif // wxUSE_SOCKETS
 }
 
 #endif // wxUSE_SOCKETS

+
+#endif // wxUSE_URL
+