From 455554b64ca84a11c11b5513efb5ace56af652e7 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 31 May 2010 08:47:08 +0000 Subject: * file.c (file_expand_path): Refix r28102: this breaks r28039. test for [ruby-dev:41429] is added. [ruby-core:30516] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index ecf2583609..5c037fe36f 100644 --- a/file.c +++ b/file.c @@ -2887,7 +2887,8 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) xfree(dir); rb_enc_associate_index(result, rb_filesystem_encindex()); } - else rb_enc_check(result, fname); + else + rb_enc_associate(result, rb_enc_check(result, fname)); p = chompdirsep(skiproot(buf)); s += 2; } @@ -2897,7 +2898,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) if (!NIL_P(dname)) { file_expand_path(dname, Qnil, abs_mode, result); BUFINIT(); - rb_enc_check(result, fname); + rb_enc_associate(result, rb_enc_check(result, fname)); } else { char *dir = my_getcwd(); -- cgit v1.2.3