Implement puts replacement to handle OEM codepages

2 files changed, 26 insertions, 4 deletions

diff --git a/include/mingw.h b/include/mingw.h
index a1a9f5f30..23472e1b1 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -141,11 +141,13 @@ int mingw_pclose(FILE *fd);
  */
 
 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_printf(const char *format, ...) __attribute__((format (printf, 1, 2)));
 int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format (printf, 2, 3)));
 #define putchar winansi_putchar
+#define puts winansi_puts
 #define fwrite winansi_fwrite
 #define fputs winansi_fputs
 #define printf(...) winansi_printf(__VA_ARGS__)
diff --git a/win32/winansi.c b/win32/winansi.c
index cafad031d..ba3167425 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -14,6 +14,7 @@
 #undef fputs
 #undef putchar
 #undef fwrite
+#undef puts
 /* TODO: write */
 
 /*
@@ -314,19 +315,20 @@ static const char *set_attr(const char *str)
 static int ansi_emulate(const char *s, FILE *stream)
 {
         int rv = 0;
+        const char *t;
         char *pos, *str;
         size_t out_len, cur_len;
         static size_t max_len = 0;
         static char *mem = NULL;
 
         /* if no special treatment is required output the string as-is */
-        for ( pos=s; *pos; ++pos ) {
-                if ( *pos == '\033' || *pos > 0x7f ) {
+        for ( t=s; *t; ++t ) {
+                if ( *t == '\033' || *t > 0x7f ) {
                         break;
                 }
         }
 
-        if ( *pos == '\0' ) {
+        if ( *t == '\0' ) {
                 return fputs(s, stream) == EOF ? EOF : strlen(s);
         }
 
@@ -378,7 +380,7 @@ int winansi_putchar(int c)
         char t = c;
         char *s = &t;
 
-        if (!isatty(0))
+        if (!isatty(STDOUT_FILENO))
                 return putchar(c);
 
         init();
@@ -390,6 +392,24 @@ int winansi_putchar(int c)
         return putchar(t) == EOF ? EOF : c;
 }
 
+int winansi_puts(const char *s)
+{
+        int rv;
+
+        if (!isatty(STDOUT_FILENO))
+                return puts(s);
+
+        init();
+
+        if (!console)
+                return puts(s);
+
+        rv = ansi_emulate(s, stdout);
+        putchar('\n');
+
+        return rv;
+}
+
 size_t winansi_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
         size_t lsize, lmemb;