akr	2008-08-14 21:11:14 +0900 (Thu, 14 Aug 2008)

  New Revision: 18622

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

  Log:
    * encoding.c (rb_filesystem_encoding): use default external encoding
      for Unix.
    
    * dir.c (dir_initialize): don't cache fs_encoding.

  Modified files:
    trunk/ChangeLog
    trunk/dir.c
    trunk/encoding.c

Index: encoding.c
===================================================================
--- encoding.c	(revision 18621)
+++ encoding.c	(revision 18622)
@@ -962,16 +962,14 @@
 rb_encoding *
 rb_filesystem_encoding(void)
 {
-    static rb_encoding *enc;
-    if (!enc) {
+    rb_encoding *enc;
 #if defined _WIN32
-	enc = rb_locale_encoding();
+    enc = rb_locale_encoding();
 #elif defined __APPLE__
-	enc = rb_enc_find("UTF8-MAC");
+    enc = rb_enc_find("UTF8-MAC");
 #else
-	enc = rb_locale_encoding();
+    enc = rb_default_external_encoding();
 #endif
-    }
     return enc;
 }
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18621)
+++ ChangeLog	(revision 18622)
@@ -1,3 +1,10 @@
+Thu Aug 14 21:10:00 2008  Tanaka Akira  <akr@f...>
+
+	* encoding.c (rb_filesystem_encoding): use default external encoding
+	  for Unix.
+
+	* dir.c (dir_initialize): don't cache fs_encoding.
+
 Thu Aug 14 20:58:57 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (rb_econv_open_by_transcoder_entries): renamed from
Index: dir.c
===================================================================
--- dir.c	(revision 18621)
+++ dir.c	(revision 18622)
@@ -333,17 +333,15 @@
 dir_initialize(int argc, VALUE *argv, VALUE dir)
 {
     struct dir_data *dp;
-    static rb_encoding *fs_encoding;
     rb_encoding  *extencoding;
     VALUE dirname, opt;
     static VALUE sym_extenc;
 
     if (!sym_extenc) {
 	sym_extenc = ID2SYM(rb_intern("external_encoding"));
-	fs_encoding = rb_filesystem_encoding();
     }
+    extencoding = rb_filesystem_encoding();
 
-    extencoding = fs_encoding;
     rb_scan_args(argc, argv, "11", &dirname, &opt);
 
     if (!NIL_P(opt)) {

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