[PATCH] run_shell: run again on ctrl-c

Sascha Hauer s.hauer at pengutronix.de
Mon May 21 03:09:55 EDT 2012


We can start a new interactive shell now using the 'sh' command on
the command line. This shell exits on ctrl-c though. Add a loop
around it to continue instead of exiting.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/hush.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/hush.c b/common/hush.c
index 3d51e4c..8e8dd03 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1612,7 +1612,6 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
 			}
 			if (inp->__promptme == 0)
 				printf("<INTERRUPT>\n");
-			inp->__promptme = 1;
 			temp.nonnull = 0;
 			temp.quote = 0;
 			free_pipe_list(ctx->list_head,0);
@@ -1807,9 +1806,12 @@ int run_shell(void)
 	struct in_str input;
 	struct p_context ctx;
 
-	setup_file_in_str(&input);
-	rcode = parse_stream_outer(&ctx, &input, FLAG_PARSE_SEMICOLON);
-	release_context(&ctx);
+	do {
+		setup_file_in_str(&input);
+		rcode = parse_stream_outer(&ctx, &input, FLAG_PARSE_SEMICOLON);
+		release_context(&ctx);
+	} while (!input.__promptme);
+
 	return rcode;
 }
 
-- 
1.7.10




More information about the barebox mailing list