* encoding.c: include locale.h

  (rb_locale_charmap): new method Encoding.locale_charmap for
  nl_langinfo(CODESET).

* include/ruby/encoding.h (rb_locale_charmap): declared.

* main.c (main): call setlocale with LC_CTYPE.

* ruby.c (locale_encoding): use rb_locale_charmap.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/main.c b/main.c
index e9d1bada5f..691cfcdd5b 100644
--- a/main.c
+++ b/main.c
@@ -12,6 +12,7 @@
 
 #undef RUBY_EXPORT
 #include "ruby/ruby.h"
+#include <locale.h>
 
 RUBY_GLOBAL_SETUP
 
@@ -22,6 +23,7 @@ main(int argc, char **argv, char **envp)
     extern void ruby_set_debug_option(const char *);
     ruby_set_debug_option(getenv("RUBY_DEBUG"));
 #endif
+    setlocale(LC_CTYPE, "");
 
     ruby_sysinit(&argc, &argv);
     {