Changeset 3548 in kBuild

Timestamp:

Jan 29, 2022 2: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.

Location:

trunk/src/grep

Files:

• Makefile.kmk (modified) (2 diffs)
• config.win.h (modified) (1 diff)
• lib/regcomp.c (modified) (1 diff)
• src/grep.c (modified) (2 diffs)

trunk/src/grep/Makefile.kmk

@@ -134 +134 @@
        lib/strerror.c \
        \
-        ../lib/maybe_con_fwrite.c \
-        ../lib/is_console.c \
+        ../lib/get_codepage.c \
         ../lib/nt/ntstat.c \
         ../lib/nt/ntdir.c \
@@ -240 +239 @@
         $(CP) -f -- "$^" "$@"
 
-if 1 # Add a manifest making UTF-8 as the active code page.
+ifndef KBUILD_NEW_VCC # Add a manifest making UTF-8 as the active code page.
 kmk_grep_LNK_DEPS.win = \
         $(kmk_grep_0_OUTDIR)/kmk_grep.manifest

trunk/src/grep/config.win.h

@@ -2589 +2589 @@
 void w32_initialize_main(int *pcArgs, char ***ppapszArgs);
 
+#include "get_codepage.h"
+
 #endif /* !INCLUDED_CONFIG_WIN_H */
 

trunk/src/grep/lib/regcomp.c

@@ -882 +882 @@
 # ifdef _MSC_VER
   (void)codeset_name;
-  if (GetACP() == 65001 /*utf-8*/)
+  if (get_crt_codepage() == CP_UTF8)
 # else
   codeset_name = nl_langinfo (CODESET);

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,