summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch')
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch
new file mode 100644
index 0000000000..3003965d8c
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch
@@ -0,0 +1,30 @@
1In cases where busybox wget is invoked with -P <...> and the url ends
2in "/", the download directory is ignored (ie the file index.html is
3implied), this change enables the -P option for those urls.
4
5Signed-off-by: Amy Fong <amy.fong@windriver.com>
6Upstream-Status: Submitted
7---
8 networking/wget.c | 10 +++++++---
9 1 file changed, 7 insertions(+), 3 deletions(-)
10
11--- a/networking/wget.c
12+++ b/networking/wget.c
13@@ -589,10 +589,14 @@
14 if (!(option_mask32 & WGET_OPT_OUTNAME)) {
15 G.fname_out = bb_get_last_path_component_nostrip(target.path);
16 /* handle "wget http://kernel.org//" */
17- if (G.fname_out[0] == '/' || !G.fname_out[0])
18- G.fname_out = (char*)"index.html";
19+ if (G.fname_out[0] == '/' || !G.fname_out[0]) {
20+ /* bug: if we provide a default name, we should still look at -P option */
21+ if (G.dir_prefix)
22+ G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, "index.html");
23+ else
24+ G.fname_out = (char*)"index.html";
25 /* -P DIR is considered only if there was no -O FILE */
26- else {
27+ } else {
28 if (G.dir_prefix)
29 G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
30 else {