| commit | 68d5cb5dacbc80347119ac9cff365e5f04105ef1 | [log] [tgz] |
|---|---|---|
| author | Denys Vlasenko <vda.linux@googlemail.com> | Thu Mar 24 02:50:03 2011 +0100 |
| committer | Denys Vlasenko <vda.linux@googlemail.com> | Thu Mar 24 02:50:03 2011 +0100 |
| tree | 0131cb18f76a4e366a17de7c34882f07c5550557 | |
| parent | 20704f066250744c0c2b84920c27d0fd0aa9e935 [diff] [blame] |
hush: fix a case where return in sourced file has no effect Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/shell/hush.c b/shell/hush.c index 339f334..8154ac4 100644 --- a/shell/hush.c +++ b/shell/hush.c
@@ -5554,6 +5554,10 @@ 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 } }