Skip to content

V
vlc-gpu
Commit 4f32396e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Avoid setlocale - not thread-safe

parent c67038de
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 13 deletions
src/text/wincp.c
View file @ 4f32396e
...@@ -55,7 +55,7 @@ static const char *FindFallbackEncoding (const char *locale) ...@@ -55,7 +55,7 @@ static const char *FindFallbackEncoding (const char *locale)
{ {
if ((locale == NULL) || (strlen (locale) < 2) if ((locale == NULL) || (strlen (locale) < 2)
|| !strcasecmp (locale, "POSIX")) || !strcasecmp (locale, "POSIX"))
return "ASCII"; return "CP1252"; /* Yeah, this is totally western-biased */
/*** The ISO-8859 series (anything but Asia) ***/ /*** The ISO-8859 series (anything but Asia) ***/
...@@ -193,21 +193,13 @@ const char *GetFallbackEncoding( void ) ...@@ -193,21 +193,13 @@ const char *GetFallbackEncoding( void )
#ifndef WIN32 #ifndef WIN32
const char *psz_lang; const char *psz_lang;
/* Some systems (like Darwin, SunOS 4 or DJGPP) have only the C locale.
* Therefore we don't use setlocale here; it would return "C". */
# if defined (HAVE_SETLOCALE) && !defined ( __APPLE__)
psz_lang = setlocale (LC_ALL, NULL);
if (psz_lang == NULL)
# endif
{
psz_lang = getenv ("LC_ALL"); psz_lang = getenv ("LC_ALL");
if ((psz_lang == NULL) || !*psz_lang) if ((psz_lang == NULL) || !*psz_lang)
{ {
psz_lang = getenv ("LC_CTYPE"); psz_lang = getenv ("LC_CTYPE");
if ((psz_lang == NULL)) if ((psz_lang == NULL) || !*psz_lang)
psz_lang = getenv ("LANG"); psz_lang = getenv ("LANG");
} }
}
return FindFallbackEncoding (psz_lang); return FindFallbackEncoding (psz_lang);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment