shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

terminal-util: try to avoid reading more from terminal than we need in get_default_background_color()

Browse Source
This commit is contained in:
Lennart Poettering 2024-07-17 15:56:15 +02:00
parent e2d66781ee
commit abe8e99ee6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1830,11 +1830,11 @@ int get_default_background_color(double *ret_red, double *ret_green, double *ret
goto finish;
usec_t end = usec_add(now(CLOCK_MONOTONIC), 100 * USEC_PER_MSEC);
char buf[256];
char buf[STRLEN("\x1B]11;rgb:0/0/0\x07")]; /* shortest possible reply */
size_t buf_full = 0;
BackgroundColorContext context = {};
for (;;) {
for (bool first = true;; first = false) {
if (buf_full == 0) {
usec_t n = now(CLOCK_MONOTONIC);
@ -1851,7 +1851,10 @@ int get_default_background_color(double *ret_red, double *ret_green, double *ret
goto finish;
}
ssize_t l = read(STDIN_FILENO, buf, sizeof(buf));
/* On the first try, read multiple characters, i.e. the shortest valid
* reply. Afterwards read byte-wise, since we don't want to read too much, and
* unnecessarily drop too many characters from the input queue. */
ssize_t l = read(STDIN_FILENO, buf, first ? sizeof(buf) : 1);
if (l < 0) {
r = -errno;
goto finish;