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

* libc/locale/nl_langinfo.c (nl_langinfo): Just return current locale

Browse Source 
charset on Cygwin.
This commit is contained in:
Corinna Vinschen 2009-10-07 16:45:23 +00:00
parent dc4e4aabba
commit 8bd7bd3bc0
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-07 Corinna Vinschen <corinna@vinschen.de>
* libc/locale/nl_langinfo.c (nl_langinfo): Just return current locale
charset on Cygwin.
2009-10-03 Corinna Vinschen <corinna@vinschen.de> 2009-10-03 Corinna Vinschen <corinna@vinschen.de>
* libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Allow CESU-8 surrogate * libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Allow CESU-8 surrogate

8
newlib/libc/locale/nl_langinfo.c
View File

@ -37,10 +37,14 @@
#include "lmonetary.h" #include "lmonetary.h"
#include "lmessages.h" #include "lmessages.h"
#ifndef __CYGWIN__
#define TRANSITION_PERIOD_HACK #define TRANSITION_PERIOD_HACK
#endif
#define _REL(BASE) ((int)item-BASE) #define _REL(BASE) ((int)item-BASE)
extern char *__locale_charset ();
char * char *
_DEFUN(nl_langinfo, (item), _DEFUN(nl_langinfo, (item),
nl_item item) { nl_item item) {
@ -54,6 +58,9 @@ _DEFUN(nl_langinfo, (item),
switch (item) { switch (item) {
case CODESET: case CODESET:
#ifdef __CYGWIN__
ret = __locale_charset ();
#else
ret = ""; ret = "";
if ((s = setlocale(LC_CTYPE, NULL)) != NULL) { if ((s = setlocale(LC_CTYPE, NULL)) != NULL) {
if ((cs = strchr(s, '.')) != NULL) { if ((cs = strchr(s, '.')) != NULL) {
@ -92,6 +99,7 @@ _DEFUN(nl_langinfo, (item),
) )
ret = "US-ASCII"; ret = "US-ASCII";
} }
#endif /* __CYGWIN__ */
break; break;
case D_T_FMT: case D_T_FMT:
ret = (char *) __get_current_time_locale()->c_fmt; ret = (char *) __get_current_time_locale()->c_fmt;