RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:57:44 +00:00
Code Issues Activity Actions

Shell: Run builtins that cannot be run in the main process in a new child

Browse source 
e.g. `$(jobs | wc -l)` would blow up horribly otherwise.
(it still does)
This commit is contained in:
AnotherTest 2020-10-27 18:31:11 +03:30 • committed by Andreas Kling
parent a8c18f9fd2
commit 0bc758d34a
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Shell/Shell.cpp
View file

@ -562,13 +562,8 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
{ {
FileDescriptionCollector fds; FileDescriptionCollector fds;
if (options.verbose) { if (options.verbose)
fprintf(stderr, "+ "); warnln("+ {}", m_pid, command);
for (auto& arg : command.argv)
fprintf(stderr, "%s ", escape_token(arg).characters());
fprintf(stderr, "\n");
fflush(stderr);
}
// If the command is empty, store the redirections and apply them to all later commands. // If the command is empty, store the redirections and apply them to all later commands.
if (command.argv.is_empty() && !command.should_immediately_execute_next) { if (command.argv.is_empty() && !command.should_immediately_execute_next) {
@ -642,7 +637,7 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
return nullptr; return nullptr;
} }
if (run_builtin(command, rewirings, last_return_code)) { if (command.should_wait && run_builtin(command, rewirings, last_return_code)) {
for (auto& next_in_chain : command.next_chain) for (auto& next_in_chain : command.next_chain)
run_tail(command, next_in_chain, last_return_code); run_tail(command, next_in_chain, last_return_code);
return nullptr; return nullptr;
@ -694,7 +689,6 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
m_is_subshell = true; m_is_subshell = true;
m_pid = getpid(); m_pid = getpid();
Core::EventLoop::notify_forked(Core::EventLoop::ForkEvent::Child); Core::EventLoop::notify_forked(Core::EventLoop::ForkEvent::Child);
jobs.clear();
if (apply_rewirings() == IterationDecision::Break) if (apply_rewirings() == IterationDecision::Break)
_exit(126); _exit(126);
@ -732,9 +726,15 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
_exit(last_return_code); _exit(last_return_code);
} }
if (run_builtin(command, {}, last_return_code))
_exit(last_return_code);
if (invoke_function(command, last_return_code)) if (invoke_function(command, last_return_code))
_exit(last_return_code); _exit(last_return_code);
// We no longer need the jobs here.
jobs.clear();
int rc = execvp(argv[0], const_cast<char* const*>(argv.data())); int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0) { if (rc < 0) {
if (errno == ENOENT) { if (errno == ENOENT) {