From 68d5cb5dacbc80347119ac9cff365e5f04105ef1 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 24 Mar 2011 02:50:03 +0100 Subject: hush: fix a case where return in sourced file has no effect Signed-off-by: Denys Vlasenko --- shell/hush.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'shell/hush.c') diff --git a/shell/hush.c b/shell/hush.c index 339f3349a..8154ac47b 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -5554,6 +5554,10 @@ static void parse_and_run_stream(struct in_str *inp, int end_trigger) debug_printf_exec("parse_and_run_stream: run_and_free_list\n"); run_and_free_list(pipe_list); empty = 0; +#if ENABLE_HUSH_FUNCTIONS + if (G.flag_return_in_progress == 1) + break; +#endif } } -- cgit v1.2.3