mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2386_LANG_case_insensitive'

Browse Source 
* 2386_LANG_case_insensitive:
  Ticket #2386: interpretation of LANG variable needs to be case insensitive.
This commit is contained in:
Andrew Borodin 2012-03-28 13:01:01 +04:00
commit 8059856fe1
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/strutil/strutil.c
View File

@ -67,6 +67,7 @@ static const char *str_8bit_encodings[] = {
/* terminal encoding */ /* terminal encoding */
static char *codeset = NULL; static char *codeset = NULL;
static char *term_encoding = NULL;
/* function for encoding specific operations */ /* function for encoding specific operations */
static struct str_class used_class; static struct str_class used_class;
@ -324,7 +325,16 @@ str_translate_char (GIConv conv, const char *keys, size_t ch_size, char *output,
const char * const char *
str_detect_termencoding (void) str_detect_termencoding (void)
{ {
return (nl_langinfo (CODESET)); if (term_encoding == NULL)
{
/* On Linux, nl_langinfo (CODESET) returns upper case UTF-8 whether the LANG is set
to utf-8 or UTF-8.
On Mac OS X, it returns the same case as the LANG input.
So let tranform result of nl_langinfo (CODESET) to upper case unconditionally. */
term_encoding = g_ascii_strup (nl_langinfo (CODESET), -1);
}
return term_encoding;
} }
static int static int
@ -368,7 +378,7 @@ str_isutf8 (const char *codeset_name)
void void
str_init_strings (const char *termenc) str_init_strings (const char *termenc)
{ {
codeset = g_strdup ((termenc != NULL) ? termenc : str_detect_termencoding ()); codeset = termenc != NULL ? g_ascii_strup (termenc, -1) : g_strdup (str_detect_termencoding ());
str_cnv_not_convert = g_iconv_open (codeset, codeset); str_cnv_not_convert = g_iconv_open (codeset, codeset);
if (str_cnv_not_convert == INVALID_CONV) if (str_cnv_not_convert == INVALID_CONV)
@ -383,7 +393,7 @@ str_init_strings (const char *termenc)
if (str_cnv_not_convert == INVALID_CONV) if (str_cnv_not_convert == INVALID_CONV)
{ {
g_free (codeset); g_free (codeset);
codeset = g_strdup ("ascii"); codeset = g_strdup ("ASCII");
str_cnv_not_convert = g_iconv_open (codeset, codeset); str_cnv_not_convert = g_iconv_open (codeset, codeset);
} }
} }
@ -399,6 +409,7 @@ str_uninit_strings (void)
{ {
if (str_cnv_not_convert != INVALID_CONV) if (str_cnv_not_convert != INVALID_CONV)
g_iconv_close (str_cnv_not_convert); g_iconv_close (str_cnv_not_convert);
g_free (term_encoding);
g_free (codeset); g_free (codeset);
} }