Merge branch 'master' into test-suite

[xonotic/gmqcc.git] / con.c

diff --git a/con.c b/con.c
index 7ab5fcbe4caa398dd9a81ab9d5ed389e32f6032e..8073a5723d71286568e5d0c164d3e34059af924f 100644 (file)
--- a/con.c
+++ b/con.c
@@ -118,7 +118,7 @@ static void win_fputs(char *str, FILE *f) {
     
     CONSOLE_SCREEN_BUFFER_INFO cinfo;
     GetConsoleScreenBufferInfo(
-        (h == stdout) ?
+        (GMQCC_IS_STDOUT(h)) ?
             GetStdHandle(STD_OUTPUT_HANDLE) :
             GetStdHandle(STD_ERROR_HANDLE), &cinfo
     );
@@ -172,7 +172,7 @@ static void win_fputs(char *str, FILE *f) {
     }
     /* restore */
     SetConsoleTextAttribute(
-        (h == stdout) ?
+        (GMQCC_IS_STDOUT(h)) ?
         GetStdHandle(STD_OUTPUT_HANDLE) :
         GetStdHandle(STD_ERROR_HANDLE),
         icolor
@@ -272,7 +272,7 @@ int con_change(const char *out, const char *err) {
     con_close();
     
     if (GMQCC_IS_DEFINE((FILE*)out)) {
-        console.handle_out = (((FILE*)err) == stdout) ? stdout : stderr;
+        console.handle_out = (((FILE*)out) == stdout) ? stdout : stderr;
         con_enablecolor();
     } else if (!(console.handle_out = fopen(out, "w"))) return 0;
     
@@ -281,6 +281,10 @@ int con_change(const char *out, const char *err) {
         con_enablecolor();
     } else if (!(console.handle_err = fopen(err, "w"))) return 0;
     
+    // no buffering
+    setvbuf(console.handle_out, NULL, _IONBF, 0);
+    setvbuf(console.handle_err, NULL, _IONBF, 0);
+    
     return 1;
 }
 
@@ -312,7 +316,6 @@ int con_out(const char *fmt, ...) {
     return   ln;
 }
 
-
 /*
  * Utility console message writes for lexer contexts.  These will allow
  * for reporting of file:line based on lexer context, These are used
@@ -326,21 +329,14 @@ void con_vprintmsg(int level, const char *name, size_t line, const char *msgtype
         CON_RED
     };
     
-    int   err   = !!(level == LVL_ERROR);
-    int   color = (err) ? console.color_err : console.color_out;
+    int  err                        = !!(level == LVL_ERROR);
+    int  color                      = (err) ? console.color_err : console.color_out;
+    int (*print)(const char *, ...) = (err) ? &con_err          : &con_out;
     
-    /* this might confuse you :P */
-    ((err) ? &con_err : &con_out)(
-        (color) ? 
-            "\033[0;%dm%s:%d: \033[0;%dm%s: \033[0m" : 
-            "%s:%d: %s: ",
-            
-        CON_CYAN,
-        name,
-        (int)line,
-        sel[level],
-        msgtype
-    );
+    if (color)
+        print("\033[0;%dm%s:%d: \033[0;%dm%s: \033[0m", CON_CYAN, name, (int)line, sel[level], msgtype);
+    else
+        print("%s:%d: %s: ", name, (int)line, msgtype);
         
     con_verr(msg, ap);
     fprintf (stderr, "\n");