summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-04 01:10:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-04 01:10:00 +0000
commitc604000a311e7379b487f581a53f7c950105224a (patch)
tree814ed47a1242e25cae615df328caa352c9e32c59
parent8bcf81886fb198f98fd5b7433b05810fe8d0530a (diff)
dir.c: normalize cwd
* dir.c (rb_dir_getwd): normalize OS path to UTF-8 on OS X. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c5
-rw-r--r--test/ruby/test_dir_m17n.rb10
3 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 417a001..d667367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 4 10:09:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (rb_dir_getwd): normalize OS path to UTF-8 on OS X.
+
Sun Oct 4 00:09:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* template/ruby-runner.c.in: wrapper to set dynamic loading path
diff --git a/dir.c b/dir.c
index 261f666..d3f6530 100644
--- a/dir.c
+++ b/dir.c
@@ -1012,7 +1012,12 @@ rb_dir_getwd(void)
VALUE cwd;
path = my_getcwd();
+#ifdef __APPLE__
+ cwd = rb_str_normalize_ospath(path, strlen(path));
+ OBJ_TAINT(cwd);
+#else
cwd = rb_tainted_str_new2(path);
+#endif
rb_enc_associate(cwd, rb_filesystem_encoding());
xfree(path);
diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb
index f8fc1ef..1d05114 100644
--- a/test/ruby/test_dir_m17n.rb
+++ b/test/ruby/test_dir_m17n.rb
@@ -395,4 +395,14 @@ class TestDir_M17N < Test::Unit::TestCase
pp.assert_equal(orig, ents, bug7267)
}
end
+
+ def test_pwd
+ with_tmpdir {|d|
+ orig = %W"d\u{e9}tente x\u{304c 304e 3050 3052 3054}"
+ orig.each do |n|
+ Dir.mkdir(n)
+ assert_equal(n, File.basename(Dir.chdir(n) {Dir.pwd}))
+ end
+ }
+ end
end