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] Make --base -i work.

Browse Source 
Published in <sxsoflisqcf.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2001-12-01 11:17:19 -08:00
parent 62a4ca3289
commit 8b2a216c77
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-12-01 Hrvoje Niksic <hniksic@arsdigita.com>
* url.c (get_urls_file): If opt.base_href is specified, merge each
URL with the base.
2001-12-01 Hrvoje Niksic <hniksic@arsdigita.com> 2001-12-01 Hrvoje Niksic <hniksic@arsdigita.com>
* main.c (print_help): Don't document the removed `-nh'. * main.c (print_help): Don't document the removed `-nh'.

16
src/url.c
View File

@ -1009,13 +1009,25 @@ get_urls_file (const char *file)
--line_end; --line_end;
if (line_end > line_beg) if (line_end > line_beg)
{ {
/* URL is in the [line_beg, line_end) region. */
int up_error_code; int up_error_code;
char *url_text; char *url_text;
struct urlpos *entry; struct urlpos *entry;
struct url *url; struct url *url;
/* We must copy the URL to a zero-terminated string. *sigh*. */ /* We must copy the URL to a zero-terminated string, and we
can't use alloca because we're in a loop. *sigh*. */
url_text = strdupdelim (line_beg, line_end); url_text = strdupdelim (line_beg, line_end);
if (opt.base_href)
{
/* Merge opt.base_href with URL. */
char *merged = uri_merge (opt.base_href, url_text);
xfree (url_text);
url_text = merged;
}
url = url_parse (url_text, &up_error_code); url = url_parse (url_text, &up_error_code);
if (!url) if (!url)
{ {
@ -1382,7 +1394,7 @@ find_last_char (const char *b, const char *e, char c)
The parameters LINKLENGTH is useful if LINK is not zero-terminated. The parameters LINKLENGTH is useful if LINK is not zero-terminated.
See uri_merge for a gentler interface to this functionality. See uri_merge for a gentler interface to this functionality.
#### This function should handle `./' and `../' so that the evil Perhaps this function should handle `./' and `../' so that the evil
path_simplify can go. */ path_simplify can go. */
static char * static char *
uri_merge_1 (const char *base, const char *link, int linklength, int no_scheme) uri_merge_1 (const char *base, const char *link, int linklength, int no_scheme)