Changeset 3188 for trunk/src/kmk/kmkbuiltin/mscfakes.c

Timestamp:

Mar 24, 2018, 4:32:26 PM (7 years ago)

Author:

bird

Message:

kmk,lib,kWorker: Console output on windows cleanups.

File:

• trunk/src/kmk/kmkbuiltin/mscfakes.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/mscfakes.c

@@ -45 +45 @@
 #undef lutimes
 
-extern ssize_t maybe_con_write(int, void const *, size_t);
+#include "console.h"
+
 
 
@@ -477 +478 @@
     {
         /* Console output optimization: */
-        if (cbSrc > 0 && isatty(fd))
+        if (cbSrc > 0 && is_console(fd))
             return maybe_con_write(fd, pvSrc, cbSrc);
 
@@ -586 +587 @@
 ssize_t writev(int fd, const struct iovec *vector, int count)
 {
-    int size = 0;
-    int i;
-    for (i = 0; i < count; i++)
-    {
-        int cb = msc_write(fd, vector[i].iov_base, (int)vector[i].iov_len);
-        if (cb < 0)
-            return cb;
-        size += cb;
+    ssize_t size = 0;
+    if (count > 0)
+    {
+        int i;
+
+        /* To get consistent console output, we must try combine the segments
+           when outputing to the console. */
+        if (count > 1 && is_console(fd))
+        {
+            char   *pbTmp;
+            ssize_t cbTotal;
+            if (count == 1)
+                return maybe_con_write(fd, vector[0].iov_base, (int)vector[0].iov_len);
+
+            cbTotal = 0;
+            for (i = 0; i < count; i++)
+                cbTotal += vector[i].iov_len;
+            pbTmp = malloc(cbTotal);
+            if (pbTmp)
+            {
+                char *pbCur = pbTmp;
+                for (i = 0; i < count; i++)
+                {
+                    memcpy(pbCur, vector[i].iov_base, vector[i].iov_len);
+                    pbCur += vector[i].iov_len;
+                }
+                size = maybe_con_write(fd, pbTmp, cbTotal);
+                free(pbTmp);
+                return size;
+            }
+
+            /* fall back on segment by segment output. */
+        }
+
+        for (i = 0; i < count; i++)
+        {
+            int cb = msc_write(fd, vector[i].iov_base, (int)vector[i].iov_len);
+            if (cb < 0)
+                return cb;
+            size += cb;
+        }
     }
     return size;