Implement read replacement to handle OEM codepages

2 files changed, 28 insertions, 0 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 17db36c05..970eb5ea4 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -147,6 +147,7 @@ int winansi_fputs(const char *str, FILE *stream);
 int winansi_printf(const char *format, ...) __attribute__((format (printf, 1, 2)));
 int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format (printf, 2, 3)));
 int winansi_write(int fd, const void *buf, size_t count);
+int winansi_read(int fd, void *buf, size_t count);
 #define putchar winansi_putchar
 #define puts winansi_puts
 #define fwrite winansi_fwrite
@@ -154,6 +155,7 @@ int winansi_write(int fd, const void *buf, size_t count);
 #define printf(...) winansi_printf(__VA_ARGS__)
 #define fprintf(...) winansi_fprintf(__VA_ARGS__)
 #define write winansi_write
+#define read winansi_read
 
 int winansi_get_terminal_width_height(struct winsize *win);
 
diff --git a/win32/winansi.c b/win32/winansi.c
index 491285275..8ebe7b1af 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -16,6 +16,7 @@
 #undef fwrite
 #undef puts
 #undef write
+#undef read
 
 /*
  ANSI codes used by git: m, K
@@ -25,6 +26,7 @@
 */
 
 static HANDLE console;
+static HANDLE console_in;
 static WORD plain_attr;
 static WORD attr;
 static int negative;
@@ -37,6 +39,10 @@ static void init(void)
         if (initialized)
                 return;
 
+        console_in = GetStdHandle(STD_INPUT_HANDLE);
+        if (console_in == INVALID_HANDLE_VALUE)
+                console_in = NULL;
+
         console = GetStdHandle(STD_OUTPUT_HANDLE);
         if (console == INVALID_HANDLE_VALUE)
                 console = NULL;
@@ -611,3 +617,23 @@ int winansi_write(int fd, const void *buf, size_t count)
 
         return ansi_emulate_write(fd, buf, count);
 }
+
+int winansi_read(int fd, void *buf, size_t count)
+{
+        int rv;
+
+        rv = read(fd, buf, count);
+        if (!isatty(fd))
+                return rv;
+
+        init();
+
+        if (!console_in)
+                return rv;
+
+        if ( rv > 0 ) {
+                OemToCharBuff(buf, buf, rv);
+        }
+
+        return rv;
+}