diff options
| author | des <des@FreeBSD.org> | 2001-07-17 20:22:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2001-07-17 20:22:33 +0000 |
| commit | 35acbfe0b39fd6099d0a015c291e0d16d3588532 (patch) | |
| tree | 3c1d845a70a44ccf81a137b1fda1ef05b7fd2e02 /lib/libfetch/fetch.c | |
| parent | b30d3e5c37c144e0f20d967138b1102f503dc2df (diff) | |
| download | FreeBSD-src-35acbfe0b39fd6099d0a015c291e0d16d3588532.zip FreeBSD-src-35acbfe0b39fd6099d0a015c291e0d16d3588532.tar.gz | |
Unbreak parsing URLs that have a host part but no document part.
While we're here, fix a snprintf() usage warning.
Diffstat (limited to 'lib/libfetch/fetch.c')
| -rw-r--r-- | lib/libfetch/fetch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c index 303861a..963557b 100644 --- a/lib/libfetch/fetch.c +++ b/lib/libfetch/fetch.c @@ -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, "/@"); |
