folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean-up (pipe handling)

Browse source
This commit is contained in:
Folkert van Heusden 2025-04-03 21:55:12 +02:00
parent 93119054fa
commit cf211d64a5
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
console_posix.cpp
View file

@ -19,16 +19,16 @@
console_posix::console_posix(std::atomic_uint32_t *const stop_event): console(stop_event)
{
#if !defined(_WIN32)
if (tcgetattr(STDIN_FILENO, &org_tty_opts) == -1 && errno != ENOTTY)
error_exit(true, "console_posix: tcgetattr failed");
if (isatty(STDIN_FILENO)) {
if (tcgetattr(STDIN_FILENO, &org_tty_opts) == -1)
error_exit(true, "console_posix: tcgetattr failed");
struct termios tty_opts_raw { };
cfmakeraw(&tty_opts_raw);
struct termios tty_opts_raw { };
cfmakeraw(&tty_opts_raw);
if (tcsetattr(STDIN_FILENO, TCSANOW, &tty_opts_raw) == -1 && errno != ENOTTY)
error_exit(true, "console_posix: tcsetattr failed");
setvbuf(stdin, nullptr, _IONBF, 0);
if (tcsetattr(STDIN_FILENO, TCSANOW, &tty_opts_raw) == -1)
error_exit(true, "console_posix: tcsetattr failed");
}
#endif
}
@ -37,7 +37,7 @@ console_posix::~console_posix()
stop_thread();
#if !defined(_WIN32)
if (tcsetattr(STDIN_FILENO, TCSANOW, &org_tty_opts) == -1 && errno != ENOTTY)
if (isatty(STDIN_FILENO) && tcsetattr(STDIN_FILENO, TCSANOW, &org_tty_opts) == -1)
error_exit(true, "~console_posix: tcsetattr failed");
#endif
}
@ -56,8 +56,11 @@ int console_posix::wait_for_char_ll(const short timeout)
#else
struct pollfd fds[] = { { STDIN_FILENO, POLLIN, 0 } };
if (poll(fds, 1, timeout) == 1 && fds[0].revents)
return getchar();
if (poll(fds, 1, timeout) == 1 && fds[0].revents) {
char buffer = 0;
read(STDIN_FILENO, &buffer, 1);
return buffer;
}
#endif
return -1;