mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
9664bee729
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From aacd44860129372e5d4ff1494664317f18cbb615 Mon Sep 17 00:00:00 2001
|
|
From: Denys Vlasenko <vda.linux@googlemail.com>
|
|
Date: Sun, 17 Jun 2012 18:21:30 +0000
|
|
Subject: wget: fix wget-supports--P testsuite failure. Closes 4940
|
|
|
|
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
|
|
---
|
|
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
|
|
--
|
|
cgit v0.9.0.1-2-gef13
|