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

Shell: Do not attempt to yank the TTY from background processes

Browse source 
They don't own the TTY anyway!
This commit is contained in:
AnotherTest 2020-08-15 23:20:39 +04:30 • committed by Andreas Kling
parent 217eca3d3f
commit cf18bff72a
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Shell/Shell.cpp
View file

@ -626,7 +626,7 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
job->on_exit = [](auto job) {
if (!job->exited())
return;
if (job->is_running_in_background())
if (job->is_running_in_background() && job->should_announce_exit())
fprintf(stderr, "Shell: Job %" PRIu64 "(%s) exited\n", job->job_id(), job->cmd().characters());
job->disown();
};
@ -670,10 +670,10 @@ NonnullRefPtrVector<Job> Shell::run_commands(Vector<AST::Command>& commands)
jobs_to_wait_for.append(*job);
} else {
if (command.is_pipe_source) {
job->set_running_in_background(true);
jobs_to_wait_for.append(*job);
} else if (command.should_notify_if_in_background) {
job->set_running_in_background(true);
restore_ios();
job->set_should_announce_exit(true);
}
}
}
@ -710,23 +710,26 @@ void Shell::block_on_job(RefPtr<Job> job)
if (!job)
return;
ScopeGuard io_restorer { [&]() {
if (job->exited() && !job->is_running_in_background()) {
restore_ios();
}
} };
Core::EventLoop loop;
job->on_exit = [&, old_exit = move(job->on_exit)](auto job) {
if (old_exit)
old_exit(job);
loop.quit(0);
};
if (job->exited()) {
restore_ios();
if (job->exited())
return;
}
loop.exec();
if (job->is_suspended())
job->print_status(Job::PrintStatusMode::Basic);
restore_ios();
}
String Shell::get_history_path()