RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 02:08:11 +00:00
Code Issues Activity Actions

Shell: Give the TTY to the foreground process

Browse source 
This fixes the bug with the shell not waiting for any foreground process
that attempts to read from the terminal in the Lagom build.
This commit is contained in:
AnotherTest 2020-08-04 22:37:47 +04:30 • committed by Andreas Kling
parent 984683cf34
commit 771751258e
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Shell/Shell.cpp
View file

@ -522,6 +522,12 @@ RefPtr<Job> Shell::run_command(const AST::Command& command)
if (child == 0) { if (child == 0) {
setpgid(0, 0); setpgid(0, 0);
tcsetattr(0, TCSANOW, &default_termios); tcsetattr(0, TCSANOW, &default_termios);
if (command.should_wait) {
auto pid = getpid();
auto pgid = getpgid(pid);
tcsetpgrp(STDOUT_FILENO, pgid);
tcsetpgrp(STDIN_FILENO, pgid);
}
for (auto& rewiring : rewirings) { for (auto& rewiring : rewirings) {
#ifdef SH_DEBUG #ifdef SH_DEBUG
dbgprintf("in %s<%d>, dup2(%d, %d)\n", argv[0], getpid(), rewiring.dest_fd, rewiring.source_fd); dbgprintf("in %s<%d>, dup2(%d, %d)\n", argv[0], getpid(), rewiring.dest_fd, rewiring.source_fd);
@ -618,7 +624,7 @@ Vector<RefPtr<Job>> Shell::run_commands(Vector<AST::Command>& commands)
jobs_to_wait_for.append(job); jobs_to_wait_for.append(job);
} else if (command.should_notify_if_in_background) { } else if (command.should_notify_if_in_background) {
job->set_running_in_background(true); job->set_running_in_background(true);
restore_stdin(); restore_ios();
} }
} }
} }
@ -641,9 +647,11 @@ bool Shell::run_file(const String& filename, bool explicitly_invoked)
run_command(data); run_command(data);
return true; return true;
} }
void Shell::restore_stdin() void Shell::restore_ios()
{ {
tcsetattr(0, TCSANOW, &termios); tcsetattr(0, TCSANOW, &termios);
tcsetpgrp(STDOUT_FILENO, m_pid);
tcsetpgrp(STDIN_FILENO, m_pid);
} }
void Shell::block_on_job(RefPtr<Job> job) void Shell::block_on_job(RefPtr<Job> job)
@ -660,13 +668,13 @@ void Shell::block_on_job(RefPtr<Job> job)
loop.quit(0); loop.quit(0);
}; };
if (job->exited()) { if (job->exited()) {
restore_stdin(); restore_ios();
return; return;
} }
loop.exec(); loop.exec();
restore_stdin(); restore_ios();
} }
String Shell::get_history_path() String Shell::get_history_path()
@ -1030,7 +1038,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_option(const String& program_
bool Shell::read_single_line() bool Shell::read_single_line()
{ {
restore_stdin(); restore_ios();
auto line_result = editor->get_line(prompt()); auto line_result = editor->get_line(prompt());
if (line_result.is_error()) { if (line_result.is_error()) {

2
Shell/Shell.h
View file

@ -132,7 +132,7 @@ public:
Vector<Line::CompletionSuggestion> complete_user(const String&, size_t offset); Vector<Line::CompletionSuggestion> complete_user(const String&, size_t offset);
Vector<Line::CompletionSuggestion> complete_option(const String&, const String&, size_t offset); Vector<Line::CompletionSuggestion> complete_option(const String&, const String&, size_t offset);
void restore_stdin(); void restore_ios();
u64 find_last_job_id() const; u64 find_last_job_id() const;
const Job* find_job(u64 id); const Job* find_job(u64 id);

1
Shell/main.cpp
View file

@ -131,6 +131,7 @@ int main(int argc, char** argv)
sigset_t blocked; sigset_t blocked;
sigemptyset(&blocked); sigemptyset(&blocked);
sigaddset(&blocked, SIGTTOU); sigaddset(&blocked, SIGTTOU);
sigaddset(&blocked, SIGTTIN);
pthread_sigmask(SIG_BLOCK, &blocked, NULL); pthread_sigmask(SIG_BLOCK, &blocked, NULL);
#endif #endif
#ifdef __serenity__ #ifdef __serenity__