From 2984235570c2374adb9ee3234a61f193ee86d654 Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Fri, 23 Jun 2023 10:26:21 +0100
Subject: win32: reduce impact of euro support (2)
winansi_OemToCharBuff() needs to call the real OemToCharBuff(),
not itself!
(GitHub issue #335)
---
win32/winansi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/win32/winansi.c b/win32/winansi.c
index 45bb8806c..faae44dac 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -751,13 +751,14 @@ static BOOL winansi_CharToOem(LPCSTR s, LPSTR d)
return winansi_CharToOemBuff(s, d, strlen(s)+1);
}
+#undef OemToCharBuff
BOOL winansi_OemToCharBuff(LPCSTR s, LPSTR d, DWORD len)
{
WCHAR *buf;
int i;
if (GetConsoleCP() != 858)
- return OemToCharBuff(s, d, len);
+ return OemToCharBuffA(s, d, len);
if (!s || !d)
return FALSE;
@@ -779,6 +780,7 @@ BOOL winansi_OemToCharBuff(LPCSTR s, LPSTR d, DWORD len)
# undef CharToOem
# define CharToOemBuff winansi_CharToOemBuff
# define CharToOem winansi_CharToOem
+# define OemToCharBuff winansi_OemToCharBuff
#endif
static int ansi_emulate(const char *s, FILE *stream)
--
cgit v1.2.3-55-g6feb