diff options
author | Matt Kraai <kraai@debian.org> | 2001-07-19 19:13:55 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2001-07-19 19:13:55 +0000 |
commit | 0382eb886529fc4dab170e7d66883c20fe0e2883 (patch) | |
tree | c5da8d3e790c4af40c8307c0e7cbb0e07f34982e /networking/wget.c | |
parent | e92895c0386257b9e9602999f0de85d9986adcff (diff) | |
download | busybox-w32-0382eb886529fc4dab170e7d66883c20fe0e2883.tar.gz busybox-w32-0382eb886529fc4dab170e7d66883c20fe0e2883.tar.bz2 busybox-w32-0382eb886529fc4dab170e7d66883c20fe0e2883.zip |
The -P prefix should only be prepended to filenames which are not explicitly
specified.
Diffstat (limited to 'networking/wget.c')
-rw-r--r-- | networking/wget.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/wget.c b/networking/wget.c index 5d94f6e1a..009e0c819 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -195,7 +195,7 @@ int wget_main(int argc, char **argv) | |||
195 | ++do_continue; | 195 | ++do_continue; |
196 | break; | 196 | break; |
197 | case 'P': | 197 | case 'P': |
198 | dir_prefix = optarg; | 198 | dir_prefix = optarg; |
199 | break; | 199 | break; |
200 | case 'q': | 200 | case 'q': |
201 | quiet_flag = TRUE; | 201 | quiet_flag = TRUE; |
@@ -256,6 +256,8 @@ int wget_main(int argc, char **argv) | |||
256 | #endif | 256 | #endif |
257 | "index.html"; | 257 | "index.html"; |
258 | } | 258 | } |
259 | if (dir_prefix != NULL) | ||
260 | fname_out = concat_path_file(dir_prefix, fname_out); | ||
259 | #ifdef BB_FEATURE_WGET_STATUSBAR | 261 | #ifdef BB_FEATURE_WGET_STATUSBAR |
260 | } else { | 262 | } else { |
261 | curfile = get_last_path_component(fname_out); | 263 | curfile = get_last_path_component(fname_out); |
@@ -272,8 +274,6 @@ int wget_main(int argc, char **argv) | |||
272 | output = stdout; | 274 | output = stdout; |
273 | quiet_flag = TRUE; | 275 | quiet_flag = TRUE; |
274 | } else { | 276 | } else { |
275 | if (dir_prefix != NULL) | ||
276 | fname_out = concat_path_file(dir_prefix, fname_out); | ||
277 | output = xfopen(fname_out, (do_continue ? "a" : "w")); | 277 | output = xfopen(fname_out, (do_continue ? "a" : "w")); |
278 | } | 278 | } |
279 | 279 | ||
@@ -817,7 +817,7 @@ progressmeter(int flag) | |||
817 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 817 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
818 | * SUCH DAMAGE. | 818 | * SUCH DAMAGE. |
819 | * | 819 | * |
820 | * $Id: wget.c,v 1.43 2001/07/19 17:29:38 kraai Exp $ | 820 | * $Id: wget.c,v 1.44 2001/07/19 19:13:55 kraai Exp $ |
821 | */ | 821 | */ |
822 | 822 | ||
823 | 823 | ||