Quote some things that needed quoting.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e3a9363a627c2a2437918821a35125e0c2b4999..ac22d75e01ecb5493bd1f1af90ad8ca8f3e99dd9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-29  Micah Cowan  <micah@cowan.name>
 
 2009-06-29  Micah Cowan  <micah@cowan.name>
 

+       * 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.
        * 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 e6ab232461d8e01170920e4db7f66a4676daeb90..c6e758f8e0ad495a83e255065cd06a7166b0e2f4 100644 (file)
--- 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);
 
 
       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)
 
       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);
     }
 
       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;
 
   newel = xnew0 (struct urlpos);
   newel->url = url;