diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-02-14 03:18:35 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-02-14 03:18:35 +0000 |
| commit | b1281dbe76784daea74f915549beb077eba27d37 (patch) | |
| tree | 0fdf3d464687a99311c5f5530d25efbaf4e00c49 /util.c | |
| parent | 103a71894980ab015937511f33d840c7f030e8a4 (diff) | |
| download | perl-b1281dbe76784daea74f915549beb077eba27d37.tar.gz | |
Don't skip too much of the locale error message if no environ array,
from Chris Nandor.
p4raw-id: //depot/perl@8804
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -665,7 +665,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) * -1 = fallback to C locale failed */ -#if defined(USE_LOCALE) && defined(USE_ENVIRON_ARRAY) +#if defined(USE_LOCALE) #ifdef USE_LOCALE_CTYPE char *curctype = NULL; @@ -808,6 +808,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) lc_all ? lc_all : "unset", lc_all ? '"' : ')'); +#if defined(USE_ENVIRON_ARRAY) { char **e; for (e = environ; *e; e++) { @@ -818,6 +819,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn) (int)(p - *e), *e, p + 1); } } +#else + PerlIO_printf(Perl_error_log, + "\t(possibly more locale environment variables)\n"); +#endif PerlIO_printf(Perl_error_log, "\tLANG = %c%s%c\n", @@ -891,7 +896,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) #endif /* USE_LOCALE_NUMERIC */ } -#endif /* USE_LOCALE && USE_ENVIRON_ARRAY */ +#endif /* USE_LOCALE */ #ifdef USE_LOCALE_CTYPE if (curctype != NULL) |