From b1bcb8265d7a06efeb876a9d70997ff50e90296d Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 1 Mar 2012 09:41:08 +0000
Subject: merge revision(s) r33525: [Backport #6104]

	* file.c (rb_file_join): honor input encodings than ASCII-8BIT.
	  [ruby-core:40338] [Bug #5483]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 file.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index f6ec06bd4e..67b281aba1 100644
--- a/file.c
+++ b/file.c
@@ -3837,7 +3837,10 @@ rb_file_join(VALUE ary, VALUE sep)
 	    FilePathStringValue(tmp);
 	}
 	name = StringValueCStr(result);
-	if (i > 0 && !NIL_P(sep)) {
+	if (i == 0) {
+	    rb_enc_copy(result, tmp);
+	}
+	else if (!NIL_P(sep)) {
 	    tail = chompdirsep(name);
 	    if (RSTRING_PTR(tmp) && isdirsep(RSTRING_PTR(tmp)[0])) {
 		rb_str_set_len(result, tail - name);
-- 
cgit v1.2.3