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

Do not use HTML quoting in CSS files.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-09-14 12:14:34 +02:00
parent 6ddcb6e65e
commit 6a5a964d7e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2010-09-14 Giuseppe Scrivano <gscrivano@gnu.org>
* convert.c (local_quote_string): Accept new parameter `no_html_quote'.
Inhibit HTML quoting when `no_html_quote'.
(convert_links): Disable HTML quoting in CSS files.
Reported by: Manuel Reinhardt <reinhardt@syslab.com>.
2010-09-12 Giuseppe Scrivano <gscrivano@gnu.org> 2010-09-12 Giuseppe Scrivano <gscrivano@gnu.org>
* main.c (print_help): Align --trust-server-names help text with * main.c (print_help): Align --trust-server-names help text with

13
src/convert.c
View File

@ -203,7 +203,7 @@ static const char *replace_plain (const char*, int, FILE*, const char *);
static const char *replace_attr (const char *, int, FILE *, const char *); static const char *replace_attr (const char *, int, FILE *, const char *);
static const char *replace_attr_refresh_hack (const char *, int, FILE *, static const char *replace_attr_refresh_hack (const char *, int, FILE *,
const char *, int); const char *, int);
static char *local_quote_string (const char *); static char *local_quote_string (const char *, bool);
static char *construct_relative (const char *, const char *); static char *construct_relative (const char *, const char *);
/* Change the links in one file. LINKS is a list of links in the /* Change the links in one file. LINKS is a list of links in the
@ -301,7 +301,8 @@ convert_links (const char *file, struct urlpos *links)
/* Convert absolute URL to relative. */ /* Convert absolute URL to relative. */
{ {
char *newname = construct_relative (file, link->local_name); char *newname = construct_relative (file, link->local_name);
char *quoted_newname = local_quote_string (newname); char *quoted_newname = local_quote_string (newname,
link->link_css_p);
if (link->link_css_p) if (link->link_css_p)
p = replace_plain (p, link->size, fp, quoted_newname); p = replace_plain (p, link->size, fp, quoted_newname);
@ -325,7 +326,7 @@ convert_links (const char *file, struct urlpos *links)
char *quoted_newlink = html_quote_string (newlink); char *quoted_newlink = html_quote_string (newlink);
if (link->link_css_p) if (link->link_css_p)
p = replace_plain (p, link->size, fp, quoted_newlink); p = replace_plain (p, link->size, fp, newlink);
else if (!link->link_refresh_p) else if (!link->link_refresh_p)
p = replace_attr (p, link->size, fp, quoted_newlink); p = replace_attr (p, link->size, fp, quoted_newlink);
else else
@ -612,14 +613,14 @@ find_fragment (const char *beg, int size, const char **bp, const char **ep)
because those characters have special meanings in URLs. */ because those characters have special meanings in URLs. */
static char * static char *
local_quote_string (const char *file) local_quote_string (const char *file, bool no_html_quote)
{ {
const char *from; const char *from;
char *newname, *to; char *newname, *to;
char *any = strpbrk (file, "?#%;"); char *any = strpbrk (file, "?#%;");
if (!any) if (!any)
return html_quote_string (file); return no_html_quote ? strdup (file) : html_quote_string (file);
/* Allocate space assuming the worst-case scenario, each character /* Allocate space assuming the worst-case scenario, each character
having to be quoted. */ having to be quoted. */
@ -656,7 +657,7 @@ local_quote_string (const char *file)
} }
*to = '\0'; *to = '\0';
return html_quote_string (newname); return no_html_quote ? strdup (newname) : html_quote_string (newname);
} }
/* Book-keeping code for dl_file_url_map, dl_url_file_map, /* Book-keeping code for dl_file_url_map, dl_url_file_map,