From d46728ec0e134c47a9cf7b1f63d5a0c88902162e Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 14 Aug 2008 12:11:14 +0000 Subject: * encoding.c (rb_filesystem_encoding): use default external encoding for Unix. * dir.c (dir_initialize): don't cache fs_encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index a3eed26c75..ea13490b21 100644 --- a/dir.c +++ b/dir.c @@ -333,17 +333,15 @@ static VALUE 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)) { -- cgit v1.2.3