[git commit] wget: fix wget-supports--P testsuite failure. Closes 4940

Denys Vlasenko vda.linux at googlemail.com
Sun Jun 17 18:21:30 UTC 2012


commit: http://git.busybox.net/busybox/commit/?id=aacd44860129372e5d4ff1494664317f18cbb615
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/wget.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/networking/wget.c b/networking/wget.c
index 5d58450..6d8f8a5 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


More information about the busybox-cvs mailing list