merge revision(s) 34397: [Backport #6881]

	* file.c (append_fspath): need to set the encoding to result always.


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

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index b8f718297c..7fa96b2502 100644
--- a/file.c
+++ b/file.c
@@ -2881,7 +2881,6 @@ append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encodi
 	    RSTRING_GETMEM(dirname, cwdp, dirlen);
 	}
 	*enc = direnc;
-	rb_enc_associate(result, direnc);
     }
     do {buflen *= 2;} while (dirlen > buflen);
     rb_str_resize(result, buflen);
@@ -2889,6 +2888,7 @@ append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encodi
     memcpy(buf, cwdp, dirlen);
     xfree(dir);
     if (!NIL_P(dirname)) rb_str_resize(dirname, 0);
+    rb_enc_associate(result, *enc);
     return buf + dirlen;
 }