github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 22:51:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix return value of if/else statements to match POSIX. Hopefully should close #1443, and reverses some of #1061 / e632d39b.

Browse Source
This commit is contained in:
Geoff Nixon 2015-01-20 23:44:49 -08:00 committed by ridiculousfish
parent 1116929d2f
commit b9bd0166b6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parse_execution.cpp
View File

@ -295,8 +295,9 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(const parse
}
else if (else_clause->child_count == 0)
{
/* 'if' condition failed, no else clause, we're done */
/* 'if' condition failed, no else clause, return 0, we're done. */
job_list_to_execute = NULL;
proc_set_last_status(STATUS_BUILTIN_OK);
break;
}
else
@ -325,8 +326,12 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(const parse
{
run_job_list(*job_list_to_execute, ib);
}
else
{ /* No job list means no sucessful conditions, so return 0 (#1443). */
proc_set_last_status(STATUS_BUILTIN_OK);
}
/* It's possible there's a last-minute cancellation, in which case we should not stomp the exit status (#1297) */
/* It's possible there's a last-minute cancellation (#1297). */
if (should_cancel_execution(ib))
{
result = parse_execution_cancelled;
@ -335,12 +340,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(const parse
/* Done */
parser->pop_block(ib);
/* Issue 1061: If we executed, then always report success, instead of letting the exit status of the last command linger */
if (result == parse_execution_success)
{
proc_set_last_status(STATUS_BUILTIN_OK);
}
/* Otherwise, take the exit status of the job list. Reversal of #1061. */
return result;
}