winansi: intercept calls to fputc(3)

Perform code page translation for fputc(3).  It's only used in a
few places but is needed to fix things like:

   $ echo € | dos2unix
   Ç
   $ paste -d € file1 file2
   1Ç2

Unfortunately it breaks the inventive use of dos2unix in GitHub
issue #203.

2 files changed, 21 insertions, 1 deletions

diff --git a/include/mingw.h b/include/mingw.h
index d70bc26e6..8af2e3938 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -152,6 +152,7 @@ int winansi_putchar(int c);
 int winansi_puts(const char *s);
 size_t winansi_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);
 int winansi_fputs(const char *str, FILE *stream);
+int winansi_fputc(int c, FILE *stream);
 int winansi_vsnprintf(char *buf, size_t size, const char *format, va_list list);
 int winansi_vfprintf(FILE *stream, const char *format, va_list list);
 int winansi_printf(const char *format, ...) __attribute__((format (printf, 1, 2)));
@@ -163,6 +164,7 @@ int winansi_getc(FILE *stream);
 #define puts winansi_puts
 #define fwrite winansi_fwrite
 #define fputs winansi_fputs
+#define fputc winansi_fputc
 #if !defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO
 #define vsnprintf(buf, size, ...) winansi_vsnprintf(buf, size,  __VA_ARGS__)
 #endif
diff --git a/win32/winansi.c b/win32/winansi.c
index 8ec75a4e4..3767e7534 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -14,6 +14,7 @@
 #undef printf
 #undef fprintf
 #undef fputs
+#undef fputc
 #undef putchar
 #undef fwrite
 #undef puts
@@ -635,7 +636,7 @@ int winansi_putchar(int c)
                 return putchar(c);
 
         CharToOemBuff(s, s, 1);
-        return putchar(t) == EOF ? EOF : c;
+        return putchar(t) == EOF ? EOF : (unsigned char)c;
 }
 
 int winansi_puts(const char *s)
@@ -720,6 +721,23 @@ int winansi_fputs(const char *str, FILE *stream)
         return ansi_emulate(str, stream) == EOF ? EOF : 0;
 }
 
+int winansi_fputc(int c, FILE *stream)
+{
+        int ret;
+        char t = c;
+        char *s = &t;
+
+        if (!is_console(fileno(stream))) {
+                SetLastError(0);
+                if ((ret=fputc(c, stream)) == EOF)
+                        check_pipe(stream);
+                return ret;
+        }
+
+        CharToOemBuff(s, s, 1);
+        return fputc(t, stream) == EOF ? EOF : (unsigned char )c;
+}
+
 #if !defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO
 /*
  * Prior to Windows 10 vsnprintf was incompatible with the C99 standard.