* 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: http://svn.ruby-lang.org/repos/ruby/trunk@25782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/ruby.c b/ruby.c
index 5c22d43b9..e471abedb 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1302,7 +1302,6 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
     ruby_init_loadpath_safe(opt->safe_level);
     rb_enc_find_index("encdb");
     lenc = rb_locale_encoding();
-    (void)rb_filesystem_encoding();
     rb_enc_associate(rb_progname, lenc);
     parser = rb_parser_new();
     if (opt->dump & DUMP_BIT(yydebug)) {
@@ -1325,6 +1324,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
 	enc = lenc;
     }
     rb_enc_set_default_external(rb_enc_from_encoding(enc));
+    (void)rb_filesystem_encoding();
     if (opt->intern.enc.index >= 0) {
 	enc = rb_enc_from_index(opt->intern.enc.index);
 	rb_enc_set_default_internal(rb_enc_from_encoding(enc));