nobu	2012-10-16 14:56:25 +0900 (Tue, 16 Oct 2012)

  New Revision: 37216

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37216

  Log:
    file.c: ASCII-compatible
    
    * file.c (rb_file_join): need to check again after any conversion run.
      [ruby-core:48012] [Bug #7168]

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37215)
+++ ChangeLog	(revision 37216)
@@ -1,3 +1,8 @@
+Tue Oct 16 14:56:23 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_join): need to check again after any conversion run.
+	  [ruby-core:48012] [Bug #7168]
+
 Tue Oct 16 12:52:14 2012  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_file):
Index: file.c
===================================================================
--- file.c	(revision 37215)
+++ file.c	(revision 37216)
@@ -3917,6 +3917,7 @@
     long len, i;
     VALUE result, tmp;
     const char *name, *tail;
+    int checked = TRUE;
 
     if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
 
@@ -3942,6 +3943,7 @@
 	tmp = RARRAY_PTR(ary)[i];
 	switch (TYPE(tmp)) {
 	  case T_STRING:
+	    if (!checked) check_path_encoding(tmp);
 	    StringValueCStr(tmp);
 	    break;
 	  case T_ARRAY:
@@ -3958,6 +3960,7 @@
 	    break;
 	  default:
 	    FilePathStringValue(tmp);
+	    checked = FALSE;
 	}
 	RSTRING_GETMEM(result, name, len);
 	if (i == 0) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/