Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 17:44:56 +09:00
Code Activity

top: Disable echo and line buffering on startup

Browse source 
This means we no longer show any characters the user types while top
is running.

Disabling line buffering has the same effect as enabling
non-blocking I/O, but it doesn't crash the terminal when we exit the
program without restoring stdin to its original state. This would
previously happen when a SIGKILL signal was received, for example.
This commit is contained in:
Tim Ledbetter 2023-07-24 17:19:51 +01:00 • committed by Daniel Bertalan
parent 41e7c5766e
commit 256084b0b9
Notes: sideshowbarker 2024-07-17 05:23:40 +09:00
1 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Userland/Utilities/top.cpp
View file

@ -201,18 +201,26 @@ static bool check_quit()
return c == 'q' || c == 'Q';
}
static int g_old_stdin;
static struct termios g_previous_tty_settings;
static void restore_stdin()
static ErrorOr<void> setup_tty()
{
fcntl(STDIN_FILENO, F_SETFL, g_old_stdin);
g_previous_tty_settings = TRY(Core::System::tcgetattr(STDOUT_FILENO));
struct termios raw = g_previous_tty_settings;
raw.c_lflag &= ~(ECHO | ICANON);
// Disable echo and line buffering
TRY(Core::System::tcsetattr(STDOUT_FILENO, TCSAFLUSH, raw));
return {};
}
static void enable_nonblocking_stdin()
static void restore_tty()
{
g_old_stdin = fcntl(STDIN_FILENO, F_GETFL);
fcntl(STDIN_FILENO, F_SETFL, g_old_stdin | O_NONBLOCK);
atexit(restore_stdin);
auto maybe_error = Core::System::tcsetattr(STDOUT_FILENO, TCSAFLUSH, g_previous_tty_settings);
if (maybe_error.is_error())
warnln("Failed to reset original terminal state: {}", strerror(maybe_error.error().code()));
}
ErrorOr<int> serenity_main(Main::Arguments arguments)
@ -225,15 +233,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::signal(SIGWINCH, [](int) {
g_window_size_changed = true;
}));
TRY(Core::System::signal(SIGINT, [](int) {
exit(0);
}));
TRY(Core::System::pledge("stdio rpath tty"));
TopOption top_option;
parse_args(arguments, top_option);
enable_nonblocking_stdin();
TRY(setup_tty());
ScopeGuard restore_tty_guard([] {
restore_tty();
});
auto restore_tty_sigaction_handler = [](auto) {
restore_tty();
exit(1);
};
struct sigaction restore_tty_action;
restore_tty_action.sa_handler = restore_tty_sigaction_handler;
TRY(Core::System::sigaction(SIGINT, &restore_tty_action, nullptr));
TRY(Core::System::sigaction(SIGTERM, &restore_tty_action, nullptr));
TRY(Core::System::pledge("stdio rpath tty"));
Vector<ThreadData*> threads;
auto prev = TRY(get_snapshot(top_option.pids_to_filter_by));