X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Furl.c;h=e44dfcd2313282426d68e5b5e8591682d7296df7;hp=2593d09ed82e877ce4f8d0a3f934280c418d19ce;hb=2e86829809c4a89eec3f13f8ad86a26c6c9c55de;hpb=2f6aa1d7417df1dfc58597777686fbd77179b9fd diff --git a/src/url.c b/src/url.c index 2593d09e..e44dfcd2 100644 --- a/src/url.c +++ b/src/url.c @@ -1502,9 +1502,9 @@ 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 */ + const char *index_filename = "index.html"; /* The default index file is index.html */ fnres.base = NULL; fnres.size = 0; @@ -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); } }