diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-06-17 20:21:30 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-06-17 20:21:30 +0200 |
commit | aacd44860129372e5d4ff1494664317f18cbb615 (patch) | |
tree | f3b565e62c1055c04b453b2dc54c4db5a2702521 | |
parent | e0a6004ce83ba519a0e6f0d277968d306c4df296 (diff) | |
download | busybox-aacd44860129372e5d4ff1494664317f18cbb615.tar.gz |
wget: fix wget-supports--P testsuite failure. Closes 4940
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/wget.c | 10 |
1 files 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 |