aboutsummaryrefslogtreecommitdiff
path: root/newlib
diff options
context:
space:
mode:
Diffstat (limited to 'newlib')
-rw-r--r--newlib/ChangeLog5
-rw-r--r--newlib/libc/locale/nl_langinfo.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2c69cc5..969a6bc 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15 Corinna Vinschen <corinna@vinschen.de>
+
+ * libc/locale/nl_langinfo.c (nl_langinfo): Add Cygwin-specific temporary
+ exception for KOI8 charsets.
+
2009-10-13 Eric Blake <ebb9@byu.net>
* libc/include/sys/unistd.h: Add _PC*, _CS*, and _SC* constants
diff --git a/newlib/libc/locale/nl_langinfo.c b/newlib/libc/locale/nl_langinfo.c
index 8e60c6b..1bc7c17 100644
--- a/newlib/libc/locale/nl_langinfo.c
+++ b/newlib/libc/locale/nl_langinfo.c
@@ -60,6 +60,12 @@ _DEFUN(nl_langinfo, (item),
case CODESET:
#ifdef __CYGWIN__
ret = __locale_charset ();
+ /* Temporary exception for KOI8 charsets which are
+ incorrectly treated by calling applications otherwise. */
+ if (strcmp (ret, "CP20866") == 0)
+ ret = "KOI8-R";
+ else if (strcmp (ret, "CP21866") == 0)
+ ret = "KOI8-U";
#else
ret = "";
if ((s = setlocale(LC_CTYPE, NULL)) != NULL) {