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

* syscalls.cc (internal_setlocale): Use UTF-8 internally if external

Browse Source 
charset is ASCII.
This commit is contained in:
Corinna Vinschen 2010-01-17 09:41:01 +00:00
parent 32cb8c8cfe
commit 62910474ac
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-17 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (internal_setlocale): Use UTF-8 internally if external
charset is ASCII.
2010-01-15 Corinna Vinschen <corinna@vinschen.de> 2010-01-15 Corinna Vinschen <corinna@vinschen.de>
* libc/fnmatch.c: Replace with multibyte capable version from FreeBSD. * libc/fnmatch.c: Replace with multibyte capable version from FreeBSD.

12
winsup/cygwin/syscalls.cc
View File

@ -4348,8 +4348,16 @@ internal_setlocale ()
cwdstuff::cwd_lock.acquire (); cwdstuff::cwd_lock.acquire ();
sys_mbstowcs (w_cwd, 32768, cygheap->cwd.get_posix ()); sys_mbstowcs (w_cwd, 32768, cygheap->cwd.get_posix ());
/* Set charset for internal conversion functions. */ /* Set charset for internal conversion functions. */
cygheap->locale.mbtowc = __mbtowc; if (*__locale_charset () == 'A'/*SCII*/)
cygheap->locale.wctomb = __wctomb; {
cygheap->locale.mbtowc = __utf8_mbtowc;
cygheap->locale.wctomb = __utf8_wctomb;
}
else
{
cygheap->locale.mbtowc = __mbtowc;
cygheap->locale.wctomb = __wctomb;
}
strcpy (cygheap->locale.charset, __locale_charset ()); strcpy (cygheap->locale.charset, __locale_charset ());
/* Restore CWD and PATH in new charset. */ /* Restore CWD and PATH in new charset. */
cygheap->cwd.reset_posix (w_cwd); cygheap->cwd.reset_posix (w_cwd);