From: Micah Cowan <micah@cowan.name>
Date: Thu, 2 Jul 2009 08:04:11 +0000 (-0700)
Subject: More quoting.
X-Git-Tag: v1.13~326
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=18bca2706b4c5c1f3bdad7349e092d0675608a61

More quoting.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index fca73ac2..d3e68f1a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-02  Micah Cowan  <micah@cowan.name>
+
+	* recur.c (url_enqueue): Quote enqueue/dequeue debug messages.
+
+	* html-url.c (append_url): Change "merge()" quoting style from
+	locale_quoting_style to escape_quoting_style.
+
 2009-07-01  Micah Cowan  <micah@cowan.name>
 
 	* retr.c (retrieve_url): Use the existing "redirect" label,
diff --git a/src/html-url.c b/src/html-url.c
index c6e758f8..68a8bc3c 100644
--- a/src/html-url.c
+++ b/src/html-url.c
@@ -305,10 +305,10 @@ 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",
-               quotearg_n_style (0, locale_quoting_style, ctx->document_file),
+               quotearg_n_style (0, escape_quoting_style, ctx->document_file),
                quote_n (1, base),
                quote_n (2, link_uri),
-               quotearg_n_style (3, locale_quoting_style, complete_uri)));
+               quotearg_n_style (3, escape_quoting_style, complete_uri)));
 
       url = url_parse (complete_uri, NULL, NULL, false);
       if (!url)
diff --git a/src/recur.c b/src/recur.c
index b0042dff..4e95e869 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -111,7 +111,8 @@ url_enqueue (struct url_queue *queue, struct iri *i,
   if (queue->count > queue->maxcount)
     queue->maxcount = queue->count;
 
-  DEBUGP (("Enqueuing %s at depth %d\n", url, depth));
+  DEBUGP (("Enqueuing %s at depth %d\n",
+           quotearg_n_style (0, escape_quoting_style, url), depth));
   DEBUGP (("Queue count %d, maxcount %d.\n", queue->count, queue->maxcount));
 
   if (i)
@@ -152,7 +153,8 @@ url_dequeue (struct url_queue *queue, struct iri **i,
 
   --queue->count;
 
-  DEBUGP (("Dequeuing %s at depth %d\n", qel->url, qel->depth));
+  DEBUGP (("Dequeuing %s at depth %d\n",
+           quotearg_n_style (0, escape_quoting_style, qel->url), qel->depth));
   DEBUGP (("Queue count %d, maxcount %d.\n", queue->count, queue->maxcount));
 
   xfree (qel);