libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-03-01 20:45:37 +08:00
Code Issues Projects Releases Wiki Activity

* libc/locale/locale.c (loadlocale): Allow three character

Browse Source 
language codes to accommodate ISO 639-2 codes.
This commit is contained in:
Corinna Vinschen 2010-01-17 14:41:58 +00:00
parent 62910474ac
commit d24015235c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-17 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/locale.c (loadlocale): Allow three character
language codes to accommodate ISO 639-2 codes.
2010-01-17 Corinna Vinschen <corinna@vinschen.de> 2010-01-17 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/locale.c (lc_ctype_charset): Disable defaulting to * libc/locale/locale.c (lc_ctype_charset): Disable defaulting to

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

@ -51,8 +51,10 @@ the form
language[_TERRITORY][.charset][@@modifier] language[_TERRITORY][.charset][@@modifier]
<<"language">> is a two character string per ISO 639. <<"TERRITORY">> is a <<"language">> is a two character string per ISO 639, or, if not available
country code per ISO 3166. For <<"charset">> and <<"modifier">> see below. for a given language, a three character string per ISO 639-2.
<<"TERRITORY">> is a country code per ISO 3166. For <<"charset">> and
<<"modifier">> see below.
Additionally to the POSIX specifier, seven extensions are supported for Additionally to the POSIX specifier, seven extensions are supported for
backward compatibility with older implementations using newlib: backward compatibility with older implementations using newlib:
@ -473,6 +475,9 @@ loadlocale(struct _reent *p, int category)
|| c[1] < 'a' || c[1] > 'z') || c[1] < 'a' || c[1] > 'z')
return NULL; return NULL;
c += 2; c += 2;
/* Allow three character Language per ISO 639-2 */
if (c[0] >= 'a' && c[0] <= 'z')
++c;
if (c[0] == '_') if (c[0] == '_')
{ {
/* Territory */ /* Territory */