d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak parsing URLs that have a host part but no document part.

Browse Source 
While we're here, fix a snprintf() usage warning.
This commit is contained in:
Dag-Erling Smørgrav 2001-07-17 20:22:33 +00:00
parent 966222f878
commit 5b2ad516e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libfetch/fetch.c
View File

@ -307,7 +307,7 @@ fetchParseURL(const char *URL)
/* scheme name */
if ((p = strstr(URL, ":/"))) {
snprintf(u->scheme, URL_SCHEMELEN+1, "%.*s", p - URL, URL);
snprintf(u->scheme, URL_SCHEMELEN+1, "%.*s", (int)(p - URL), URL);
URL = ++p;
/*
* Only one slash: no host, leave slash as part of document
@ -318,7 +318,8 @@ fetchParseURL(const char *URL)
} else {
p = URL;
}
if (!*URL || *URL == '/' || *URL == '.' || strchr(URL, '/') == NULL)
if (!*URL || *URL == '/' || *URL == '.' ||
(u->scheme[0] == '\0' && strchr(URL, '/') == NULL))
goto nohost;
p = strpbrk(URL, "/@");