JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2002-08-29 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* libc/locale/locale.c (_setlocale_r)[MB_CAPABLE]: Fix so
        default locale "" is accepted for LC_CTYPE or LC_MESSAGES
        and is treated as if "C" was specified.
This commit is contained in:
Jeff Johnston
2002-08-29 15:32:08 +00:00
parent 7382e593a0
commit 86620e2190
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-08-29 Jeff Johnston <jjohnstn@redhat.com>
* libc/locale/locale.c (_setlocale_r)[MB_CAPABLE]: Fix so
default locale "" is accepted for LC_CTYPE or LC_MESSAGES
and is treated as if "C" was specified.
2002-08-28 Jeff Johnston <jjohnstn@redhat.com> 2002-08-28 Jeff Johnston <jjohnstn@redhat.com>
* Makefile.am (install-data-local): Move install of build * Makefile.am (install-data-local): Move install of build

21
newlib/libc/locale/locale.c
View File

@@ -136,6 +136,7 @@ _DEFUN(_setlocale_r, (p, category, locale),
if (locale) if (locale)
{ {
char *locale_name = (char *)locale;
if (category != LC_CTYPE && category != LC_MESSAGES) if (category != LC_CTYPE && category != LC_MESSAGES)
{ {
if (strcmp (locale, "C") && strcmp (locale, "")) if (strcmp (locale, "C") && strcmp (locale, ""))
@@ -143,17 +144,15 @@ _DEFUN(_setlocale_r, (p, category, locale),
if (category == LC_ALL) if (category == LC_ALL)
{ {
strcpy (last_lc_ctype, lc_ctype); strcpy (last_lc_ctype, lc_ctype);
strcpy (lc_ctype, locale); strcpy (lc_ctype, "C");
strcpy (last_lc_messages, lc_messages); strcpy (last_lc_messages, lc_messages);
strcpy (lc_messages, locale); strcpy (lc_messages, "C");
__mb_cur_max = 1; __mb_cur_max = 1;
} }
} }
else else
{ {
if (locale[0] != 'C') if (locale[0] == 'C' && locale[1] == '-')
return 0;
if (locale[1] == '-')
{ {
switch (locale[2]) switch (locale[2])
{ {
@@ -180,12 +179,18 @@ _DEFUN(_setlocale_r, (p, category, locale),
default: default:
return 0; return 0;
} }
} }
else
{
if (strcmp (locale, "C") && strcmp (locale, ""))
return 0;
locale_name = "C"; /* C is always the default locale */
}
if (category == LC_CTYPE) if (category == LC_CTYPE)
{ {
strcpy (last_lc_ctype, lc_ctype); strcpy (last_lc_ctype, lc_ctype);
strcpy (lc_ctype, locale); strcpy (lc_ctype, locale_name);
__mb_cur_max = 1; __mb_cur_max = 1;
if (locale[1] == '-') if (locale[1] == '-')
@@ -213,7 +218,7 @@ _DEFUN(_setlocale_r, (p, category, locale),
else else
{ {
strcpy (last_lc_messages, lc_messages); strcpy (last_lc_messages, lc_messages);
strcpy (lc_messages, locale); strcpy (lc_messages, locale_name);
charset = "ISO-8859-1"; charset = "ISO-8859-1";
if (locale[1] == '-') if (locale[1] == '-')