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

Convert correctly URLs that need to be encoded to local files.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-08-20 03:11:07 +02:00
parent 2107eb06ab
commit 6ce3d0cf12
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2010-08-20 Giuseppe Scrivano <gscrivano@gnu.org>
* convert.c: Include "iri.h".
(convert_links_in_hashtable): Parse the url, if
necessary, before check if it is present in the dowloaded url
map.
Reported by: <sk.random@gmail.com>.
2010-08-09 Giuseppe Scrivano <gscrivano@gnu.org> 2010-08-09 Giuseppe Scrivano <gscrivano@gnu.org>
Fix a problem with HTTP/1.0 proxies. Fix a problem with HTTP/1.0 proxies.

12
src/convert.c
View File

@ -47,6 +47,7 @@ as that of the covered work. */
#include "res.h" #include "res.h"
#include "html-url.h" #include "html-url.h"
#include "css-url.h" #include "css-url.h"
#include "iri.h"
static struct hash_table *dl_file_url_map; static struct hash_table *dl_file_url_map;
struct hash_table *dl_url_file_map; struct hash_table *dl_url_file_map;
@ -105,7 +106,8 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
for (cur_url = urls; cur_url; cur_url = cur_url->next) for (cur_url = urls; cur_url; cur_url = cur_url->next)
{ {
char *local_name; char *local_name;
struct url *u = cur_url->url; struct url *u;
struct iri *pi;
if (cur_url->link_base_p) if (cur_url->link_base_p)
{ {
@ -119,6 +121,11 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
/* We decide the direction of conversion according to whether /* We decide the direction of conversion according to whether
a URL was downloaded. Downloaded URLs will be converted a URL was downloaded. Downloaded URLs will be converted
ABS2REL, whereas non-downloaded will be converted REL2ABS. */ ABS2REL, whereas non-downloaded will be converted REL2ABS. */
pi = iri_new ();
set_uri_encoding (pi, opt.locale, true);
u = url_parse (cur_url->url->url, NULL, pi, true);
local_name = hash_table_get (dl_url_file_map, u->url); local_name = hash_table_get (dl_url_file_map, u->url);
/* Decide on the conversion type. */ /* Decide on the conversion type. */
@ -144,6 +151,9 @@ convert_links_in_hashtable (struct hash_table *downloaded_set,
cur_url->local_name = NULL; cur_url->local_name = NULL;
DEBUGP (("will convert url %s to complete\n", u->url)); DEBUGP (("will convert url %s to complete\n", u->url));
} }
url_free (u);
iri_free (pi);
} }
/* Convert the links in the file. */ /* Convert the links in the file. */