merge revision(s) 28037:28040:

	* file.c (rb_home_dir): set filesystem encoding.
	* file.c (file_expand_path): set encoding as the same of fname
	  when _result_ is not filesystem encoding. [ruby-dev:41429]
	* file.c (file_expand_path): use rb_enc_associate_index and
	  rb_filesystem_encindex. Strings related FileSystem should
	  have filesystem_encoding.
	* file.c (SET_EXTERNAL_ENCODING): removed.


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

2 files changed, 22 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d689b30ac..14b7cf6ff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_home_dir): set filesystem encoding.
+
+Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): set encoding as the same of fname
+	  when _result_ is not filesystem encoding. [ruby-dev:41429]
+
+Thu May 27 23:51:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): use rb_enc_associate_index and
+	  rb_filesystem_encindex. Strings related FileSystem should
+	  have filesystem_encoding.
+
+	* file.c (SET_EXTERNAL_ENCODING): removed.
+
 Thu May 27 22:39:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_read): call ReadFile() with len = 0 before
diff --git a/file.c b/file.c
index bc072a93d7..7c980f3732 100644
--- a/file.c
+++ b/file.c
@@ -2788,10 +2788,6 @@ ntfs_tail(const char *path)
     buflen = RSTRING_LEN(result),\
     pend = p + buflen)
 
-#define SET_EXTERNAL_ENCODING() (\
-    (void)(extenc || (extenc = rb_default_external_encoding())),\
-    rb_enc_associate(result, extenc))
-
 VALUE
 rb_home_dir(const char *user, VALUE result)
 {
@@ -2832,6 +2828,7 @@ rb_home_dir(const char *user, VALUE result)
 	}
     }
 #endif
+    rb_enc_associate_index(result, rb_filesystem_encindex());
     return result;
 }
 
@@ -2842,7 +2839,6 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
     char *buf, *p, *pend, *root;
     size_t buflen, dirlen, bdiff;
     int tainted;
-    rb_encoding *extenc = 0;
 
     s = StringValuePtr(fname);
     BUFINIT();
@@ -2898,8 +2894,9 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 		BUFCHECK(dirlen > buflen);
 		strcpy(buf, dir);
 		xfree(dir);
-		SET_EXTERNAL_ENCODING();
+		rb_enc_associate_index(result, rb_filesystem_encindex());
 	    }
+	    else rb_enc_copy(result, fname);
 	    p = chompdirsep(skiproot(buf));
 	    s += 2;
 	}
@@ -2909,6 +2906,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_copy(result, fname);
 	}
 	else {
 	    char *dir = my_getcwd();
@@ -2918,7 +2916,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 	    BUFCHECK(dirlen > buflen);
 	    strcpy(buf, dir);
 	    xfree(dir);
-	    SET_EXTERNAL_ENCODING();
+	    rb_enc_associate_index(result, rb_filesystem_encindex());
 	}
 #if defined DOSISH || defined __CYGWIN__
 	if (isdirsep(*s)) {