X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=locale.c;h=db9edb74d5699aaa6602a4ae3959484b0c797b27;hb=8f9a6e7d3541caba01fe037a1cf62a37217f9d9b;hp=aefcc344a505b453ed7c6e61482eec73717dbf83;hpb=2d31dd6aa775ba3ae596182dab64c54df2e34ba1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/locale.c b/locale.c
index aefcc34..db9edb7 100644
--- a/locale.c
+++ b/locale.c
@@ -1,6 +1,6 @@
 /*    locale.c
  *
- *    Copyright (c) 2001, Larry Wall
+ *    Copyright (c) 2001-2002, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -25,6 +25,10 @@
 #  include <locale.h>
 #endif
 
+#ifdef I_LANGINFO
+#   include <langinfo.h>
+#endif
+
 /*
  * Standardize the locale name from a string returned by 'setlocale'.
  *
@@ -462,10 +466,47 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 #ifdef USE_LOCALE_NUMERIC
     new_numeric(curnum);
 #endif /* USE_LOCALE_NUMERIC */
+
     }
 
 #endif /* USE_LOCALE */
 
+    {
+	 bool wantutf8 = FALSE;
+	 char *codeset = NULL;
+#if defined(HAS_NL_LANGINFO) && defined(CODESET)
+	 codeset = nl_langinfo(CODESET);
+#endif
+	 if (codeset &&
+	     (ibcmp(codeset,  "UTF-8", 5) == 0 ||
+	      ibcmp(codeset,  "UTF8",  4) == 0))
+	      wantutf8 = TRUE;
+#if defined(USE_LOCALE)
+#ifdef __GLIBC__
+	 if (!wantutf8 && language &&
+	     (ibcmp(language, "UTF-8", 5) == 0 ||
+	      ibcmp(language, "UTF8",  4) == 0))
+	      wantutf8 = TRUE;
+#endif
+	 if (!wantutf8 && lc_all &&
+	     (ibcmp(lc_all,   "UTF-8", 5) == 0 ||
+	      ibcmp(lc_all,   "UTF8",  4) == 0))
+	      wantutf8 = TRUE;
+#ifdef USE_LOCALE_CTYPE
+	 if (!wantutf8 && curctype &&
+	     (ibcmp(curctype,     "UTF-8", 5) == 0 ||
+	      ibcmp(curctype,     "UTF8",  4) == 0))
+	      wantutf8 = TRUE;
+#endif
+	 if (!wantutf8 && lang &&
+	     (ibcmp(lang,     "UTF-8", 5) == 0 ||
+	      ibcmp(lang,     "UTF8",  4) == 0))
+	      wantutf8 = TRUE;
+#endif /* USE_LOCALE */
+	 if (wantutf8)
+	      PL_wantutf8 = TRUE;
+    }
+
 #ifdef USE_LOCALE_CTYPE
     if (curctype != NULL)
 	Safefree(curctype);