eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-05-14 10:59:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Shell: Allow builtins and functions as conditions for 'if'

Browse Source
This commit is contained in:
AnotherTest
2020-09-14 14:57:30 +04:30
committed by Andreas Kling
parent 2b867ff555
commit cd0ddf27f3
Notes: sideshowbarker 2024-07-19 02:24:50 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/cd0ddf27f3e
Pull-request: https://github.com/SerenityOS/serenity/pull/3473
Reviewed-by: https://github.com/bugaevc
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Shell/Shell.cpp
View File

@@ -591,10 +591,9 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
return nullptr;
}
int retval = 0;
if (run_builtin(command, rewirings, retval)) {
if (run_builtin(command, rewirings, last_return_code)) {
for (auto& next_in_chain : command.next_chain)
run_tail(next_in_chain, retval);
run_tail(next_in_chain, last_return_code);
return nullptr;
}
@@ -610,9 +609,9 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
}
}
if (invoke_function(command, retval)) {
if (invoke_function(command, last_return_code)) {
for (auto& next_in_chain : command.next_chain)
run_tail(next_in_chain, retval);
run_tail(next_in_chain, last_return_code);
return nullptr;
}
}