merges r23670 from trunk into ruby_1_9_1.

--
* file.c (file_expand_path): associate the input encoding when
  copying an absolute path.  [ruby-dev:38594]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/file.c b/file.c
index 3d5c33bd7..4ea759fa3 100644
--- a/file.c
+++ b/file.c
@@ -2723,6 +2723,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 	p = buf + (s - b);
 	BUFCHECK(bdiff >= buflen);
 	memset(buf, '/', p - buf);
+	rb_enc_copy(result, fname);
     }
     if (p > buf && p[-1] == '/')
 	--p;