emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The -P prefix should only be prepended to filenames which are not explicitly

Browse Source 
specified.
This commit is contained in:
Matt Kraai 2001-07-19 19:13:55 +00:00
parent e92895c038
commit 0382eb8865
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
networking/wget.c
View File

@ -195,7 +195,7 @@ int wget_main(int argc, char **argv)
++do_continue; ++do_continue;
break; break;
case 'P': case 'P':
dir_prefix = optarg; dir_prefix = optarg;
break; break;
case 'q': case 'q':
quiet_flag = TRUE; quiet_flag = TRUE;
@ -256,6 +256,8 @@ int wget_main(int argc, char **argv)
#endif #endif
"index.html"; "index.html";
} }
if (dir_prefix != NULL)
fname_out = concat_path_file(dir_prefix, fname_out);
#ifdef BB_FEATURE_WGET_STATUSBAR #ifdef BB_FEATURE_WGET_STATUSBAR
} else { } else {
curfile = get_last_path_component(fname_out); curfile = get_last_path_component(fname_out);
@ -272,8 +274,6 @@ int wget_main(int argc, char **argv)
output = stdout; output = stdout;
quiet_flag = TRUE; quiet_flag = TRUE;
} else { } else {
if (dir_prefix != NULL)
fname_out = concat_path_file(dir_prefix, fname_out);
output = xfopen(fname_out, (do_continue ? "a" : "w")); 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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 $
*/ */

8
wget.c
View File

@ -195,7 +195,7 @@ int wget_main(int argc, char **argv)
++do_continue; ++do_continue;
break; break;
case 'P': case 'P':
dir_prefix = optarg; dir_prefix = optarg;
break; break;
case 'q': case 'q':
quiet_flag = TRUE; quiet_flag = TRUE;
@ -256,6 +256,8 @@ int wget_main(int argc, char **argv)
#endif #endif
"index.html"; "index.html";
} }
if (dir_prefix != NULL)
fname_out = concat_path_file(dir_prefix, fname_out);
#ifdef BB_FEATURE_WGET_STATUSBAR #ifdef BB_FEATURE_WGET_STATUSBAR
} else { } else {
curfile = get_last_path_component(fname_out); curfile = get_last_path_component(fname_out);
@ -272,8 +274,6 @@ int wget_main(int argc, char **argv)
output = stdout; output = stdout;
quiet_flag = TRUE; quiet_flag = TRUE;
} else { } else {
if (dir_prefix != NULL)
fname_out = concat_path_file(dir_prefix, fname_out);
output = xfopen(fname_out, (do_continue ? "a" : "w")); 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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 $
*/ */