emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: fix fname_out usage wrt redirects

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-03-21 00:29:37 +01:00
parent c2fda8642d
commit 625f218d43
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
networking/wget.c
View File

@ -604,8 +604,14 @@ static void download_one_url(const char *url)
if (G.fname_out[0] == '/' || !G.fname_out[0]) if (G.fname_out[0] == '/' || !G.fname_out[0])
G.fname_out = (char*)"index.html"; G.fname_out = (char*)"index.html";
/* -P DIR is considered only if there was no -O FILE */ /* -P DIR is considered only if there was no -O FILE */
if (G.dir_prefix) else {
G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); 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);
}
}
} }
#if ENABLE_FEATURE_WGET_STATUSBAR #if ENABLE_FEATURE_WGET_STATUSBAR
G.curfile = bb_get_last_path_component_nostrip(G.fname_out); G.curfile = bb_get_last_path_component_nostrip(G.fname_out);