+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>
* main.c (print_help): Align --trust-server-names help text with
static const char *replace_attr (const char *, int, FILE *, const char *);
static const char *replace_attr_refresh_hack (const char *, int, FILE *,
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 *);
/* Change the links in one file. LINKS is a list of links in the
/* Convert absolute URL to relative. */
{
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)
p = replace_plain (p, link->size, fp, quoted_newname);
char *quoted_newlink = html_quote_string (newlink);
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)
p = replace_attr (p, link->size, fp, quoted_newlink);
else
because those characters have special meanings in URLs. */
static char *
-local_quote_string (const char *file)
+local_quote_string (const char *file, bool no_html_quote)
{
const char *from;
char *newname, *to;
char *any = strpbrk (file, "?#%;");
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
having to be quoted. */
}
*to = '\0';
- return html_quote_string (newname);
+ return no_html_quote ? strdup (newname) : html_quote_string (newname);
}
\f
/* Book-keeping code for dl_file_url_map, dl_url_file_map,