X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=locale.c;h=6f5f01666746939e8bd65fb7c5a4f2a379613589;hb=67363c0d4f1afeee7e193e700845c9f68327d8c8;hp=9d522444ca620b38c8523b876a356fca4c12ac1c;hpb=fde18df140d5f64815bdd632a127ecd5ce3d97fa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/locale.c b/locale.c
index 9d52244..6f5f016 100644
--- a/locale.c
+++ b/locale.c
@@ -1,6 +1,7 @@
 /*    locale.c
  *
- *    Copyright (c) 2001-2002, Larry Wall
+ *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, 2003, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -487,8 +488,8 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 	 it overrides LC_MESSAGES for GNU gettext, and it also
 	 can have more than one locale, separated by spaces,
 	 in case you need to know.)
-	 If PL_utf8locale and PL_wantutf8 (set by -C) are true,
-	 perl.c:S_parse_body() will turn on the PerlIO :utf8 layer
+	 If PL_utf8locale and PL_unicode (set by -C or by $ENV{PERL_UNICODE})
+         are true, perl.c:S_parse_body() will turn on the PerlIO :utf8 layer
 	 on STDIN, STDOUT, STDERR, _and_ the default open discipline.
       */
 	 bool utf8locale = FALSE;
@@ -519,12 +520,12 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 	 if (utf8locale)
 	      PL_utf8locale = TRUE;
     }
-    /* Set PL_wantutf8 to $ENV{PERL_UTF8_LOCALE} if using PerlIO.
+    /* Set PL_unicode to $ENV{PERL_UNICODE} if using PerlIO.
        This is an alternative to using the -C command line switch
        (the -C if present will override this). */
     {
-	 char *p = PerlEnv_getenv("PERL_UTF8_LOCALE");
-	 PL_wantutf8 = p ? (bool) atoi(p) : FALSE;
+	 char *p = PerlEnv_getenv("PERL_UNICODE");
+	 PL_unicode = p ? parse_unicode_opts(&p) : 0;
     }
 #endif