emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix another case where empty "for" wasn't setting exitcode to 0

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-07-28 12:42:08 +02:00
parent a8e7441176
commit a5db1d7354
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shell/ash_test/ash-misc/empty_for1.right Normal file
View File

@ -0,0 +1 @@
Zero:0

5
shell/ash_test/ash-misc/empty_for1.tests Executable file
View File

@ -0,0 +1,5 @@
false
for v; do
exit 2
done
echo Zero:$?

2
shell/hush.c
View File

@ -9391,11 +9391,11 @@ static int run_list(struct pipe *pi)
}; /* argv list with one element: "$@" */ }; /* argv list with one element: "$@" */
char **vals; char **vals;
G.last_exitcode = rcode = EXIT_SUCCESS;
vals = (char**)encoded_dollar_at_argv; vals = (char**)encoded_dollar_at_argv;
if (pi->next->res_word == RES_IN) { if (pi->next->res_word == RES_IN) {
/* if no variable values after "in" we skip "for" */ /* if no variable values after "in" we skip "for" */
if (!pi->next->cmds[0].argv) { if (!pi->next->cmds[0].argv) {
G.last_exitcode = rcode = EXIT_SUCCESS;
debug_printf_exec(": null FOR: exitcode EXIT_SUCCESS\n"); debug_printf_exec(": null FOR: exitcode EXIT_SUCCESS\n");
break; break;
} }

1
shell/hush_test/hush-misc/empty_for1.right Normal file
View File

@ -0,0 +1 @@
Zero:0

5
shell/hush_test/hush-misc/empty_for1.tests Executable file
View File

@ -0,0 +1,5 @@
false
for v; do
exit 2
done
echo Zero:$?