// 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 hdrstop
#endif
-#include <string.h>
-#include <ctype.h>
+#if wxUSE_URL
#include "wx/string.h"
#include "wx/list.h"
#include "wx/module.h"
#include "wx/url.h"
+#include <string.h>
+#include <ctype.h>
+
IMPLEMENT_CLASS(wxProtoInfo, wxObject)
IMPLEMENT_CLASS(wxURL, wxObject)
USE_PROTOCOL(wxFTP)
wxHTTP *wxURL::ms_proxyDefault = NULL;
- bool wxURL::ms_useDefaultProxy = FALSE;
+ bool wxURL::ms_useDefaultProxy = false;
#endif
// --------------------------------------------------------------
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 )
{
- SetDefaultProxy(getenv("HTTP_PROXY"));
+ SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
if ( !ms_proxyDefault )
{
// don't try again
- ms_useDefaultProxy = FALSE;
+ ms_useDefaultProxy = false;
}
}
if (!PrepProto(last_url))
{
m_error = wxURL_SNTXERR;
- return FALSE;
+ return false;
}
// Find and create the protocol object
if (!FetchProtocol())
{
m_error = wxURL_NOPROTO;
- return FALSE;
+ return false;
}
// Do we need a host name ?
if (!PrepHost(last_url))
{
m_error = wxURL_SNTXERR;
- return FALSE;
+ return false;
}
}
if (!PrepPath(last_url))
{
m_error = wxURL_NOPATH;
- return FALSE;
+ return false;
}
}
// URL parse finished.
#if wxUSE_SOCKETS
if (m_useProxy)
{
- // We destroy the newly created protocol.
- CleanData();
+ // destroy the previously created protocol as we'll be using m_proxy
+ delete m_protocol;
// Third, we rebuild the URL.
m_url = m_protoname + wxT(":");
#endif
m_error = wxURL_NOERR;
- return TRUE;
+ return true;
}
void wxURL::CleanData()
wxURL::~wxURL()
{
- CleanData();
+ CleanData();
#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
}
// Find end
pos = url.Find(wxT(':'));
- if (pos == -1)
- return FALSE;
+ if (pos == wxNOT_FOUND)
+ return false;
m_protoname = url(0, pos);
url = url(pos+1, url.Length());
- return TRUE;
+ return true;
}
bool wxURL::PrepHost(wxString& url)
int pos, pos2;
if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))
- return FALSE;
+ return false;
url = url(2, url.Length());
pos = url.Find(wxT('/'));
- if (pos == -1)
+ if (pos == wxNOT_FOUND)
pos = url.Length();
if (pos == 0)
- return FALSE;
+ 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)
+ pos2 = temp_url.Find(wxT(':'), true);
+ if (pos2 != wxNOT_FOUND && pos2 < pos)
{
m_servname = temp_url(pos2+1, pos);
if (!m_servname.IsNumber())
- return FALSE;
+ 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.
+ // Even if pos2 equals wxNOT_FOUND, this code is right.
m_hostname = temp_url(pos2+1, temp_url.Length());
m_user = wxT("");
m_password = wxT("");
- if (pos2 == -1)
- return TRUE;
+ if (pos2 == wxNOT_FOUND)
+ return true;
temp_url = temp_url(0, pos2);
pos2 = temp_url.Find(wxT(':'));
- if (pos2 == -1)
- return FALSE;
+ if (pos2 == wxNOT_FOUND)
+ return false;
m_user = temp_url(0, pos2);
m_password = temp_url(pos2+1, url.Length());
- return TRUE;
+ return true;
}
bool wxURL::PrepPath(wxString& url)
m_path = ConvertToValidURI(url);
else
m_path = wxT("/");
- return TRUE;
+ return true;
}
bool wxURL::FetchProtocol()
m_protoinfo = info;
m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
- return TRUE;
+ return true;
}
info = info->next;
}
- return FALSE;
+ return false;
}
// --------------------------------------------------------------
wxInputStream *wxURL::GetInputStream()
{
- wxInputStream *the_i_stream = NULL;
-
if (!m_protocol)
{
m_error = wxURL_NOPROTO;
m_protocol->SetPassword(m_password);
}
+#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;
addr.Service(m_servname);
- 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;
#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);
+ wxInputStream *the_i_stream =
+ (m_useProxy) ? m_protocol->GetInputStream(m_url) :
+ m_protocol->GetInputStream(m_path);
if (!the_i_stream)
{
{
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),
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
}
}
delete m_proxy;
}
- m_useProxy = FALSE;
+ m_useProxy = false;
}
else
{
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);
- port = tmp_str(pos, tmp_str.Length()-pos);
+ port = tmp_str(pos+1, tmp_str.Length()-pos);
addr.Hostname(hostname);
addr.Service(port);
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.
- m_useProxy = TRUE;
+ m_useProxy = true;
ParseURL();
}
}
else
{
// GRG, Apr/2000: modified according to the URI definition (RFC 2396)
- //
+ //
// - Alphanumeric characters are never escaped
// - Unreserved marks are never escaped
// - Delimiters must be escaped if they appear within a component
i++;
if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
code = (uri[i] - wxT('A') + 10) * 16;
+ else 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 if (uri[i] >= wxT('a') && uri[i] <= wxT('f'))
+ code += (uri[i] - wxT('a')) + 10;
else
code += (uri[i] - wxT('0'));
if ( getenv("HTTP_PROXY") )
{
- wxURL::ms_useDefaultProxy = TRUE;
+ wxURL::ms_useDefaultProxy = true;
}
- return TRUE;
+ return true;
}
void wxURLModule::OnExit()
}
#endif // wxUSE_SOCKETS
+
+#endif // wxUSE_URL
+
projects / wxWidgets.git / blobdiff