summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai2001-07-19 19:13:55 +0000
committerMatt Kraai2001-07-19 19:13:55 +0000
commit0382eb886529fc4dab170e7d66883c20fe0e2883 (patch)
treec5da8d3e790c4af40c8307c0e7cbb0e07f34982e
parente92895c0386257b9e9602999f0de85d9986adcff (diff)
downloadbusybox-0382eb886529fc4dab170e7d66883c20fe0e2883.zip
busybox-0382eb886529fc4dab170e7d66883c20fe0e2883.tar.gz
The -P prefix should only be prepended to filenames which are not explicitly
specified.
-rw-r--r--networking/wget.c8
-rw-r--r--wget.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/networking/wget.c b/networking/wget.c
index 5d94f6e..009e0c8 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -195,7 +195,7 @@ int wget_main(int argc, char **argv)
++do_continue;
break;
case 'P':
- dir_prefix = optarg;
+ dir_prefix = optarg;
break;
case 'q':
quiet_flag = TRUE;
@@ -256,6 +256,8 @@ int wget_main(int argc, char **argv)
#endif
"index.html";
}
+ if (dir_prefix != NULL)
+ fname_out = concat_path_file(dir_prefix, fname_out);
#ifdef BB_FEATURE_WGET_STATUSBAR
} else {
curfile = get_last_path_component(fname_out);
@@ -272,8 +274,6 @@ int wget_main(int argc, char **argv)
output = stdout;
quiet_flag = TRUE;
} else {
- if (dir_prefix != NULL)
- fname_out = concat_path_file(dir_prefix, fname_out);
output = xfopen(fname_out, (do_continue ? "a" : "w"));
}
@@ -817,7 +817,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.43 2001/07/19 17:29:38 kraai Exp $
+ * $Id: wget.c,v 1.44 2001/07/19 19:13:55 kraai Exp $
*/
diff --git a/wget.c b/wget.c
index 5d94f6e..009e0c8 100644
--- a/wget.c
+++ b/wget.c
@@ -195,7 +195,7 @@ int wget_main(int argc, char **argv)
++do_continue;
break;
case 'P':
- dir_prefix = optarg;
+ dir_prefix = optarg;
break;
case 'q':
quiet_flag = TRUE;
@@ -256,6 +256,8 @@ int wget_main(int argc, char **argv)
#endif
"index.html";
}
+ if (dir_prefix != NULL)
+ fname_out = concat_path_file(dir_prefix, fname_out);
#ifdef BB_FEATURE_WGET_STATUSBAR
} else {
curfile = get_last_path_component(fname_out);
@@ -272,8 +274,6 @@ int wget_main(int argc, char **argv)
output = stdout;
quiet_flag = TRUE;
} else {
- if (dir_prefix != NULL)
- fname_out = concat_path_file(dir_prefix, fname_out);
output = xfopen(fname_out, (do_continue ? "a" : "w"));
}
@@ -817,7 +817,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.43 2001/07/19 17:29:38 kraai Exp $
+ * $Id: wget.c,v 1.44 2001/07/19 19:13:55 kraai Exp $
*/