diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | file.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_require.rb | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Aug 11 23:27:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_str_encode_ospath): OS path encoding on Mac OS X is also + fixed. + Sun Aug 11 22:57:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/test_require.rb (assert_require_nonascii_path): OS path @@ -239,6 +239,8 @@ rb_str_encode_ospath(VALUE path) if (enc != utf8) { path = rb_str_conv_enc(path, enc, utf8); } +#elif defined __APPLE__ + path = rb_str_conv_enc(path, NULL, rb_utf8_encoding()); #endif return path; } diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 42479e7518..34c5fde96f 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -76,7 +76,7 @@ class TestRequire < Test::Unit::TestCase end case RUBY_PLATFORM - when /cygwin/, /mswin/, /mingw/ + when /cygwin/, /mswin/, /mingw/, /darwin/ def self.ospath_encoding(path) Encoding::UTF_8 end |