Use empty query in local filenames.

diff --git a/src/ChangeLog b/src/ChangeLog
index 44d4b54ddd16a53c16c2459f079a4bab7e4790be..c7675e8806aaf9c1a66c5abca200a11f1ab0eace 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-30  Tim Ruehsen  <tim.ruehsen@gmx.de>
+
+       * url.c: Use empty query in local filenames.
+
 2012-04-22  Tim Ruehsen <tim.ruehsen@gmx.de>
 
        * main.c (main): Dynamically allocate `opt.progress_type'.

diff --git a/src/url.c b/src/url.c
index 2593d09ed82e877ce4f8d0a3f934280c418d19ce..ddde798c681eff0a64482e03cbf57c5c10d6bb8b 100644 (file)
--- a/src/url.c
+++ b/src/url.c
@@ -1502,7 +1502,7 @@ url_file_name (const struct url *u, char *replaced_filename)
 {
   struct growable fnres;        /* stands for "file name result" */
 
-  const char *u_file, *u_query;
+  const char *u_file;
   char *fname, *unique;
   char *index_filename = "index.html"; /* The default index file is index.html */
 
@@ -1561,12 +1561,11 @@ url_file_name (const struct url *u, char *replaced_filename)
       u_file = *u->file ? u->file : index_filename;
       append_uri_pathel (u_file, u_file + strlen (u_file), false, &fnres);
 
-      /* Append "?query" to the file name. */
-      u_query = u->query && *u->query ? u->query : NULL;
-      if (u_query)
+      /* Append "?query" to the file name, even if empty */
+      if (u->query)
        {
          append_char (FN_QUERY_SEP, &fnres);
-         append_uri_pathel (u_query, u_query + strlen (u_query),
+         append_uri_pathel (u->query, u->query + strlen (u->query),
                             true, &fnres);
        }
     }