summaryrefslogtreecommitdiff
path: root/encoding.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-15 16:37:38 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-15 16:37:38 +0000
commit1aba3f9d76110311ac538a56203f035559643953 (patch)
tree56d2d62bc2875e251cf446d8c4bd5c1166354ec4 /encoding.c
parent43bd807c43d25b31b29c6225b7d0f8ca6e67e40d (diff)
downloadruby-1aba3f9d76110311ac538a56203f035559643953.tar.gz
* encoding.c (rb_filesystem_encindex): use default external encoding
instead of locale encoding in Unix. * ruby.c (process_options): delay inifilesystem encoding initialization after default external encoding initialization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c
index 97d930701b..9d956337ee 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1129,7 +1129,7 @@ rb_filesystem_encindex(void)
#elif defined __APPLE__
idx = rb_utf8_encindex();
#else
- idx = rb_locale_encindex();
+ idx = rb_enc_to_index(rb_default_external_encoding());
#endif
if (rb_enc_registered("filesystem") < 0) enc_alias_internal("filesystem", idx);