Implement getc replacement

2 files changed, 26 insertions, 0 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 970eb5ea4..c737441a6 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -148,6 +148,7 @@ 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);
+int winansi_getc(FILE *stream);
 #define putchar winansi_putchar
 #define puts winansi_puts
 #define fwrite winansi_fwrite
@@ -156,6 +157,7 @@ int winansi_read(int fd, void *buf, size_t count);
 #define fprintf(...) winansi_fprintf(__VA_ARGS__)
 #define write winansi_write
 #define read winansi_read
+#define getc winansi_getc
 
 int winansi_get_terminal_width_height(struct winsize *win);
 
diff --git a/win32/winansi.c b/win32/winansi.c
index 8ebe7b1af..e2b18b274 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -17,6 +17,7 @@
 #undef puts
 #undef write
 #undef read
+#undef getc
 
 /*
  ANSI codes used by git: m, K
@@ -637,3 +638,26 @@ int winansi_read(int fd, void *buf, size_t count)
 
         return rv;
 }
+
+int winansi_getc(FILE *stream)
+{
+        int rv;
+
+        rv = getc(stream);
+        if (!isatty(fileno(stream)))
+                return rv;
+
+        init();
+
+        if (!console_in)
+                return rv;
+
+        if ( rv != EOF ) {
+                unsigned char c = (unsigned char)rv;
+                char *s = (char *)&c;
+                OemToCharBuff(s, s, 1);
+                rv = (int)c;
+        }
+
+        return rv;
+}