aboutsummaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index ede8d680e..6dd6a0d03 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3904,7 +3904,7 @@ static NOINLINE int run_pipe(struct pipe *pi)
3904 /* if someone gives us an empty string: `cmd with empty output` */ 3904 /* if someone gives us an empty string: `cmd with empty output` */
3905 if (!argv_expanded[0]) { 3905 if (!argv_expanded[0]) {
3906 debug_leave(); 3906 debug_leave();
3907 return 0; // or G.last_exitcode? see emptytick.tests 3907 return G.last_exitcode;
3908 } 3908 }
3909 3909
3910 x = find_builtin(argv_expanded[0]); 3910 x = find_builtin(argv_expanded[0]);
@@ -6380,15 +6380,26 @@ static struct pipe *parse_stream(char **pstring,
6380 */ 6380 */
6381static void parse_and_run_stream(struct in_str *inp, int end_trigger) 6381static void parse_and_run_stream(struct in_str *inp, int end_trigger)
6382{ 6382{
6383 /* Why we need empty flag?
6384 * An obscure corner case "false; ``; echo $?":
6385 * empty command in `` should still set $? to 0.
6386 * But we can't just set $? to 0 at the start,
6387 * this breaks "false; echo `echo $?`" case.
6388 */
6389 bool empty = 1;
6383 while (1) { 6390 while (1) {
6384 struct pipe *pipe_list; 6391 struct pipe *pipe_list;
6385 6392
6386 pipe_list = parse_stream(NULL, inp, end_trigger); 6393 pipe_list = parse_stream(NULL, inp, end_trigger);
6387 if (!pipe_list) /* EOF */ 6394 if (!pipe_list) { /* EOF */
6395 if (empty)
6396 G.last_exitcode = 0;
6388 break; 6397 break;
6398 }
6389 debug_print_tree(pipe_list, 0); 6399 debug_print_tree(pipe_list, 0);
6390 debug_printf_exec("parse_and_run_stream: run_and_free_list\n"); 6400 debug_printf_exec("parse_and_run_stream: run_and_free_list\n");
6391 run_and_free_list(pipe_list); 6401 run_and_free_list(pipe_list);
6402 empty = 0;
6392 } 6403 }
6393} 6404}
6394 6405