X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97d8fe87918a2ceabd531b8deecb3a316c875dbb..ecaed0bcdaddf522bda6a73dd655ee473f35c03a:/src/common/uri.cpp diff --git a/src/common/uri.cpp b/src/common/uri.cpp index 80cbfa47c8..bcdd7eae66 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -16,10 +16,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "uri.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -27,13 +23,17 @@ #pragma hdrstop #endif +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif + #include "wx/uri.h" // --------------------------------------------------------------------------- // definitions // --------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxURI, wxObject); +IMPLEMENT_CLASS(wxURI, wxObject) // =========================================================================== // implementation @@ -97,7 +97,10 @@ const wxChar* wxURI::Create(const wxString& uri) if (m_fields) Clear(); - return Parse(uri); + // FIXME-UTF8: rewrite ParseXXX() methods using iterators + // NB: using wxWxCharBuffer instead of just c_str() avoids keeping + // converted string in memory for longer than needed + return Parse(wxWxCharBuffer(uri.c_str())); } // --------------------------------------------------------------------------- @@ -113,26 +116,29 @@ const wxChar* wxURI::Create(const wxString& uri) // Unescape unencodes all 3 character URL escape sequences in a wxString // --------------------------------------------------------------------------- -wxChar wxURI::TranslateEscape(const wxChar* s) +wxUniChar wxURI::TranslateEscape(const wxString::const_iterator& s) { - wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!")); + wxChar c1(*s); + wxChar c2(*(s + 1)); - return (wxChar)( CharToHex(s[0]) << 4 ) | CharToHex(s[1]); + wxASSERT_MSG( IsHex(c1) && IsHex(c2), wxT("Invalid escape sequence!")); + + return wx_truncate_cast(wxChar, (CharToHex(c1) << 4 ) | CharToHex(c2)); } wxString wxURI::Unescape(const wxString& uri) { wxString new_uri; - for(size_t i = 0; i < uri.length(); ++i) + for (wxString::const_iterator i = uri.begin(); i != uri.end(); ++i) { - if (uri[i] == wxT('%')) + if ( *i == wxT('%') ) { - new_uri += wxURI::TranslateEscape( &(uri.c_str()[i+1]) ); + new_uri += wxURI::TranslateEscape(i + 1); i += 2; } else - new_uri += uri[i]; + new_uri += *i; } return new_uri; @@ -375,7 +381,7 @@ bool wxURI::IsReference() const // URI-reference = URI / relative // --------------------------------------------------------------------------- -const wxChar* wxURI::Parse(const wxChar* uri) +const wxChar* wxURI::Parse(const wxChar *uri) { uri = ParseScheme(uri); uri = ParseAuthority(uri); @@ -390,7 +396,7 @@ const wxChar* wxURI::Parse(const wxChar* uri) // Individual parsers for each URI component // --------------------------------------------------------------------------- -const wxChar* wxURI::ParseScheme(const wxChar* uri) +const wxChar* wxURI::ParseScheme(const wxChar *uri) { wxASSERT(uri != NULL); @@ -436,11 +442,18 @@ const wxChar* wxURI::ParseAuthority(const wxChar* uri) // authority = [ userinfo "@" ] host [ ":" port ] if (*uri == wxT('/') && *(uri+1) == wxT('/')) { + //skip past the two slashes uri += 2; + // ############# DEVIATION FROM RFC ######################### + // Don't parse the server component for file URIs + if(m_scheme != wxT("file")) + { + //normal way uri = ParseUserInfo(uri); uri = ParseServer(uri); return ParsePort(uri); + } } return uri; @@ -635,7 +648,8 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali if (bNormalize) { wxStringBufferLength theBuffer(m_path, m_path.length() + 1); -#if wxUSE_STL +#if wxUSE_STL || wxUSE_UNICODE_UTF8 + // FIXME-UTF8: have some wxReadWriteStringBuffer instead? wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1); #endif Normalize(theBuffer, true); @@ -687,7 +701,8 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali if (bNormalize) { wxStringBufferLength theBuffer(m_path, m_path.length() + 1); -#if wxUSE_STL +#if wxUSE_STL || wxUSE_UNICODE_UTF8 + // FIXME-UTF8: have some wxReadWriteStringBuffer instead? wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1); #endif Normalize(theBuffer); @@ -867,18 +882,18 @@ void wxURI::Resolve(const wxURI& base, int flags) if (m_path[0u] != wxT('/')) { //Merge paths - const wxChar* op = m_path.c_str(); - const wxChar* bp = base.m_path.c_str() + base.m_path.Length(); + wxString::const_iterator op = m_path.begin(); + wxString::const_iterator bp = base.m_path.begin() + base.m_path.length(); //not a ending directory? move up if (base.m_path[0] && *(bp-1) != wxT('/')) - UpTree(base.m_path, bp); + UpTree(base.m_path.begin(), bp); //normalize directories while(*op == wxT('.') && *(op+1) == wxT('.') && (*(op+2) == '\0' || *(op+2) == wxT('/')) ) { - UpTree(base.m_path, bp); + UpTree(base.m_path.begin(), bp); if (*(op+2) == '\0') op += 2; @@ -886,8 +901,8 @@ void wxURI::Resolve(const wxURI& base, int flags) op += 3; } - m_path = base.m_path.substr(0, bp - base.m_path.c_str()) + - m_path.substr((op - m_path.c_str()), m_path.Length()); + m_path = base.m_path.substr(0, bp - base.m_path.begin()) + + m_path.substr((op - m_path.begin()), m_path.length()); } } @@ -901,7 +916,31 @@ void wxURI::Resolve(const wxURI& base, int flags) // --------------------------------------------------------------------------- //static -void wxURI::UpTree(const wxChar* uristart, const wxChar*& uri) +void wxURI::UpTree(wxString::const_iterator uristart, + wxString::const_iterator& uri) +{ + if (uri != uristart && *(uri-1) == wxT('/')) + { + uri -= 2; + } + + for(;uri != uristart; --uri) + { + if (*uri == wxT('/')) + { + ++uri; + break; + } + } + + //!!!TODO:HACK!!!// + if (uri == uristart && *uri == wxT('/')) + ++uri; + //!!!// +} + +// FIXME-UTF8: fix Normalize() to use iterators instead of having this method! +/*static*/ void wxURI::UpTree(const wxChar* uristart, const wxChar*& uri) { if (uri != uristart && *(uri-1) == wxT('/')) { @@ -922,6 +961,7 @@ void wxURI::UpTree(const wxChar* uristart, const wxChar*& uri) ++uri; //!!!// } +// end of FIXME-UTF8 // --------------------------------------------------------------------------- // Normalize