Patchwork [U-Boot,2/2] hush: Fix return code when using 'exit' in control structures

login
register
mail settings
Submitter Wolfgang Denk
Date Feb. 14, 2011, 7:11 p.m.
Message ID <1297710697-13872-2-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/83151/
State Rejected
Headers show

Comments

Wolfgang Denk - Feb. 14, 2011, 7:11 p.m.
This fixes cases like this one, there hush used to return 0 :

	=> if foo ; then do something ; exit 1 ; fi ; echo RC=$?
	Unknown command 'foo' - try 'help'
	RC=1

Adapted from Barebox commit 2477fb1
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 23 Mar 2010 15:33:43 +0100

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 common/hush.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Wolfgang Denk - April 12, 2011, 8:47 p.m.
In message <1297710697-13872-2-git-send-email-wd@denx.de> you wrote:
> This fixes cases like this one, there hush used to return 0 :
> 
> 	=> if foo ; then do something ; exit 1 ; fi ; echo RC=$?
> 	Unknown command 'foo' - try 'help'
> 	RC=1
> 
> Adapted from Barebox commit 2477fb1
> From: Sascha Hauer <s.hauer@pengutronix.de>
> Date: Tue, 23 Mar 2010 15:33:43 +0100
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  common/hush.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

I will drop these hush patches.

Further testing shows that they don't really fix the problems.

Looking closer at the current hush code I think it's a waste of time
to try fixing these things; we should rather throw it away and
re-import a recent version from BusyBox, which would also bring a few
nice features like shell functions and the like.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/hush.c b/common/hush.c
index c6f8392..32561a7 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1938,7 +1938,7 @@  static int run_list_real(struct pipe *pi)
 #else
 		if (rcode < -1) {
 			last_return_code = -rcode - 2;
-			return -2;	/* exit */
+			return rcode;	/* exit */
 		}
 		last_return_code=(rcode == 0) ? 0 : 1;
 #endif
@@ -3184,7 +3184,7 @@  int parse_stream_outer(struct in_str *inp, int flag)
 				free_pipe_list(ctx.list_head, 0);
 				continue;
 			}
-			if (code == -2) {	/* exit */
+			if (code < -1) {	/* exit */
 				b_free(&temp);
 				code = 0;
 				/* XXX hackish way to not allow exit from main loop */