Changeset 3550 in kBuild for trunk

Timestamp:

Jan 29, 2022 2:42:34 AM (3 years ago)

Author:

bird

Message:

sed: Use get_crt_codepage() instead of fake nl_langinfo.

Location:

trunk/src/sed

Files:

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

trunk/src/sed/config.h.win

@@ -411 +411 @@
 
 /* mkstemp, getline */
-#endif
+
+#include "get_codepage.h"
+
+#endif

trunk/src/sed/lib/regcomp.c

@@ -851 +851 @@
                        != 0);
 #else
-# ifdef HAVE_LANGINFO_CODESET
+# ifdef KBUILD_OS_WINDOWS
+  (void)codeset_name;
+  if (get_crt_codepage() == MY_CP_UTF8)
+# else
+#  ifdef HAVE_LANGINFO_CODESET
   codeset_name = nl_langinfo (CODESET);
-# else
+#  else
   codeset_name = getenv ("LC_ALL");
   if (codeset_name == NULL || codeset_name[0] == '\0')
@@ -863 +867 @@
   else if (strchr (codeset_name, '.') !=  NULL)
     codeset_name = strchr (codeset_name, '.') + 1;
-# endif
+#  endif
 
   if (strcasecmp (codeset_name, "UTF-8") == 0
       || strcasecmp (codeset_name, "UTF8") == 0)
+# endif
     dfa->is_utf8 = 1;