shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-03 17:47:28 +03:00
Code

terminal-util: trivial modernizations for reset_terminal_fd()

Browse Source
This commit is contained in:
Lennart Poettering 2023-11-22 13:08:17 +01:00
parent 097445d0e4
commit 68e4c637f8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/basic/terminal-util.c
View File

@ -233,7 +233,7 @@ int ask_string(char **ret, const char *text, ...) {
int reset_terminal_fd(int fd, bool switch_to_text) {
struct termios termios;
int r = 0;
int r;
/* Set terminal to some sane defaults */
@ -256,7 +256,9 @@ int reset_terminal_fd(int fd, bool switch_to_text) {
/* Set default keyboard mode */
(void) vt_reset_keyboard(fd);
r = vt_reset_keyboard(fd);
if (r < 0)
log_debug_errno(r, "Failed to reset VT keyboard, ignoring: %m");
if (tcgetattr(fd, &termios) < 0) {
r = log_debug_errno(errno, "Failed to get terminal parameters: %m");
@ -290,8 +292,7 @@ int reset_terminal_fd(int fd, bool switch_to_text) {
termios.c_cc[VTIME] = 0;
termios.c_cc[VMIN] = 1;
if (tcsetattr(fd, TCSANOW, &termios) < 0)
r = -errno;
r = RET_NERRNO(tcsetattr(fd, TCSANOW, &termios));
finish:
/* Just in case, flush all crap out */