From aacd44860129372e5d4ff1494664317f18cbb615 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 17 Jun 2012 20:21:30 +0200 Subject: wget: fix wget-supports--P testsuite failure. Closes 4940 Signed-off-by: Denys Vlasenko --- networking/wget.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/networking/wget.c b/networking/wget.c index 5d5845019..6d8f8a504 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -621,13 +621,11 @@ static void download_one_url(const char *url) if (G.fname_out[0] == '/' || !G.fname_out[0]) G.fname_out = (char*)"index.html"; /* -P DIR is considered only if there was no -O FILE */ + if (G.dir_prefix) + G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); else { - if (G.dir_prefix) - G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); - else { - /* redirects may free target.path later, need to make a copy */ - G.fname_out = fname_out_alloc = xstrdup(G.fname_out); - } + /* redirects may free target.path later, need to make a copy */ + G.fname_out = fname_out_alloc = xstrdup(G.fname_out); } } #if ENABLE_FEATURE_WGET_STATUSBAR -- cgit v1.2.3