wget: fix wget-supports--P testsuite failure. Closes 4940
authorDenys Vlasenko <vda.linux@googlemail.com>
Sun, 17 Jun 2012 18:21:30 +0000 (20:21 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sun, 17 Jun 2012 18:21:30 +0000 (20:21 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/wget.c

index 5d58450198a87c054f4e475c6890b21d261e8404..6d8f8a504927ad0456a6be5236e7cb2ef2031434 100644 (file)
@@ -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