From 378c2030799bdc51d7240321ad06607c5b2d1a31 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Tue, 24 Apr 2012 21:46:06 +0200 Subject: [PATCH] Use empty query in local filenames. --- src/ChangeLog | 4 ++++ src/url.c | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 44d4b54d..c7675e88 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-03-30 Tim Ruehsen + + * url.c: Use empty query in local filenames. + 2012-04-22 Tim Ruehsen * main.c (main): Dynamically allocate `opt.progress_type'. diff --git a/src/url.c b/src/url.c index 2593d09e..ddde798c 100644 --- 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); } } -- 2.39.2