yugui	2009-02-02 17:07:31 +0900 (Mon, 02 Feb 2009)

  New Revision: 21958

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

  Log:
    merges r21930 from trunk into ruby_1_9_1.
    * encoding.c (rb_filesystem_encoding): Windows' filesystem encoding is
      sometimes ANSI code page and sometimes OEM code page. we should check
      whether code page is used.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/encoding.c

Index: ruby_1_9_1/encoding.c
===================================================================
--- ruby_1_9_1/encoding.c	(revision 21957)
+++ ruby_1_9_1/encoding.c	(revision 21958)
@@ -1034,7 +1034,7 @@
     enc = rb_default_external_encoding();
 #elif defined _WIN32 || defined __CYGWIN__
     char cp[sizeof(int) * 8 / 3 + 4];
-    snprintf(cp, sizeof cp, "CP%d", GetOEMCP());
+    snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
     enc = rb_enc_find(cp);
 #elif defined __APPLE__
     enc = rb_enc_find("UTF8-MAC");
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21957)
+++ ruby_1_9_1/ChangeLog	(revision 21958)
@@ -1,3 +1,9 @@
+Mon Feb  2 06:51:36 2009  NAKAMURA Usaku  <usa@r...>
+
+	* encoding.c (rb_filesystem_encoding): Windows' filesystem encoding is
+	  sometimes ANSI code page and sometimes OEM code page. we should check
+	  whether code page is used.
+
 Sun Feb  1 05:19:43 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const):

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