merges r23661 from trunk into ruby_1_9_1.

--
	* dir.c (dir_s_getwd): directory path's encoding should be filesystem's
	  one.

	* lib/tmpdir.rb: ditto (but not finished yet.)

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

1 files changed, 1 insertions, 0 deletions

diff --git a/dir.c b/dir.c
index 5a46f1bfc2..a79d8e5b20 100644
--- a/dir.c
+++ b/dir.c
@@ -802,6 +802,7 @@ dir_s_getwd(VALUE dir)
     rb_secure(4);
     path = my_getcwd();
     cwd = rb_tainted_str_new2(path);
+    rb_enc_associate(cwd, rb_filesystem_encoding());
 
     xfree(path);
     return cwd;