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

Automated merge.

Browse Source
This commit is contained in:
Micah Cowan 2009-07-04 11:47:24 -07:00
commit 8e9a3e805f
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

@ -9,6 +9,13 @@
line-continuation tabulation based on the number of bytes in a
string.
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>
* iri.h (iri_dup): Provide macro definition for when IRIs are

19
src/url.c
View File

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