Commit e00c4e4
src: fix the false isatty() issue on IBMi
On IBMi PASE isatty() always returns true for stdin, stdout and stderr.
Use ioctl() instead to identify whether it's actually a TTY.
PR-URL: #30829
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>1 parent 1d4e3d5 commit e00c4e4
1 file changed
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -97,6 +97,9 @@ | |||
| 97 | 97 | #include <unistd.h> // STDIN_FILENO, STDERR_FILENO | |
| 98 | 98 | #endif | |
| 99 | 99 | ||
| 100 | + #ifdef __PASE__ | ||
| 101 | + #include <sys/ioctl.h> // ioctl | ||
| 102 | + #endif | ||
| 100 | 103 | // ========== global C++ headers ========== | |
| 101 | 104 | ||
| 102 | 105 | #include <cerrno> | |
@@ -521,7 +524,14 @@ inline void PlatformInit() { | |||
| 521 | 524 | while (s.flags == -1 && errno == EINTR); // NOLINT | |
| 522 | 525 | CHECK_NE(s.flags, -1); | |
| 523 | 526 | ||
| 527 | + #ifdef __PASE__ | ||
| 528 | + // On IBMi PASE isatty() always returns true for stdin, stdout and stderr. | ||
| 529 | + // Use ioctl() instead to identify whether it's actually a TTY. | ||
| 530 | + if (ioctl(fd, TXISATTY + 0x81, nullptr) == -1 && errno == ENOTTY) | ||
| 531 | + continue; | ||
| 532 | + #else | ||
| 524 | 533 | if (!isatty(fd)) continue; | |
| 534 | + #endif | ||
| 525 | 535 | s.isatty = true; | |
| 526 | 536 | ||
| 527 | 537 | do | |
0 commit comments