diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-03-21 00:29:37 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-03-21 00:29:37 +0100 |
commit | 625f218d43ee280da52bb7087236ae5807383082 (patch) | |
tree | 531af0b0268a4f818dbe0a025eede0f6ec08dd9b | |
parent | c2fda8642dc917e3a95f1a556b0876249a1bb321 (diff) | |
download | busybox-w32-625f218d43ee280da52bb7087236ae5807383082.tar.gz busybox-w32-625f218d43ee280da52bb7087236ae5807383082.tar.bz2 busybox-w32-625f218d43ee280da52bb7087236ae5807383082.zip |
wget: fix fname_out usage wrt redirects
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/wget.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/networking/wget.c b/networking/wget.c index 9d50437d8..bc922836a 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -604,8 +604,14 @@ static void download_one_url(const char *url) | |||
604 | if (G.fname_out[0] == '/' || !G.fname_out[0]) | 604 | if (G.fname_out[0] == '/' || !G.fname_out[0]) |
605 | G.fname_out = (char*)"index.html"; | 605 | G.fname_out = (char*)"index.html"; |
606 | /* -P DIR is considered only if there was no -O FILE */ | 606 | /* -P DIR is considered only if there was no -O FILE */ |
607 | if (G.dir_prefix) | 607 | else { |
608 | G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); | 608 | if (G.dir_prefix) |
609 | G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); | ||
610 | else { | ||
611 | /* redirects may free target.path later, need to make a copy */ | ||
612 | G.fname_out = fname_out_alloc = xstrdup(G.fname_out); | ||
613 | } | ||
614 | } | ||
609 | } | 615 | } |
610 | #if ENABLE_FEATURE_WGET_STATUSBAR | 616 | #if ENABLE_FEATURE_WGET_STATUSBAR |
611 | G.curfile = bb_get_last_path_component_nostrip(G.fname_out); | 617 | G.curfile = bb_get_last_path_component_nostrip(G.fname_out); |