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

Shell: Fix event loop processing and backgrounding in subshells

Browse source
This commit is contained in:
AnotherTest 2020-09-07 22:45:31 +04:30 • committed by Andreas Kling
parent c3dbe77024
commit 54b453be57
3 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Shell/main.cpp
View file

@ -88,28 +88,8 @@ SavedFileDescriptors::~SavedFileDescriptors()
}
}
int main(int argc, char** argv)
void Shell::setup_signals()
{
Core::EventLoop loop;
Core::EventLoop::register_signal(SIGINT, [](int) {
s_shell->kill_job(s_shell->current_job(), SIGINT);
});
Core::EventLoop::register_signal(SIGWINCH, [](int) {
s_shell->kill_job(s_shell->current_job(), SIGWINCH);
});
Core::EventLoop::register_signal(SIGTTIN, [](int) {});
Core::EventLoop::register_signal(SIGTTOU, [](int) {});
Core::EventLoop::register_signal(SIGHUP, [](int) {
for (auto& it : s_shell->jobs)
s_shell->kill_job(it.value.ptr(), SIGHUP);
s_shell->save_history();
});
Core::EventLoop::register_signal(SIGCHLD, [](int) {
auto& jobs = s_shell->jobs;
Vector<u64> disowned_jobs;
@ -159,6 +139,31 @@ int main(int argc, char** argv)
job->unblock();
}
});
}
int main(int argc, char** argv)
{
Core::EventLoop loop;
Core::EventLoop::register_signal(SIGINT, [](int) {
s_shell->kill_job(s_shell->current_job(), SIGINT);
});
Core::EventLoop::register_signal(SIGWINCH, [](int) {
s_shell->kill_job(s_shell->current_job(), SIGWINCH);
});
Core::EventLoop::register_signal(SIGTTIN, [](int) {});
Core::EventLoop::register_signal(SIGTTOU, [](int) {});
Core::EventLoop::register_signal(SIGHUP, [](int) {
for (auto& it : s_shell->jobs)
s_shell->kill_job(it.value.ptr(), SIGHUP);
s_shell->save_history();
});
s_shell->setup_signals();
#ifndef __serenity__
sigset_t blocked;
@ -168,7 +173,7 @@ int main(int argc, char** argv)
pthread_sigmask(SIG_BLOCK, &blocked, NULL);
#endif
#ifdef __serenity__
if (pledge("stdio rpath wpath cpath proc exec tty accept sigaction", nullptr) < 0) {
if (pledge("stdio rpath wpath cpath proc exec tty accept sigaction unix fattr", nullptr) < 0) {
perror("pledge");
return 1;
}