Changeset 2911 in kBuild

Timestamp:

Sep 10, 2016 11:16:59 AM (9 years ago)

Author:

bird

Message:

err.c: format into string buffer and use fwrite to avoid getting split up error messages.

File:

• trunk/src/kmk/kmkbuiltin/err.c (modified) (6 diffs)

trunk/src/kmk/kmkbuiltin/err.c

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2005-2010 knut st. osmundsen <[email protected]>
+ * Copyright (c) 2005-2016 knut st. osmundsen <[email protected]>
  *
  * This file is part of kBuild.
@@ -34 +34 @@
 #include "err.h"
 
+#ifdef KBUILD_OS_WINDOWS
+/* This is a trick to speed up console output on windows. */
+# undef fwrite
+# define fwrite maybe_con_fwrite
+extern size_t maybe_con_fwrite(void const *, size_t, size_t, FILE *);
+#endif
+
 
 /** The current program name. */
@@ -43 +50 @@
     va_list args;
     int error = errno;
+
+    /* stderr is unbuffered, so try format the whole message and print it in
+       one go so it won't be split by other output. */
+    char szMsg[4096];
+    int cchMsg = snprintf(szMsg, sizeof(szMsg), "%s: ", g_progname);
+    if (cchMsg < sizeof(szMsg) - 1 && cchMsg > 0)
+    {
+        int cchMsg2;
+        va_start(args, fmt);
+        cchMsg += cchMsg2 = vsnprintf(&szMsg[cchMsg], sizeof(szMsg) - cchMsg, fmt, args);
+        va_end(args);
+
+        if (   cchMsg < sizeof(szMsg) - 1
+            && cchMsg2 >= 0)
+        {
+            cchMsg += cchMsg2 = snprintf(&szMsg[cchMsg], sizeof(szMsg) - cchMsg, ": %s\n", strerror(error));
+            if (   cchMsg < sizeof(szMsg) - 1
+                && cchMsg2 >= 0)
+            {
+                fwrite(szMsg, cchMsg, 1, stderr);
+                return eval;
+            }
+
+        }
+
+    }
+
+    /* fallback */
     fprintf(stderr, "%s: ", g_progname);
     va_start(args, fmt);
@@ -56 +91 @@
 {
     va_list args;
+
+    /* stderr is unbuffered, so try format the whole message and print it in
+       one go so it won't be split by other output. */
+    char szMsg[4096];
+    int cchMsg = snprintf(szMsg, sizeof(szMsg), "%s: ", g_progname);
+    if (cchMsg < sizeof(szMsg) - 1 && cchMsg > 0)
+    {
+        int cchMsg2;
+        va_start(args, fmt);
+        cchMsg += cchMsg2 = vsnprintf(&szMsg[cchMsg], sizeof(szMsg) - cchMsg, fmt, args);
+        va_end(args);
+
+        if (   cchMsg < sizeof(szMsg) - 1
+            && cchMsg2 >= 0)
+        {
+            szMsg[cchMsg++] = '\n';
+            fwrite(szMsg, cchMsg, 1, stderr);
+            return eval;
+        }
+
+    }
+
+    /* fallback */
     fprintf(stderr, "%s: ", g_progname);
     va_start(args, fmt);
@@ -69 +127 @@
     int error = errno;
     va_list args;
+
+    /* stderr is unbuffered, so try format the whole message and print it in
+       one go so it won't be split by other output. */
+    char szMsg[4096];
+    int cchMsg = snprintf(szMsg, sizeof(szMsg), "%s: ", g_progname);
+    if (cchMsg < sizeof(szMsg) - 1 && cchMsg > 0)
+    {
+        int cchMsg2;
+        va_start(args, fmt);
+        cchMsg += cchMsg2 = vsnprintf(&szMsg[cchMsg], sizeof(szMsg) - cchMsg, fmt, args);
+        va_end(args);
+
+        if (   cchMsg < sizeof(szMsg) - 1
+            && cchMsg2 >= 0)
+        {
+            cchMsg += cchMsg2 = snprintf(&szMsg[cchMsg], sizeof(szMsg) - cchMsg, ": %s\n", strerror(error));
+            if (   cchMsg < sizeof(szMsg) - 1
+                && cchMsg2 >= 0)
+            {
+                fwrite(szMsg, cchMsg, 1, stderr);
+                return;
+            }
+
+        }
+    }
+
+    /* fallback */
     fprintf(stderr, "%s: ", g_progname);
     va_start(args, fmt);
@@ -79 +164 @@
 {
     va_list args;
+
+    /* stderr is unbuffered, so try format the whole message and print it in
+       one go so it won't be split by other output. */
+    char szMsg[4096];
+    int cchMsg = snprintf(szMsg, sizeof(szMsg), "%s: ", g_progname);
+    if (cchMsg < sizeof(szMsg) - 1 && cchMsg > 0)
+    {
+        int cchMsg2;
+        va_start(args, fmt);
+        cchMsg += cchMsg2 = vsnprintf(&szMsg[cchMsg], sizeof(szMsg) - cchMsg, fmt, args);
+        va_end(args);
+
+        if (   cchMsg < sizeof(szMsg) - 1
+            && cchMsg2 >= 0)
+        {
+            szMsg[cchMsg++] = '\n';
+            fwrite(szMsg, cchMsg, 1, stderr);
+            return;
+        }
+
+    }
+
+    /* fallback */
     fprintf(stderr, "%s: ", g_progname);
     va_start(args, fmt);