Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced one call to isalpha with wxIsalnum in wxURL::ConvertToValidURI because:

Browse Source 
a) numeric characters are also valid in an URI
b) wxIsXXX should be used for wxChar instead of ANSI-C isXXX, so that the
   code will also work in Unicode builds


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-28 08:59:12 +00:00
parent d6f6f90a65
commit b60473e401
1 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/common/url.cpp
View File

@@ -77,35 +77,40 @@ bool wxURL::ParseURL()
{
wxString last_url = m_url;
// If the URL was already parsed (so m_protocol != NULL), we pass this section.
if (!m_protocol) {
// If the URL was already parsed (m_protocol != NULL), pass this section.
if (!m_protocol)
{
// Clean up
CleanData();
// Extract protocol name
if (!PrepProto(last_url)) {
if (!PrepProto(last_url))
{
m_error = wxURL_SNTXERR;
return FALSE;
}
// Find and create the protocol object
if (!FetchProtocol()) {
if (!FetchProtocol())
{
m_error = wxURL_NOPROTO;
return FALSE;
}
// Do we need a host name ?
if (m_protoinfo->m_needhost) {
if (m_protoinfo->m_needhost)
{
// Extract it
if (!PrepHost(last_url)) {
if (!PrepHost(last_url))
{
m_error = wxURL_SNTXERR;
return FALSE;
}
}
// Extract full path
if (!PrepPath(last_url)) {
if (!PrepPath(last_url))
{
m_error = wxURL_NOPATH;
return FALSE;
}
@@ -113,7 +118,8 @@ bool wxURL::ParseURL()
// URL parse finished.
#if wxUSE_SOCKETS
if (m_useProxy) {
if (m_useProxy)
{
// We destroy the newly created protocol.
CleanData();
@@ -192,7 +198,8 @@ bool wxURL::PrepHost(wxString& url)
// Retrieve service number
pos2 = temp_url.Find(wxT(':'), TRUE);
if (pos2 != -1 && pos2 < pos) {
if (pos2 != -1 && pos2 < pos)
{
m_servname = temp_url(pos2+1, pos);
if (!m_servname.IsNumber())
return FALSE;
@@ -235,8 +242,10 @@ bool wxURL::FetchProtocol()
{
wxProtoInfo *info = ms_protocols;
while (info) {
if (m_protoname == info->m_protoname) {
while (info)
{
if (m_protoname == info->m_protoname)
{
if (m_servname.IsNull())
m_servname = info->m_servname;
@@ -257,13 +266,15 @@ wxInputStream *wxURL::GetInputStream()
{
wxInputStream *the_i_stream = NULL;
if (!m_protocol) {
if (!m_protocol)
{
m_error = wxURL_NOPROTO;
return NULL;
}
m_error = wxURL_NOERR;
if (m_user != wxT("")) {
if (m_user != wxT(""))
{
m_protocol->SetUser(m_user);
m_protocol->SetPassword(m_password);
}
@@ -272,8 +283,10 @@ wxInputStream *wxURL::GetInputStream()
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_hostname))
{
m_error = wxURL_NOHOST;
return NULL;
}
@@ -294,7 +307,8 @@ wxInputStream *wxURL::GetInputStream()
else
the_i_stream = m_protocol->GetInputStream(m_path);
if (!the_i_stream) {
if (!the_i_stream)
{
m_error = wxURL_PROTOERR;
return NULL;
}
@@ -390,17 +404,25 @@ wxString wxURL::ConvertToValidURI(const wxString& uri)
wxString hexa_code;
size_t i;
for (i=0;i<uri.Len();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('/')) {
}
else
{
if (!wxIsalnum(c) && c != wxT('.') && c != wxT('+') && c != wxT('/'))
{
hexa_code.Printf(wxT("%%%02X"), c);
out_str += hexa_code;
} else
}
else
{
out_str += c;
}
}
}
@@ -412,19 +434,23 @@ wxString wxURL::ConvertFromURI(const wxString& uri)
wxString new_uri;
size_t i = 0;
while (i<uri.Len()) {
while (i<uri.Len())
{
int code;
if (uri[i] == wxT('%')) {
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;