moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Improve handling of schemeless URLs.

Browse Source
This commit is contained in:
Steven Schubiger 2009-07-04 11:19:57 +02:00
parent efd514c825
commit a0dc7788e5
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2009-07-04 Steven Schubiger <stsc@member.fsf.org>
* url.c (url_parse): If an URL scheme is invalid, distinguish
between an unsupported or missing scheme.
* url.c: Add a "missing scheme" entry to parse_errors.
2009-07-03 Micah Cowan <micah@cowan.name> 2009-07-03 Micah Cowan <micah@cowan.name>
* iri.h (iri_dup): Provide macro definition for when IRIs are * iri.h (iri_dup): Provide macro definition for when IRIs are

21
src/url.c
View File

@ -628,18 +628,20 @@ static const char *parse_errors[] = {
#define PE_NO_ERROR 0 #define PE_NO_ERROR 0
N_("No error"), N_("No error"),
#define PE_UNSUPPORTED_SCHEME 1 #define PE_UNSUPPORTED_SCHEME 1
N_("Unsupported scheme %s"), N_("Unsupported scheme %s"), /* support for format token only here */
#define PE_INVALID_HOST_NAME 2 #define PE_MISSING_SCHEME 2
N_("Scheme missing"),
#define PE_INVALID_HOST_NAME 3
N_("Invalid host name"), N_("Invalid host name"),
#define PE_BAD_PORT_NUMBER 3 #define PE_BAD_PORT_NUMBER 4
N_("Bad port number"), N_("Bad port number"),
#define PE_INVALID_USER_NAME 4 #define PE_INVALID_USER_NAME 5
N_("Invalid user name"), N_("Invalid user name"),
#define PE_UNTERMINATED_IPV6_ADDRESS 5 #define PE_UNTERMINATED_IPV6_ADDRESS 6
N_("Unterminated IPv6 numeric address"), N_("Unterminated IPv6 numeric address"),
#define PE_IPV6_NOT_SUPPORTED 6 #define PE_IPV6_NOT_SUPPORTED 7
N_("IPv6 addresses not supported"), N_("IPv6 addresses not supported"),
#define PE_INVALID_IPV6_ADDRESS 7 #define PE_INVALID_IPV6_ADDRESS 8
N_("Invalid IPv6 numeric address") N_("Invalid IPv6 numeric address")
}; };
@ -676,7 +678,10 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
scheme = url_scheme (url); scheme = url_scheme (url);
if (scheme == SCHEME_INVALID) if (scheme == SCHEME_INVALID)
{ {
error_code = PE_UNSUPPORTED_SCHEME; if (url_has_scheme (url))
error_code = PE_UNSUPPORTED_SCHEME;
else
error_code = PE_MISSING_SCHEME;
goto error; goto error;
} }