Skip to content

Commit

Permalink
webos: busybox: update the patches to apply on 1.37.0 version from oe…
Browse files Browse the repository at this point in the history
…-core

:Release Notes:

:Detailed Notes:
Fixes:
http://gecko.lge.com:8000/Errors/Details/999029

ERROR: Applying patch '0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch' on target directory 'busybox/1.37.0/busybox-1.37.0'
CmdError('quilt --quiltrc 1.37.0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch
patching file libbb/lineedit.c
Hunk #1 FAILED at 490.
1 out of 1 hunk FAILED -- rejects in file libbb/lineedit.c
Patch 0003-libedit-check-for-null-before-passing-cmdedit_prompt.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRR-5443] Create GPVB with Yocto 5.2 Walnascar

Change-Id: Ife80afe5a6f0e972d00133cebe2df8b07d391352
  • Loading branch information
shr-project committed Dec 7, 2024
1 parent ed7bda1 commit 2c2ce71
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ Upstream-Status: Pending
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e14c78707..0166f8f34 100644
index 543a3f11c..5ecf9dd76 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -490,7 +490,9 @@ static void beep(void)
*/
static void put_prompt_custom(bool is_full)
{
- fputs_stdout((is_full ? cmdedit_prompt : prompt_last_line));
@@ -505,7 +505,9 @@ static void put_prompt_custom(bool is_full)
/* https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
* says that shells must write $PSn to stderr, not stdout.
*/
- fputs((is_full ? cmdedit_prompt : prompt_last_line), stderr);
+ if ( !is_full || NULL != cmdedit_prompt ) {
+ fputs_stdout((is_full ? cmdedit_prompt : prompt_last_line));
+ fputs((is_full ? cmdedit_prompt : prompt_last_line), stderr);
+ }
cursor = 0;
cmdedit_y = cmdedit_prmt_len / cmdedit_termw; /* new quasireal y */
Expand Down

0 comments on commit 2c2ce71

Please sign in to comment.