From 4d8668e4b6bac0d7902dd677d540c700817b094b Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Tue, 3 Apr 2018 10:41:33 +0100 Subject: win32: simplify isatty replacement Don't treat input and output file descriptors differently: if we aren't connected to a console GetConsoleMode will fail for either. --- win32/winansi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/win32/winansi.c b/win32/winansi.c index e36f7565b..ad6016ddc 100644 --- a/win32/winansi.c +++ b/win32/winansi.c @@ -735,7 +735,6 @@ int mingw_isatty(int fd) if (result) { HANDLE handle = (HANDLE) _get_osfhandle(fd); - CONSOLE_SCREEN_BUFFER_INFO sbi; DWORD mode; if (handle == INVALID_HANDLE_VALUE) @@ -745,10 +744,7 @@ int mingw_isatty(int fd) if (GetFileType(handle) != FILE_TYPE_CHAR) return 0; - if (!fd) { - if (!GetConsoleMode(handle, &mode)) - return 0; - } else if (!GetConsoleScreenBufferInfo(handle, &sbi)) + if (!GetConsoleMode(handle, &mode)) return 0; } -- cgit v1.2.3-55-g6feb