From 889f705d1bc7eb439ddb0192249e44783196ce00 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Mon, 29 Jun 2009 21:37:03 -0700 Subject: [PATCH] Quote some things that needed quoting. --- src/ChangeLog | 4 ++++ src/html-url.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 1e3a9363..ac22d75e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2009-06-29 Micah Cowan + * html-url.c (append_url): Quote some more arguments that might + contain characters that are inappropriate to display for the + current locale. + * retr.c (retrieve_from_file): Be sure to pass iri information when parsing an input-fle url, and be sure to hand a clean iri struct, off to retrieve_tree and retrieve_url. diff --git a/src/html-url.c b/src/html-url.c index e6ab2324..c6e758f8 100644 --- a/src/html-url.c +++ b/src/html-url.c @@ -304,8 +304,11 @@ append_url (const char *link_uri, int position, int size, char *complete_uri = uri_merge (base, link_uri); - DEBUGP (("%s: merge(\"%s\", \"%s\") -> %s\n", - ctx->document_file, base, link_uri, complete_uri)); + DEBUGP (("%s: merge(%s, %s) -> %s\n", + quotearg_n_style (0, locale_quoting_style, ctx->document_file), + quote_n (1, base), + quote_n (2, link_uri), + quotearg_n_style (3, locale_quoting_style, complete_uri))); url = url_parse (complete_uri, NULL, NULL, false); if (!url) @@ -318,7 +321,7 @@ append_url (const char *link_uri, int position, int size, xfree (complete_uri); } - DEBUGP (("appending \"%s\" to urlpos.\n", url->url)); + DEBUGP (("appending %s to urlpos.\n", quote (url->url))); newel = xnew0 (struct urlpos); newel->url = url; -- 2.39.2