diff --git a/meta-webos/recipes-core/busybox/busybox/0001-Add-tzset-applet.patch b/meta-webos/recipes-core/busybox/busybox/0001-Add-tzset-applet.patch index bdbf58e35..82c92db56 100644 --- a/meta-webos/recipes-core/busybox/busybox/0001-Add-tzset-applet.patch +++ b/meta-webos/recipes-core/busybox/busybox/0001-Add-tzset-applet.patch @@ -1,11 +1,12 @@ -From 69b9c7cc445ea2c238a1ddf238cf896167cdd661 Mon Sep 17 00:00:00 2001 +From c38d806dcd8e88bf04a38a5e5a01dad899ecd8e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 Nov 2017 17:22:45 +0000 -Subject: [PATCH 1/3] Add tzset applet +Subject: [PATCH] Add tzset applet Signed-off-by: Martin Jansa + --- - coreutils/tzset.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + coreutils/tzset.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 coreutils/tzset.c @@ -72,6 +73,3 @@ index 0000000..100ba8c + + return 0; +} --- -2.7.4 - diff --git a/meta-webos/recipes-core/busybox/busybox/0002-date-add-support-for-options-U-and-S.patch b/meta-webos/recipes-core/busybox/busybox/0002-date-add-support-for-options-U-and-S.patch index fd530ed5b..1c9da9bda 100644 --- a/meta-webos/recipes-core/busybox/busybox/0002-date-add-support-for-options-U-and-S.patch +++ b/meta-webos/recipes-core/busybox/busybox/0002-date-add-support-for-options-U-and-S.patch @@ -1,18 +1,19 @@ -From 38f8e1d34bf4ac4403a93dd129e96879b5a8c38a Mon Sep 17 00:00:00 2001 +From 657f7f027f38e41dcce66a51b1f9332d543e76be Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 Nov 2017 17:24:12 +0000 -Subject: [PATCH 2/3] date: add support for options -U and -S +Subject: [PATCH] date: add support for options -U and -S Signed-off-by: Martin Jansa + --- coreutils/date.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/coreutils/date.c b/coreutils/date.c -index 9d4a7df..dc0114a 100644 +index 87dc3bb..d552481 100644 --- a/coreutils/date.c +++ b/coreutils/date.c -@@ -99,10 +99,13 @@ +@@ -100,10 +100,13 @@ //usage: "Display time (using +FMT), or set time\n" //usage: IF_NOT_LONG_OPTS( //usage: "\n [-s] TIME Set time to TIME" @@ -26,7 +27,7 @@ index 9d4a7df..dc0114a 100644 //usage: "\n -u,--utc Work in UTC (don't convert to local time)" //usage: "\n -R,--rfc-2822 Output RFC-2822 compliant date string" //usage: ) -@@ -138,9 +141,7 @@ +@@ -139,9 +142,7 @@ #include "libbb.h" #include "common_bufsiz.h" @@ -37,7 +38,7 @@ index 9d4a7df..dc0114a 100644 enum { OPT_RFC2822 = (1 << 0), /* R */ -@@ -148,8 +149,10 @@ enum { +@@ -149,8 +150,10 @@ enum { OPT_UTC = (1 << 2), /* u */ OPT_DATE = (1 << 3), /* d */ OPT_REFERENCE = (1 << 4), /* r */ @@ -49,17 +50,17 @@ index 9d4a7df..dc0114a 100644 + OPT_HINT = (1 << 8) * ENABLE_FEATURE_DATE_ISOFMT, /* D */ }; - static void maybe_set_utc(int opt) -@@ -187,7 +190,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) - opt_complementary = "d--s:s--d" - IF_FEATURE_DATE_ISOFMT(":R--I:I--R"); - IF_LONG_OPTS(applet_long_options = date_longopts;) -- opt = getopt32(argv, "Rs:ud:r:" -+ opt = getopt32(argv, "Rs:ud:r:SU" - IF_FEATURE_DATE_ISOFMT("I::D:"), - &date_str, &date_str, &filename - IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt)); -@@ -258,6 +261,14 @@ int date_main(int argc UNUSED_PARAM, char **argv) + #if ENABLE_LONG_OPTS +@@ -193,7 +196,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) + char *isofmt_arg = NULL; + + opt = getopt32long(argv, "^" +- "Rs:ud:r:" ++ "Rs:ud:r:SU" + IF_FEATURE_DATE_ISOFMT("I::D:") + "\0" + "d--s:s--d" +@@ -270,6 +273,14 @@ int date_main(int argc UNUSED_PARAM, char **argv) * drop a mail to project mailing list please */ #endif @@ -74,7 +75,7 @@ index 9d4a7df..dc0114a 100644 } else { #if ENABLE_FEATURE_DATE_NANO /* libc has incredibly messy way of doing this, -@@ -280,6 +291,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) +@@ -292,6 +303,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_HINT)) { if (strptime(date_str, fmt_str2dt, &tm_time) == NULL) bb_error_msg_and_die(bb_msg_invalid_date, date_str); @@ -84,7 +85,7 @@ index 9d4a7df..dc0114a 100644 } else { parse_datestr(date_str, &tm_time); } -@@ -322,6 +336,8 @@ int date_main(int argc UNUSED_PARAM, char **argv) +@@ -332,6 +346,8 @@ int date_main(int argc UNUSED_PARAM, char **argv) strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S "); i = sizeof("%a, %d %b %Y %H:%M:%S ")-1; goto format_utc; @@ -93,6 +94,3 @@ index 9d4a7df..dc0114a 100644 } else { /* default case */ fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y"; } --- -2.7.4 - diff --git a/meta-webos/recipes-core/busybox/busybox/0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch b/meta-webos/recipes-core/busybox/busybox/0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch index 8605f1e54..e7f773f40 100644 --- a/meta-webos/recipes-core/busybox/busybox/0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch +++ b/meta-webos/recipes-core/busybox/busybox/0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch @@ -1,29 +1,27 @@ -From a3477153f4c46e9a33cd2fc707c135a03e39ec3c Mon Sep 17 00:00:00 2001 +From d334fb8c0eac44f5fee9833ac7ae74446fbd22ab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 6 Nov 2017 17:24:53 +0000 -Subject: [PATCH 3/3] libedit: check for null before passing cmdedit_prompt to +Subject: [PATCH] libedit: check for null before passing cmdedit_prompt to fputs Signed-off-by: Martin Jansa + --- libbb/lineedit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libbb/lineedit.c b/libbb/lineedit.c -index 2a5d4e7..a079caf 100644 +index d5e92e8..090caba 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c -@@ -439,7 +439,9 @@ static void beep(void) - - static void put_prompt(void) +@@ -445,7 +445,9 @@ static void beep(void) + */ + static void put_prompt_custom(bool is_full) { -- fputs(cmdedit_prompt, stdout); -+ if ( NULL != cmdedit_prompt ) { -+ fputs(cmdedit_prompt, stdout); +- fputs((is_full ? cmdedit_prompt : prompt_last_line), stdout); ++ if ( !is_full || NULL != cmdedit_prompt ) { ++ fputs((is_full ? cmdedit_prompt : prompt_last_line), stdout); + } cursor = 0; cmdedit_y = cmdedit_prmt_len / cmdedit_termw; /* new quasireal y */ cmdedit_x = cmdedit_prmt_len % cmdedit_termw; --- -2.7.4 -