win32: character conversion for fread(3)

Some applets use fread(3):  dd and od, for example.  Perform the
necessary conversion when input is coming from the console.

Costs 96-112 bytes.

2 files changed, 17 insertions, 0 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 34c8bfa3f..a95bf2e91 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -170,6 +170,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);
+size_t winansi_fread(void *ptr, size_t size, size_t nmemb, FILE *stream);
 int winansi_getc(FILE *stream);
 
 #define putchar winansi_putchar
@@ -186,6 +187,7 @@ int winansi_getc(FILE *stream);
 #define fprintf(...) winansi_fprintf(__VA_ARGS__)
 #define write winansi_write
 #define read winansi_read
+#define fread winansi_fread
 #define getc winansi_getc
 
 /*
diff --git a/win32/winansi.c b/win32/winansi.c
index 5a6c33350..ad0d92698 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -24,6 +24,7 @@ static BOOL charToConA(LPSTR s);
 #undef puts
 #undef write
 #undef read
+#undef fread
 #undef getc
 
 #define FOREGROUND_ALL (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)
@@ -1136,6 +1137,20 @@ int winansi_read(int fd, void *buf, size_t count)
         return rv;
 }
 
+size_t winansi_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
+{
+        int rv;
+
+        rv = fread(ptr, size, nmemb, stream);
+        if (!is_console_in(fileno(stream)))
+                return rv;
+
+        if (rv > 0)
+                conToCharBuffA(ptr, rv * size);
+
+        return rv;
+}
+
 int winansi_getc(FILE *stream)
 {
         int rv;