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

[svn] Return a pointer from url_skip_credentials.

Browse Source
This commit is contained in:
hniksic 2003-12-14 05:42:53 -08:00
parent 489452a23a
commit c734e9a981
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-12-14 Hrvoje Niksic <hniksic@xemacs.org>
* url.c (url_skip_credentials): Return a pointer directly.
2003-12-14 Hrvoje Niksic <hniksic@xemacs.org> 2003-12-14 Hrvoje Niksic <hniksic@xemacs.org>
* url.c (url_file_name): Ditto. * url.c (url_file_name): Ditto.

8
src/url.c
View File

@ -483,15 +483,15 @@ scheme_disable (enum url_scheme scheme)
If no username and password are found, return 0. */ If no username and password are found, return 0. */
static int static const char *
url_skip_credentials (const char *url) url_skip_credentials (const char *url)
{ {
/* Look for '@' that comes before terminators, such as '/', '?', /* Look for '@' that comes before terminators, such as '/', '?',
'#', or ';'. */ '#', or ';'. */
const char *p = (const char *)strpbrk (url, "@/?#;"); const char *p = (const char *)strpbrk (url, "@/?#;");
if (!p || *p != '@') if (!p || *p != '@')
return 0; return p;
return p + 1 - url; return p + 1;
} }
/* Parse credentials contained in [BEG, END). The region is expected /* Parse credentials contained in [BEG, END). The region is expected
@ -840,7 +840,7 @@ url_parse (const char *url, int *error)
p += strlen (supported_schemes[scheme].leading_string); p += strlen (supported_schemes[scheme].leading_string);
uname_b = p; uname_b = p;
p += url_skip_credentials (p); p = url_skip_credentials (p);
uname_e = p; uname_e = p;
/* scheme://user:pass@host[:port]... */ /* scheme://user:pass@host[:port]... */