github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-06 02:10:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use empty query in local filenames.

Browse Source
This commit is contained in:
Tim Ruehsen 2012-04-24 21:46:06 +02:00 committed by Giuseppe Scrivano
parent c6889dab18
commit 378c203079
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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> 2012-04-22 Tim Ruehsen <tim.ruehsen@gmx.de>
* main.c (main): Dynamically allocate `opt.progress_type'. * main.c (main): Dynamically allocate `opt.progress_type'.

9
src/url.c
View File

@ -1502,7 +1502,7 @@ url_file_name (const struct url *u, char *replaced_filename)
{ {
struct growable fnres; /* stands for "file name result" */ struct growable fnres; /* stands for "file name result" */
const char *u_file, *u_query; const char *u_file;
char *fname, *unique; char *fname, *unique;
char *index_filename = "index.html"; /* The default index file is index.html */ 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; u_file = *u->file ? u->file : index_filename;
append_uri_pathel (u_file, u_file + strlen (u_file), false, &fnres); append_uri_pathel (u_file, u_file + strlen (u_file), false, &fnres);
/* Append "?query" to the file name. */ /* Append "?query" to the file name, even if empty */
u_query = u->query && *u->query ? u->query : NULL; if (u->query)
if (u_query)
{ {
append_char (FN_QUERY_SEP, &fnres); 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); true, &fnres);
} }
} }