morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust code to query terminal size and other attributes (#39832)

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-11-25 11:43:26 +01:00
committed by GitHub
parent 27971114d5 e698ee5705
commit 7fd5f7aade
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2071,7 +2071,9 @@ int terminal_get_cursor_position(
}
finish:
RET_GATHER(r, RET_NERRNO(tcsetattr(input_fd, TCSANOW, &old_termios)));
/* We ignore failure here and in similar cases below. We already got a reply and if cleanup fails,
* this doesn't change the validity of the result. */
(void) tcsetattr(input_fd, TCSANOW, &old_termios);
return r;
}
@@ -2260,7 +2262,6 @@ static int scan_background_color_response(
}
int get_default_background_color(double *ret_red, double *ret_green, double *ret_blue) {
_cleanup_close_ int nonblock_input_fd = -EBADF;
int r;
assert(ret_red);
@@ -2280,27 +2281,26 @@ int get_default_background_color(double *ret_red, double *ret_green, double *ret
return 0;
}
/* Open a 2nd input fd, in non-blocking mode, so that we won't ever hang in read()
* should someone else process the POLLIN. Do all subsequent operations on the new fd. */
_cleanup_close_ int nonblock_input_fd = r = fd_reopen(STDIN_FILENO, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
if (r < 0)
return r;
struct termios old_termios;
if (tcgetattr(STDIN_FILENO, &old_termios) < 0)
if (tcgetattr(nonblock_input_fd, &old_termios) < 0)
return -errno;
struct termios new_termios = old_termios;
termios_disable_echo(&new_termios);
if (tcsetattr(STDIN_FILENO, TCSANOW, &new_termios) < 0)
if (tcsetattr(nonblock_input_fd, TCSANOW, &new_termios) < 0)
return -errno;
r = loop_write(STDOUT_FILENO, ANSI_OSC "11;?" ANSI_ST, SIZE_MAX);
if (r < 0)
goto finish;
/* Open a 2nd input fd, in non-blocking mode, so that we won't ever hang in read() should someone
* else process the POLLIN. */
nonblock_input_fd = r = fd_reopen(STDIN_FILENO, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
if (r < 0)
goto finish;
usec_t end = usec_add(now(CLOCK_MONOTONIC), CONSOLE_REPLY_WAIT_USEC);
char buf[STRLEN(ANSI_OSC "11;rgb:0/0/0" ANSI_ST)]; /* shortest possible reply */
size_t buf_full = 0;
@@ -2359,7 +2359,7 @@ int get_default_background_color(double *ret_red, double *ret_green, double *ret
}
finish:
RET_GATHER(r, RET_NERRNO(tcsetattr(STDIN_FILENO, TCSANOW, &old_termios)));
(void) tcsetattr(nonblock_input_fd, TCSANOW, &old_termios);
return r;
}
@@ -2369,7 +2369,6 @@ int terminal_get_size_by_dsr(
unsigned *ret_rows,
unsigned *ret_columns) {
_cleanup_close_ int nonblock_input_fd = -EBADF;
int r;
assert(input_fd >= 0);
@@ -2397,14 +2396,20 @@ int terminal_get_size_by_dsr(
if (r < 0)
return log_debug_errno(r, "Called with distinct input/output fds: %m");
/* Open a 2nd input fd, in non-blocking mode, so that we won't ever hang in read()
* should someone else process the POLLIN. Do all subsequent operations on the new fd. */
_cleanup_close_ int nonblock_input_fd = r = fd_reopen(input_fd, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
if (r < 0)
return r;
struct termios old_termios;
if (tcgetattr(input_fd, &old_termios) < 0)
if (tcgetattr(nonblock_input_fd, &old_termios) < 0)
return log_debug_errno(errno, "Failed to get terminal settings: %m");
struct termios new_termios = old_termios;
termios_disable_echo(&new_termios);
if (tcsetattr(input_fd, TCSANOW, &new_termios) < 0)
if (tcsetattr(nonblock_input_fd, TCSANOW, &new_termios) < 0)
return log_debug_errno(errno, "Failed to set new terminal settings: %m");
unsigned saved_row = 0, saved_column = 0;
@@ -2417,13 +2422,6 @@ int terminal_get_size_by_dsr(
if (r < 0)
goto finish;
/* Open a 2nd input fd, in non-blocking mode, so that we won't ever hang in read() should someone
* else process the POLLIN. */
nonblock_input_fd = r = fd_reopen(input_fd, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
if (r < 0)
goto finish;
usec_t end = usec_add(now(CLOCK_MONOTONIC), CONSOLE_REPLY_WAIT_USEC);
char buf[STRLEN("\x1B[1;1R")]; /* The shortest valid reply possible */
size_t buf_full = 0;
@@ -2514,9 +2512,9 @@ int terminal_get_size_by_dsr(
finish:
/* Restore cursor position */
if (saved_row > 0 && saved_column > 0)
RET_GATHER(r, terminal_set_cursor_position(output_fd, saved_row, saved_column));
(void) terminal_set_cursor_position(output_fd, saved_row, saved_column);
(void) tcsetattr(nonblock_input_fd, TCSANOW, &old_termios);
RET_GATHER(r, RET_NERRNO(tcsetattr(input_fd, TCSANOW, &old_termios)));
return r;
}
@@ -2669,7 +2667,6 @@ int terminal_get_terminfo_by_dcs(int fd, char **ret_name) {
}
finish:
/* We ignore failure here. We already got a reply and if cleanup fails, we can't help that. */
(void) tcsetattr(fd, TCSANOW, &old_termios);
return r;
}