isMsysPty doesn't seem to detect msys term anymore

it doesn't seem to to be repairable easily:
- `GetFileType(h)` doesn't return FILE_TYPE_PIPE
- `GetFileInformationByHandleEx()` also fails

Anyways, doesn't seem to be necessary for color_out -
`setWinTermAnsiColors(STD_OUTPUT_HANDLE))` succeeds.

For UTF-8 output, we may perhaps try to check env vars.

Author: MartinPulec

src/host.cpp

@@ -581,8 +581,14 @@ struct init_data *common_preinit(int argc, char *argv[])
         }
         is_win_utf8_terminal = (getenv("TERM") == nullptr &&
                           _isatty(fileno(stdout)) &&
-                          win_has_ancestor_process("WindowsTerminal.exe"))
-                || isMsysPty(fileno(stdout));
+                          win_has_ancestor_process("WindowsTerminal.exe"));
+        if (!is_win_utf8_terminal) { // check MSYS term
+                char *con            = getenv("MSYSCON");
+                char *lc_ctype       = getenv("LC_CTYPE");
+                is_win_utf8_terminal = con != nullptr && lc_ctype != nullptr &&
+                                       strcmp(con, "mintty.exe") == 0 &&
+                                       strstr(lc_ctype, ".UTF-8") != nullptr;
+        }
 #endif
         u8_to_mb_init(is_win_utf8_terminal); // setlocale(LC_CTYPE, "");
 

src/utils/color_out.c

@@ -75,61 +75,6 @@ static bool setWinTermAnsiColors(DWORD stream) {
 }
 #endif // defined _WIN32
 
-/// Taken from [rang](https://github.com/agauniyal/rang)
-bool
-isMsysPty(int fd)
-{
-#ifdef _WIN32
-        // Dynamic load for binary compatibility with old Windows
-        BOOL (*ptrGetFileInformationByHandleEx)(
-            HANDLE hFile, FILE_INFO_BY_HANDLE_CLASS FileInformationClass,
-            LPVOID lpFileInformation, DWORD dwBufferSize) = nullptr;
-        ptrGetFileInformationByHandleEx = (void *)
-            GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
-                           "GetFileInformationByHandleEx");
-        if (!ptrGetFileInformationByHandleEx) {
-                return false;
-        }
-
-        HANDLE h = (HANDLE) (intptr_t) _get_osfhandle(fd);
-        if (h == INVALID_HANDLE_VALUE) {
-                return false;
-        }
-
-        // Check that it's a pipe:
-        if (GetFileType(h) != FILE_TYPE_PIPE) {
-                return false;
-        }
-
-        // POD type is binary compatible with FILE_NAME_INFO from WinBase.h
-        // It have the same alignment and used to avoid UB in caller code
-        struct MY_FILE_NAME_INFO {
-                DWORD FileNameLength;
-                WCHAR FileName[MAX_PATH];
-        };
-
-        struct MY_FILE_NAME_INFO pNameInfo = { 0 };
-
-        // Check pipe name is template of
-        // {"cygwin-","msys-"}XXXXXXXXXXXXXXX-ptyX-XX
-        if (!ptrGetFileInformationByHandleEx(h, FileNameInfo, &pNameInfo,
-                                sizeof pNameInfo)) {
-                return false;
-        }
-        // std::wstring name(pNameInfo.FileName, pNameInfo.FileNameLength / sizeof(WCHAR));
-        if ((wcsstr(pNameInfo.FileName, L"msys-") == nullptr &&
-             wcsstr(pNameInfo.FileName, L"cygwin-") == nullptr) ||
-            wcsstr(pNameInfo.FileName, L"-pty") == nullptr) {
-                return false;
-        }
-
-        return true;
-#else
-        (void) fd;
-        return false;
-#endif
-}
-
 ADD_TO_PARAM("log-color", "* log-color[=no]\n"
                  "  Force enable/disable ANSI text formatting.\n");
 ADD_TO_PARAM("log-nocolor", "* log-nocolor\n"
@@ -155,8 +100,7 @@ is_output_color()
                 return strcmp(env_val, "0") != 0;
         }
 #ifdef _WIN32
-        return isMsysPty(fileno(stdout)) ||
-               (_isatty(fileno(stdout)) &&
+        return (_isatty(fileno(stdout)) &&
                 setWinTermAnsiColors(STD_OUTPUT_HANDLE));
 #else
         return isatty(fileno(stdout));

src/utils/color_out.h

@@ -98,7 +98,6 @@
 extern "C" {
 #endif
 
-bool isMsysPty(int fd);
 bool color_output_init(void);
 [[gnu::format(printf, 1, 2)]] int color_printf(const char *format, ...);