Changeset 3211 for trunk/src/kmk

Timestamp:

Mar 29, 2018, 5:00:52 PM (7 years ago)

Author:

bird

Message:

kmk/output.c: membuf_dump must set stdout+stderr to _O_BINARY while dumping buffered stuff, as it already has be subject to \n -> \r\n conversion and doesn't benefit from doing it again.

File:

• trunk/src/kmk/output.c (modified) (5 diffs)

trunk/src/kmk/output.c

@@ -93 +93 @@
          We want to keep this lock for as little time as possible.  */
       void *sem = acquire_semaphore ();
+# if defined (KBUILD_OS_WINDOWS) || defined (KBUILD_OS_OS2) || defined (KBUILD_OS_DOS)
+      int prev_mode_out = _setmode (fileno (stdout), _O_BINARY);
+      int prev_mode_err = _setmode (fileno (stderr), _O_BINARY);
+# endif
 
 # ifndef KMK /* this drives me bananas. */
@@ -161 +165 @@
 
       /* Exit the critical section.  */
+# if defined (KBUILD_OS_WINDOWS) || defined (KBUILD_OS_OS2) || defined (KBUILD_OS_DOS)
+      _setmode (fileno (stdout), prev_mode_out);
+      _setmode (fileno (stderr), prev_mode_err);
+# endif
       if (sem)
         release_semaphore (sem);
@@ -404 +412 @@
     {
       FILE *f = is_err ? stderr : stdout;
-# ifdef KBUILD_OS_WINDOWS
-      /* On windows we need to disable \n -> \r\n converts that is common on
+# if defined (KBUILD_OS_WINDOWS) || defined (KBUILD_OS_OS2) || defined (KBUILD_OS_DOS)
+      /* On DOS platforms we need to disable \n -> \r\n converts that is common on
          standard output/error.  Also optimize for console output. */
       int saved_errno;
@@ -692 +700 @@
 #endif
 
-#ifdef WINDOWS32
+# if defined (KBUILD_OS_WINDOWS) || defined (KBUILD_OS_OS2) || defined (KBUILD_OS_DOS)
   int prev_mode;
 
@@ -719 +727 @@
     }
 
-#ifdef WINDOWS32
+# if defined (KBUILD_OS_WINDOWS) || defined (KBUILD_OS_OS2) || defined (KBUILD_OS_DOS)
   /* Switch "to" back to its original mode, so that log messages by
      Make have the same EOL format as without --output-sync.  */