nagachika	2016-08-16 04:37:18 +0900 (Tue, 16 Aug 2016)

  New Revision: 55909

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55909

  Log:
    merge revision(s) 55385,55390: [Backport #12483]
    
    * file.c (append_fspath): normalize directory name to be appended
      on OS X.  [ruby-core:75957] [Ruby trunk Bug#12483]
      https://github.com/rails/rails/issues/25303#issuecomment-224834804

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/file.c
    branches/ruby_2_3/test/ruby/test_file_exhaustive.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/test/ruby/test_file_exhaustive.rb
===================================================================
--- ruby_2_3/test/ruby/test_file_exhaustive.rb	(revision 55908)
+++ ruby_2_3/test/ruby/test_file_exhaustive.rb	(revision 55909)
@@ -1075,6 +1075,27 @@ class TestFileExhaustive < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_file_exhaustive.rb#L1075
     assert_equal('z:/bar/foo', File.expand_path('z:foo', '/bar'), bug10858)
   end if DRIVE
 
+  case RUBY_PLATFORM
+  when /darwin/
+    def test_expand_path_compose
+      pp = Object.new.extend(Test::Unit::Assertions)
+      def pp.mu_pp(str) #:nodoc:
+        str.dump
+      end
+
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          orig = %W"d\u{e9}tente x\u{304c 304e 3050 3052 3054}"
+          orig.each do |o|
+            Dir.mkdir(o)
+            n = Dir.chdir(o) {File.expand_path(".")}
+            pp.assert_equal(o, File.basename(n))
+          end
+        end
+      end
+    end
+  end
+
   def test_basename
     assert_equal(File.basename(regular_file).sub(/\.test$/, ""), File.basename(regular_file, ".test"))
     assert_equal(File.basename(utf8_file).sub(/\.test$/, ""), File.basename(utf8_file, ".test"))
Index: ruby_2_3/file.c
===================================================================
--- ruby_2_3/file.c	(revision 55908)
+++ ruby_2_3/file.c	(revision 55909)
@@ -235,6 +235,7 @@ rb_str_encode_ospath(VALUE path) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/file.c#L235
 }
 
 #ifdef __APPLE__
+# define NORMALIZE_UTF8PATH 1
 static VALUE
 rb_str_append_normalized_ospath(VALUE str, const char *ptr, long len)
 {
@@ -334,6 +335,8 @@ ignored_char_p(const char *p, const char https://github.com/ruby/ruby/blob/trunk/ruby_2_3/file.c#L335
     }
     return 0;
 }
+#else
+# define NORMALIZE_UTF8PATH 0
 #endif
 
 static long
@@ -3218,6 +3221,18 @@ rb_default_home_dir(VALUE result) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/file.c#L3221
 }
 
 #ifndef _WIN32
+static VALUE
+ospath_new(const char *ptr, long len, rb_encoding *fsenc)
+{
+#if NORMALIZE_UTF8PATH
+    VALUE path = rb_str_normalize_ospath(ptr, len);
+    rb_enc_associate(path, fsenc);
+    return path;
+#else
+    return rb_enc_str_new(ptr, len, fsenc);
+#endif
+}
+
 static char *
 append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encoding *fsenc)
 {
@@ -3225,12 +3240,15 @@ append_fspath(VALUE result, VALUE fname, https://github.com/ruby/ruby/blob/trunk/ruby_2_3/file.c#L3240
     VALUE dirname = Qnil;
     size_t dirlen = strlen(dir), buflen = rb_str_capacity(result);
 
-    if (*enc != fsenc) {
-	rb_encoding *direnc = rb_enc_check(fname, dirname = rb_enc_str_new(dir, dirlen, fsenc));
+    if (NORMALIZE_UTF8PATH || *enc != fsenc) {
+	rb_encoding *direnc = rb_enc_check(fname, dirname = ospath_new(dir, dirlen, fsenc));
 	if (direnc != fsenc) {
 	    dirname = rb_str_conv_enc(dirname, fsenc, direnc);
 	    RSTRING_GETMEM(dirname, cwdp, dirlen);
 	}
+	else if (NORMALIZE_UTF8PATH) {
+	    RSTRING_GETMEM(dirname, cwdp, dirlen);
+	}
 	*enc = direnc;
     }
     do {buflen *= 2;} while (dirlen > buflen);
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55908)
+++ ruby_2_3/version.h	(revision 55909)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 159
+#define RUBY_PATCHLEVEL 160
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55908)
+++ ruby_2_3/ChangeLog	(revision 55909)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Aug 16 04:28:22 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (append_fspath): normalize directory name to be appended
+	  on OS X.  [ruby-core:75957] [Ruby trunk Bug#12483]
+	  https://github.com/rails/rails/issues/25303#issuecomment-224834804
+
 Tue Aug 16 04:16:14 2016  NARUSE, Yui  <naruse@r...>
 
 	* regcomp.c (noname_disable_map): don't optimize out group 0

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55385,55390


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