ruby-changes:9861
From: yugui <ko1@a...>
Date: Fri, 9 Jan 2009 11:19:10 +0900 (JST)
Subject: [ruby-changes:9861] Ruby:r21402 (ruby_1_9_1): merges r21343 and r21344 from trunk into ruby_1_9_1.
yugui 2009-01-09 11:18:50 +0900 (Fri, 09 Jan 2009) New Revision: 21402 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21402 Log: merges r21343 and r21344 from trunk into ruby_1_9_1. * configure.in (cygwin): needs properly implemented nl_langinfo(). [ruby-core:21110] * missing/langinfo.c: added as suggested at [ruby-core:21015], from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c. Added files: branches/ruby_1_9_1/missing/langinfo.c Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/configure.in Index: ruby_1_9_1/configure.in =================================================================== --- ruby_1_9_1/configure.in (revision 21401) +++ ruby_1_9_1/configure.in (revision 21402) @@ -565,7 +565,8 @@ esac LIBS="$LIBS" # m lib is include in root under BeOS/Haiku ;; -cygwin*) ac_cv_header_langinfo_h=no # nl_langinfo(CODESET) returns US-ASCII regardless locale. +cygwin*) ac_cv_header_langinfo_h=yes + AC_LIBOBJ([langinfo]) ;; mingw*) LIBS="-lshell32 -lws2_32 $LIBS" ac_cv_header_a_out_h=no Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21401) +++ ruby_1_9_1/ChangeLog (revision 21402) @@ -1,3 +1,13 @@ +Mon Jan 5 17:59:43 2009 Nobuyoshi Nakada <nobu@r...> + + * configure.in (cygwin): needs properly implemented nl_langinfo(). + [ruby-core:21110] + + * missing/langinfo.c: added as suggested at [ruby-core:21015], from + http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c. + + * missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS. + Mon Jan 5 17:38:40 2009 NAKAMURA Usaku <usa@r...> * encoding.c (rb_locale_charmap): use GetConsoleCP() instead of Index: ruby_1_9_1/missing/langinfo.c =================================================================== --- ruby_1_9_1/missing/langinfo.c (revision 0) +++ ruby_1_9_1/missing/langinfo.c (revision 21402) @@ -0,0 +1,128 @@ +/* + * This is a quick-and-dirty emulator of the nl_langinfo(CODESET) + * function defined in the Single Unix Specification for those systems + * (FreeBSD, etc.) that don't have one yet. It behaves as if it had + * been called after setlocale(LC_CTYPE, ""), that is it looks at + * the locale environment variables. + * + * http://www.opengroup.org/onlinepubs/7908799/xsh/langinfo.h.html + * + * Please extend it as needed and suggest improvements to the author. + * This emulator will hopefully become redundant soon as + * nl_langinfo(CODESET) becomes more widely implemented. + * + * Since the proposed Li18nux encoding name registry is still not mature, + * the output follows the MIME registry where possible: + * + * http://www.iana.org/assignments/character-sets + * + * A possible autoconf test for the availability of nl_langinfo(CODESET) + * can be found in + * + * http://www.cl.cam.ac.uk/~mgk25/unicode.html#activate + * + * Markus.Kuhn@c... -- 2002-03-11 + * Permission to use, copy, modify, and distribute this software + * for any purpose and without fee is hereby granted. The author + * disclaims all warranties with regard to this software. + * + * Latest version: + * + * http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c + */ + +#include <stdlib.h> +#include <string.h> +#include "langinfo.h" + +#define C_CODESET "US-ASCII" /* Return this as the encoding of the + * C/POSIX locale. Could as well one day + * become "UTF-8". */ + +#define digit(x) ((x) >= '0' && (x) <= '9') +#define strstart(s, n) (strncasecmp(s, n, strlen(n)) == 0) + +static char buf[16]; + +static const char *nl_langinfo_0(nl_item item) +{ + char *l, *p; + + if (item != CODESET) + return NULL; + + if (((l = getenv("LC_ALL")) && *l) || + ((l = getenv("LC_CTYPE")) && *l) || + ((l = getenv("LANG")) && *l)) { + /* check standardized locales */ + if (!strcmp(l, "C") || !strcmp(l, "POSIX")) + return C_CODESET; + /* check for encoding name fragment */ + p = strchr(l, '.'); + if (p++) { + if (strstart(p, "UTF")) + return "UTF-8"; + if (strstart(p, "8859-")) { + memcpy(buf, "ISO-8859-\0\0", 12); + if (digit(p[5])) { + p += 5; + buf[9] = *p++; + if (digit(*p)) buf[10] = *p++; + return buf; + } + } + if (strstart(p, "KOI8-R")) return "KOI8-R"; + if (strstart(p, "KOI8-U")) return "KOI8-U"; + if (strstart(p, "620")) return "TIS-620"; + if (strstart(p, "2312")) return "GB2312"; + if (strstart(p, "HKSCS")) return "Big5HKSCS"; /* no MIME charset */ + if (strstart(p, "BIG5")) return "Big5"; + if (strstart(p, "GBK")) return "GBK"; /* no MIME charset */ + if (strstart(p, "18030")) return "GB18030"; /* no MIME charset */ + if (strstart(p, "Shift_JIS") || strstart(p, "SJIS")) return "Shift_JIS"; + /* check for conclusive modifier */ + if (strstart(p, "euro")) return "ISO-8859-15"; + } + /* check for language (and perhaps country) codes */ + if (strstart(l, "zh_TW")) return "Big5"; + if (strstart(l, "zh_HK")) return "Big5HKSCS"; /* no MIME charset */ + if (strstart(l, "zh")) return "GB2312"; + if (strstart(l, "ja")) return "EUC-JP"; + if (strstart(l, "ko")) return "EUC-KR"; + if (strstart(l, "ru")) return "KOI8-R"; + if (strstart(l, "uk")) return "KOI8-U"; + if (strstart(l, "pl") || strstart(l, "hr") || + strstart(l, "hu") || strstart(l, "cs") || + strstart(l, "sk") || strstart(l, "sl")) return "ISO-8859-2"; + if (strstart(l, "eo") || strstart(l, "mt")) return "ISO-8859-3"; + if (strstart(l, "el")) return "ISO-8859-7"; + if (strstart(l, "he")) return "ISO-8859-8"; + if (strstart(l, "tr")) return "ISO-8859-9"; + if (strstart(l, "th")) return "TIS-620"; /* or ISO-8859-11 */ + if (strstart(l, "lt")) return "ISO-8859-13"; + if (strstart(l, "cy")) return "ISO-8859-14"; + if (strstart(l, "ro")) return "ISO-8859-2"; /* or ISO-8859-16 */ + if (strstart(l, "am") || strstart(l, "vi")) return "UTF-8"; + /* Send me further rules if you like, but don't forget that we are + * *only* interested in locale naming conventions on platforms + * that do not already provide an nl_langinfo(CODESET) implementation. */ + return "ISO-8859-1"; /* should perhaps be "UTF-8" instead */ + } + return C_CODESET; +} + +char *nl_langinfo(nl_item item) +{ + return (char *)nl_langinfo_0(item); +} + +/* For a demo, compile with "gcc -W -Wall -o langinfo -D TEST langinfo.c" */ + +#ifdef TEST +#include <stdio.h> +int main() +{ + printf("%s\n", nl_langinfo(CODESET)); + return 0; +} +#endif -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/