nobu	2009-02-03 07:02:16 +0900 (Tue, 03 Feb 2009)

  New Revision: 21983

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21983

  Log:
    * missing/langinfo.c (nl_langinfo_codeset): accepts iso-8859
      fragment.  [ruby-core:21757]

  Modified files:
    trunk/ChangeLog
    trunk/missing/langinfo.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21982)
+++ ChangeLog	(revision 21983)
@@ -1,3 +1,8 @@
+Tue Feb  3 07:02:11 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* missing/langinfo.c (nl_langinfo_codeset): accepts iso-8859
+	  fragment.  [ruby-core:21757]
+
 Tue Feb  3 07:01:21 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* mkconfig.rb (patchlevel): config.status may not contain
Index: missing/langinfo.c
===================================================================
--- missing/langinfo.c	(revision 21982)
+++ missing/langinfo.c	(revision 21983)
@@ -63,6 +63,7 @@
 nl_langinfo_codeset(void)
 {
   const char *l, *p;
+  int n;
   
   if (((l = getenv("LC_ALL"))   && *l) ||
       ((l = getenv("LC_CTYPE")) && *l) ||
@@ -75,9 +76,9 @@
     if (!p++) p = l;
     if (strstart(p, "UTF"))
 	return "UTF-8";
-    if (strstart(p, "8859-")) {
-      if (digit(p[5])) {
-	p += 5;
+    if ((n = 5, strstart(p, "8859-")) || (n = 9, strstart(p, "ISO-8859-"))) {
+      if (digit(p[n])) {
+	p += n;
 	memcpy(buf, "ISO-8859-\0\0", 12);
 	buf[9] = *p++;
 	if (digit(*p)) buf[10] = *p++;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/