Changeset 3547 for trunk/src/lib/msc_buffered_printf.c

Timestamp:

Jan 29, 2022, 3:39:47 AM (3 years ago)

Author:

bird

Message:

lib: Changed the console-optimization wrappers to use the get_crt_codepage() function as that's more appropriate than GetConsoleCP() for use with _cputws(). Also made them avoid the heap for smaller writes that could fit into a reasonable (2KiB) stack buffer.

File:

• trunk/src/lib/msc_buffered_printf.c (modified) (4 diffs)

trunk/src/lib/msc_buffered_printf.c

@@ -39 +39 @@
 #include <conio.h>
 #include <malloc.h>
+#include <locale.h>
 #include "console.h"
 
@@ -169 +170 @@
 int __cdecl puts(const char *pszString)
 {
-    size_t cchString = strlen(pszString);
-    size_t cch;
-
     /*
      * If it's a TTY, we convert it to a wide char string with a newline
@@ -177 +175 @@
      * buffering due to the added newline.
      */
-    if (*pszString != '\0')
+    size_t cchString = strlen(pszString);
+    size_t cch;
+    if (cchString > 0 && cchString < INT_MAX / 2)
     {
         int fd = fileno(stdout);
@@ -188 +188 @@
                     && hCon != NULL)
                 {
-                    /* We need to append a newline, so we can just as well do the conversion here. */
-                    size_t   cwcTmp  = cchString * 2 + 16 + 2;
-                    wchar_t *pawcTmp = (wchar_t *)malloc(cwcTmp * sizeof(wchar_t));
-                    if (pawcTmp)
+                    wchar_t  awcBuf[1024];
+                    wchar_t *pawcBuf;
+                    wchar_t *pawcBufFree = NULL;
+                    size_t   cwcBuf      = cchString * 2 + 16 + 1; /* +1 for added newline */
+                    if (cwcBuf < sizeof(awcBuf) / sizeof(awcBuf[0]))
                     {
-                        int           cwcToWrite;
-                        static UINT s_uConsoleCp = 0;
-                        if (s_uConsoleCp == 0)
-                            s_uConsoleCp = GetConsoleCP();
-
-                        cwcToWrite = MultiByteToWideChar(s_uConsoleCp, 0 /*dwFlags*/, pszString, (int)cchString, pawcTmp,
-                                                         (int)(cwcTmp - 2));
+                        pawcBuf = awcBuf;
+                        cwcBuf  = sizeof(awcBuf) / sizeof(awcBuf[0]);
+                    }
+                    else
+                        pawcBufFree = pawcBuf = (wchar_t *)malloc(cwcBuf * sizeof(wchar_t));
+                    if (pawcBuf)
+                    {
+                        int cwcToWrite = MultiByteToWideChar(get_crt_codepage(), 0 /*dwFlags*/,
+                                                             pszString, (int)cchString,
+                                                             pawcBuf, (int)(cwcBuf - 1));
                         if (cwcToWrite > 0)
                         {
                             int rc;
-
-                            pawcTmp[cwcToWrite++] = '\n';
-                            pawcTmp[cwcToWrite]   = '\0';
+                            pawcBuf[cwcToWrite++] = '\n';
+                            pawcBuf[cwcToWrite]   = '\0';
 
                             /* 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(stdout);
-                            rc = _cputws(pawcTmp);
-                            free(pawcTmp);
-                            return rc;
+                            rc = _cputws(pawcBuf);
+                            if (pawcBufFree)
+                                free(pawcBufFree);
+                            if (rc >= 0)
+                                return 0;
+                            return -1;
                         }
-                        free(pawcTmp);
+                        free(pawcBufFree);
                     }
                 }