Changeset 3548 for trunk/src/grep/src

Timestamp:

Jan 29, 2022, 3:41:10 AM (3 years ago)

Author:

bird

Message:

grep: Use get_crt_codepage(). Don't default to the UTF-8 manifest for older VCC versions as the CRT won't do the right thing.

File:

• trunk/src/grep/src/grep.c (modified) (2 diffs)

trunk/src/grep/src/grep.c

@@ -534 +534 @@
       g_fStdOutIsConsole = GetConsoleMode (s_hStdOut, &fModeIgnored)
                          ? TRUE : FALSE;
-      if (getenv("KMK_GREP_CONSOLE_DEBUG"))
-        fprintf(stderr, "kmk_grep: g_fStdOutIsConsole=%d s_hStdOut=%p codepage=%u\n",
-                g_fStdOutIsConsole, s_hStdOut, ___lc_codepage_func());
+      if (getenv ("KMK_GREP_CONSOLE_DEBUG"))
+        fprintf (stderr, "kmk_grep: hStdOut=%p %sconsole codepage=%u ansi=%u\n",
+                s_hStdOut, g_fStdOutIsConsole ? "" : "!",
+                get_crt_codepage (), get_ansi_codepage ());
     }
   if (g_fStdOutIsConsole == TRUE && size && nmemb)
@@ -560 +561 @@
           if (pawcBuf)
             {
-              int cwcToWrite = MultiByteToWideChar(___lc_codepage_func(),
+              int cwcToWrite = MultiByteToWideChar(get_crt_codepage(),
                                                    0 /*dwFlags*/,
                                                    ptr, (int)cbToWrite,