Changeset 3188 for trunk/src/lib/maybe_con_fwrite.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/lib/maybe_con_fwrite.c (modified) (6 diffs)

trunk/src/lib/maybe_con_fwrite.c

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2016 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
+ * Copyright (c) 2016-2018 knut st. osmundsen <bird-kBuild-spamx@anduin.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -33 +33 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#include "console.h"
 #ifdef KBUILD_OS_WINDOWS
 # include <windows.h>
 #endif
 #include <errno.h>
-#include <stdio.h>
 #ifdef _MSC_VER
-# include <io.h>
 # include <conio.h>
 #endif
-
 
 
@@ -69 +67 @@
         if (fd >= 0)
         {
-            if (isatty(fd))
+            HANDLE hCon = (HANDLE)_get_osfhandle(fd);
+            if (   hCon != INVALID_HANDLE_VALUE
+                && hCon != NULL)
             {
-                HANDLE hCon = (HANDLE)_get_osfhandle(fd);
-                if (   hCon != INVALID_HANDLE_VALUE
-                    && hCon != NULL)
+                if (is_console_handle((intptr_t)hCon))
                 {
                     size_t   cbToWrite = cbUnit * cUnits;
@@ -85 +83 @@
                             s_uConsoleCp = GetConsoleCP();
 
-                        cwcToWrite = MultiByteToWideChar(s_uConsoleCp, 0 /*dwFlags*/, pvBuf, (int)cbToWrite, pawcTmp, (int)(cwcTmp - 1));
+                        cwcToWrite = MultiByteToWideChar(s_uConsoleCp, 0 /*dwFlags*/, pvBuf, (int)cbToWrite,
+                                                         pawcTmp, (int)(cwcTmp - 1));
                         if (cwcToWrite > 0)
                         {
@@ -92 +91 @@
 
                             /* Let the CRT do the rest.  At least the Visual C++ 2010 CRT
-                               sources indicates _cputws will do the right thing we want.  */
+                               sources indicates _cputws will do the right thing.  */
                             fflush(pFile);
                             rc = _cputws(pawcTmp);
@@ -113 +112 @@
     return fwrite(pvBuf, cbUnit, cUnits, pFile);
 }
+