nobu	2013-05-21 03:11:23 +0900 (Tue, 21 May 2013)

  New Revision: 40868

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

  Log:
    dir.c: compose HFS file names
    
    * dir.c (dir_each): compose HFS file names from
      UTF8-MAC. [ruby-core:48745] [Bug #7267]

  Modified files:
    trunk/ChangeLog
    trunk/dir.c
    trunk/test/ruby/test_dir_m17n.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40867)
+++ ChangeLog	(revision 40868)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue May 21 03:11:18 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* dir.c (dir_each): compose HFS file names from
+	  UTF8-MAC. [ruby-core:48745] [Bug #7267]
+
 Tue May 21 03:08:52 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/ruby/envutil.rb (assert_separately): require envutil in the
Index: dir.c
===================================================================
--- dir.c	(revision 40867)
+++ dir.c	(revision 40868)
@@ -663,12 +663,28 @@ dir_each(VALUE dir) https://github.com/ruby/ruby/blob/trunk/dir.c#L663
     struct dir_data *dirp;
     struct dirent *dp;
     IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
+    IF_HAVE_HFS(int hfs_p);
 
     RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
+    IF_HAVE_HFS(hfs_p = !NIL_P(dirp->path) && is_hfs(RSTRING_PTR(dirp->path)));
     while (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
-	rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
+	const char *name = dp->d_name;
+	size_t namlen = NAMLEN(dp);
+	VALUE path;
+#if HAVE_HFS
+	VALUE utf8str = Qnil;
+	rb_encoding *utf8mac = 0;
+	if (hfs_p && has_nonascii(name, namlen) && (utf8mac = rb_utf8mac_encoding()) != 0) {
+	    utf8str = rb_str_conv_enc(rb_tainted_str_new(name, namlen),
+				      utf8mac, rb_utf8_encoding());
+	    RSTRING_GETMEM(utf8str, name, namlen);
+	}
+#endif
+	path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
+	IF_HAVE_HFS(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
+	rb_yield(path);
 	if (dirp->dir == NULL) dir_closed();
     }
     return dir;
Index: test/ruby/test_dir_m17n.rb
===================================================================
--- test/ruby/test_dir_m17n.rb	(revision 40867)
+++ test/ruby/test_dir_m17n.rb	(revision 40868)
@@ -305,4 +305,24 @@ class TestDir_M17N < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/test/ruby/test_dir_m17n.rb#L305
       end
     }
   end
+
+  def test_entries_compose
+    bug7267 = '[ruby-core:48745] [Bug #7267]'
+
+    pp = Object.new.extend(Test::Unit::Assertions)
+    def pp.mu_pp(ary) #:nodoc:
+      '[' << ary.map {|str| "#{str.dump}(#{str.encoding})"}.join(', ') << ']'
+    end
+
+    with_tmpdir {|d|
+      orig = %W"d\u{e9}tente x\u{304c 304e 3050 3052 3054}"
+      orig.each {|n| open(n, "w") {}}
+      if /mswin|mingw/ =~ RUBY_PLATFORM
+        opts = {:encoding => Encoding.default_external}
+        orig.map! {|o| o.encode(Encoding.find("filesystem")) rescue o.tr("^a-z", "?")}
+      end
+      ents = Dir.entries(".", opts).reject {|n| /\A\./ =~ n}
+      pp.assert_equal(orig, ents, bug7267)
+    }
+  end
 end

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