JPEG handler does not read entire file into memory anymore (+, of course, that header...

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index db4517e3d97f3b2a901af5da2e477eea03982c6a..8c680f6905fda10fb88bbaff181d34a40a3bbfe4 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -23,15 +23,13 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#include <wx/string.h>
-#include <wx/list.h>
-#include <wx/utils.h>
-#include <wx/url.h>
+#include "wx/string.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/url.h"

 
 

-#if !USE_SHARED_LIBRARY

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

-#endif

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


@@ -105,9 +103,9 @@ bool wxURL::ParseURL()
     CleanData();
 
     // Third, we rebuild the URL.
     CleanData();
 
     // Third, we rebuild the URL.

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

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

-      m_url = m_url + _T("//") + m_hostname;
+      m_url = m_url + wxT("//") + m_hostname;

 
     m_url += m_path;
 
 
     m_url += m_path;
 


@@ -146,7 +144,7 @@ bool wxURL::PrepProto(wxString& url)
   int pos;
 
   // Find end
   int pos;
 
   // Find end

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

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


@@ -162,12 +160,12 @@ bool wxURL::PrepHost(wxString& url)
   wxString temp_url;
   int pos, pos2;
 
   wxString temp_url;
   int pos, pos2;
 

-  if ((url.GetChar(0) != '/') || (url.GetChar(1) != '/'))
+  if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))

     return FALSE;
 
   url = url(2, url.Length());
 
     return FALSE;
 
   url = url(2, url.Length());
 

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

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


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

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

 
   // Retrieve service number
 
   // Retrieve service number

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

   if (pos2 != -1 && pos2 < pos) {
     m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())
   if (pos2 != -1 && pos2 < pos) {
     m_servname = temp_url(pos2+1, pos);
     if (!m_servname.IsNumber())


@@ -187,18 +185,18 @@ bool wxURL::PrepHost(wxString& url)
   }
 
   // Retrieve user and password.
   }
 
   // Retrieve user and password.

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

   // 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 = _T("");
-  m_password = _T("");
+  m_user = wxT("");
+  m_password = wxT("");

 
   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(_T(':'));
+  pos2 = temp_url.Find(wxT(':'));

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


@@ -214,7 +212,7 @@ bool wxURL::PrepPath(wxString& url)
   if (url.Length() != 0)
     m_path = ConvertToValidURI(url);
   else
   if (url.Length() != 0)
     m_path = ConvertToValidURI(url);
   else

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

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -240,7 +238,7 @@ bool wxURL::FetchProtocol()
 // --------- wxURL get ------------------------------------------
 // --------------------------------------------------------------
 
 // --------- wxURL get ------------------------------------------
 // --------------------------------------------------------------
 

-wxInputStream *wxURL::GetInputStream(void)
+wxInputStream *wxURL::GetInputStream()

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


@@ -250,12 +248,14 @@ wxInputStream *wxURL::GetInputStream(void)
   }
 
   m_error = wxURL_NOERR;
   }
 
   m_error = wxURL_NOERR;

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

     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
 
 #if wxUSE_SOCKETS
     m_protocol->SetUser(m_user);
     m_protocol->SetPassword(m_password);
   }
 
 #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_protoinfo is NULL when we use a proxy
   if (!m_useProxy && m_protoinfo->m_needhost) {
     if (!addr.Hostname(m_hostname)) {


@@ -263,7 +263,6 @@ wxInputStream *wxURL::GetInputStream(void)
       return NULL;
     }
 
       return NULL;
     }
 

-    wxIPV4address addr;

     addr.Service(m_servname);
 
     if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
     addr.Service(m_servname);
 
     if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason


@@ -299,7 +298,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
   }
 
   wxString tmp_str = url_proxy;
   }
 
   wxString tmp_str = url_proxy;

-  int pos = tmp_str.Find(_T(':'));
+  int pos = tmp_str.Find(wxT(':'));

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


@@ -337,7 +336,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
   wxIPV4address addr;
 
   tmp_str = url_proxy;
   wxIPV4address addr;
 
   tmp_str = url_proxy;

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

   // This is an invalid proxy name.
   if (pos == -1)
     return;
   // This is an invalid proxy name.
   if (pos == -1)
     return;


@@ -370,17 +369,44 @@ wxString wxURL::ConvertToValidURI(const wxString& uri)
   for (i=0;i<uri.Len();i++) {
     wxChar c = uri.GetChar(i);
 
   for (i=0;i<uri.Len();i++) {
     wxChar c = uri.GetChar(i);
 

-    if (c == _T(' '))
-      out_str += _T('+');
+    if (c == wxT(' '))
+      out_str += wxT('+');

     else {
     else {

-      if (!isalpha(c) && c != _T('.') && c != _T('+') && c != _T('/')) { 
-        hexa_code.Printf(_T("%%%02X"), c);
+      if (!isalpha(c) && c != wxT('.') && c != wxT('+') && c != wxT('/')) {
+        hexa_code.Printf(wxT("%%%02X"), c);

         out_str += hexa_code;
       } else
         out_str += c;
     }
   }
         out_str += hexa_code;
       } else
         out_str += c;
     }
   }

-  
+

   return out_str;
 }
 
   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;
+}