SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

terminal-util: add new helper terminal_reset_defensive() that combines reset-by-ioctl and reset-by-sequence reasonably

Browse Source
This commit is contained in:
Lennart Poettering
2024-07-19 11:41:43 +02:00
parent ce3a1593bc
commit cfac09083b
8 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/exec-invoke.c
+2 -2
View File
@@ -358,7 +358,7 @@ static int setup_input(
(void) ioctl(STDIN_FILENO, TIOCSCTTY, context->std_input == EXEC_INPUT_TTY_FORCE);
if (context->tty_reset)
(void) reset_terminal_fd(STDIN_FILENO, /* switch_to_text= */ true);
(void) terminal_reset_defensive(STDIN_FILENO, /* switch_to_text= */ true);
(void) exec_context_apply_tty_size(context, STDIN_FILENO, /* tty_path= */ NULL);
}
@@ -675,7 +675,7 @@ static int setup_confirm_stdio(
if (r < 0)
return r;
r = reset_terminal_fd(fd, /* switch_to_text= */ true);
r = terminal_reset_defensive(fd, /* switch_to_text= */ true);
if (r < 0)
return r;