* otherwise to use the particular category's variable if set; otherwise to
* use the LANG variable. */
+ bool override_LC_ALL = 0;
+ char * result;
+
if (locale && strEQ(locale, "")) {
# ifdef LC_ALL
locale = PerlEnv_getenv("LC_ALL");
switch (category) {
# ifdef LC_ALL
case LC_ALL:
+ override_LC_ALL = TRUE;
break; /* We already know its variable isn't set */
# endif
# ifdef USE_LOCALE_TIME
# endif
}
- return setlocale(category, locale);
+ result = setlocale(category, locale);
+
+ if (! override_LC_ALL) {
+ return result;
+ }
+
+ /* Here the input locale was LC_ALL, and we have set it to what is in the
+ * LANG variable or the system default if there is no LANG. But these have
+ * lower priority than the other LC_foo variables, so override it for each
+ * one that is set. (If they are set to "", it means to use the same thing
+ * we just set LC_ALL to, so can skip) */
+# ifdef USE_LOCALE_TIME
+ result = PerlEnv_getenv("LC_TIME");
+ if (result && strNE(result, "")) {
+ setlocale(LC_TIME, result);
+ }
+# endif
+# ifdef USE_LOCALE_CTYPE
+ result = PerlEnv_getenv("LC_CTYPE");
+ if (result && strNE(result, "")) {
+ setlocale(LC_CTYPE, result);
+ }
+# endif
+# ifdef USE_LOCALE_COLLATE
+ result = PerlEnv_getenv("LC_COLLATE");
+ if (result && strNE(result, "")) {
+ setlocale(LC_COLLATE, result);
+ }
+# endif
+# ifdef USE_LOCALE_MONETARY
+ result = PerlEnv_getenv("LC_MONETARY");
+ if (result && strNE(result, "")) {
+ setlocale(LC_MONETARY, result);
+ }
+# endif
+# ifdef USE_LOCALE_NUMERIC
+ result = PerlEnv_getenv("LC_NUMERIC");
+ if (result && strNE(result, "")) {
+ setlocale(LC_NUMERIC, result);
+ }
+# endif
+# ifdef USE_LOCALE_MESSAGES
+ result = PerlEnv_getenv("LC_MESSAGES");
+ if (result && strNE(result, "")) {
+ setlocale(LC_MESSAGES, result);
+ }
+# endif
+
+ return setlocale(LC_ALL, NULL);
+
}
#endif
#endif /* USE_LOCALE_NUMERIC */
#ifdef __GLIBC__
char * const language = PerlEnv_getenv("LANGUAGE");
-#else
- const char * const language = NULL;
#endif
/* NULL uses the existing already set up locale */
const char * const setlocale_init = (PerlEnv_getenv("PERL_SKIP_LOCALE_INIT"))
? NULL
: "";
- const char* trial_locales[5] = { setlocale_init }; /* 5 = 1 each for "",
- LC_ALL, LANG, "", C
- */
- unsigned int trial_locales_count = 1;
+ const char* trial_locales[5]; /* 5 = 1 each for "", LC_ALL, LANG, "", C */
+ unsigned int trial_locales_count;
char * const lc_all = PerlEnv_getenv("LC_ALL");
char * const lang = PerlEnv_getenv("LANG");
bool setlocale_failure = FALSE;
(printwarn &&
(!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
bool done = FALSE;
- const char *description;
const char *system_default_locale = NULL;
else
curnum = savepv(curnum);
# endif /* USE_LOCALE_NUMERIC */
+# ifdef USE_LOCALE_MESSAGES
+ if (! my_setlocale(LC_MESSAGES,
+ (!done && (lang || PerlEnv_getenv("LC_MESSAGES")))
+ ? setlocale_init : NULL))
+ {
+ setlocale_failure = TRUE;
+ }
+# endif /* USE_LOCALE_MESSAGES */
+# ifdef USE_LOCALE_MONETARY
+ if (! my_setlocale(LC_MONETARY,
+ (!done && (lang || PerlEnv_getenv("LC_MONETARY")))
+ ? setlocale_init : NULL))
+ {
+ setlocale_failure = TRUE;
+ }
+# endif /* USE_LOCALE_MONETARY */
}
# endif /* LC_ALL */
/* We try each locale in the list until we get one that works, or exhaust
* the list */
+ trial_locales[0] = setlocale_init;
+ trial_locales_count = 1;
for (i= 0; i < trial_locales_count; i++) {
const char * trial_locale = trial_locales[i];
}
#ifdef LC_ALL
- if (! my_setlocale(LC_ALL, trial_locale))
+ if (! my_setlocale(LC_ALL, trial_locale)) {
setlocale_failure = TRUE;
+ }
+ else {
+ /* Since LC_ALL succeeded, it should have changed all the other
+ * categories it can to its value; so we massage things so that the
+ * setlocales below just return their category's current values.
+ * This adequately handles the case in NetBSD where LC_COLLATE may
+ * not be defined for a locale, and setting it individually will
+ * fail, whereas setting LC_ALL suceeds, leaving LC_COLLATE set to
+ * the POSIX locale. */
+ trial_locale = NULL;
+ }
#endif /* LC_ALL */
if (!setlocale_failure) {
else
curnum = savepv(curnum);
#endif /* USE_LOCALE_NUMERIC */
+#ifdef USE_LOCALE_MESSAGES
+ if (! (my_setlocale(LC_MESSAGES, trial_locale)))
+ setlocale_failure = TRUE;
+#endif /* USE_LOCALE_MESSAGES */
+#ifdef USE_LOCALE_MONETARY
+ if (! (my_setlocale(LC_MONETARY, trial_locale)))
+ setlocale_failure = TRUE;
+#endif /* USE_LOCALE_MONETARY */
+
if (! setlocale_failure) { /* Success */
break;
}
if (! curnum)
PerlIO_printf(Perl_error_log, "LC_NUMERIC ");
#endif /* USE_LOCALE_NUMERIC */
- PerlIO_printf(Perl_error_log, "\n");
+ PerlIO_printf(Perl_error_log, "and possibly others\n");
#endif /* LC_ALL */
Safefree(save_input_locale);
return is_utf8;
}
+ Safefree(codeset);
}
# endif
(void) mbtowc(&wc, NULL, 0); /* Reset any shift state */
GCC_DIAG_RESTORE;
errno = 0;
- if (mbtowc(&wc, HYPHEN_UTF8, strlen(HYPHEN_UTF8))
+ if ((size_t)mbtowc(&wc, HYPHEN_UTF8, strlen(HYPHEN_UTF8))
!= strlen(HYPHEN_UTF8)
|| wc != (wchar_t) 0x2010)
{
&& *(save_input_locale + final_pos - 3) == '5'
&& *(save_input_locale + final_pos - 4) == '6')
{
- Safefree(save_input_locale);
DEBUG_L(PerlIO_printf(Perl_debug_log,
"Locale %s ends with 10056 in name, is UTF-8 locale\n",
save_input_locale));
+ Safefree(save_input_locale);
return TRUE;
}
#endif
/* Other common encodings are the ISO 8859 series, which aren't UTF-8 */
if (instr(save_input_locale, "8859")) {
- Safefree(save_input_locale);
DEBUG_L(PerlIO_printf(Perl_debug_log,
"Locale %s has 8859 in name, not UTF-8 locale\n",
save_input_locale));
+ Safefree(save_input_locale);
return FALSE;
}
https://perl5.git.perl.org / perl5.git / blobdiff