From 354028abe18bc5862a1b45e2f45060bf85c1ae35 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Aug 2013 01:26:27 +0000
Subject: file.c: rb_str_normalize_ospath

* file.c (rb_str_normalize_ospath): extract and move from dir.c.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  4 ++++
 dir.c     | 17 ++++-------------
 file.c    | 13 +++++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a4e6acdca8..3c2ca95280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug  8 10:26:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_str_normalize_ospath): extract and move from dir.c.
+
 Thu Aug  8 05:59:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
 	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
diff --git a/dir.c b/dir.c
index e2400e58f4..7e9c659f9e 100644
--- a/dir.c
+++ b/dir.c
@@ -84,11 +84,7 @@ char *strchr(char*,char);
 #include <sys/param.h>
 #include <sys/mount.h>
 
-rb_encoding *
-rb_utf8mac_encoding(void)
-{
-    return rb_enc_from_index(ENCINDEX_UTF8_MAC);
-}
+VALUE rb_str_normalize_ospath(const char *ptr, long len);
 
 static inline int
 is_hfs(DIR *dirp)
@@ -634,10 +630,8 @@ dir_each(VALUE dir)
 	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());
+	if (hfs_p && has_nonascii(name, namlen) &&
+	    !NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
 	    RSTRING_GETMEM(utf8str, name, namlen);
 	}
 #endif
@@ -1427,10 +1421,7 @@ glob_helper(
 	    namlen = NAMLEN(dp);
 # if HAVE_HFS
 	    if (hfs_p && has_nonascii(name, namlen)) {
-		rb_encoding *utf8mac = rb_utf8mac_encoding();
-		if (utf8mac) {
-		    utf8str = rb_str_conv_enc(rb_str_new(name, namlen),
-					      utf8mac, rb_utf8_encoding());
+		if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
 		    RSTRING_GETMEM(utf8str, name, namlen);
 		}
 	    }
diff --git a/file.c b/file.c
index ceed58d774..cfa10ae67d 100644
--- a/file.c
+++ b/file.c
@@ -240,6 +240,19 @@ rb_str_encode_ospath(VALUE path)
     return path;
 }
 
+#ifdef __APPLE__
+VALUE
+rb_str_normalize_ospath(const char *ptr, long len)
+{
+    rb_encoding *utf8mac = rb_enc_from_index(ENCINDEX_UTF8_MAC);
+    if (utf8mac) {
+	return rb_str_conv_enc(rb_tainted_str_new(ptr, len),
+			       utf8mac, rb_utf8_encoding());
+    }
+    return Qnil;
+}
+#endif
+
 static long
 apply2files(void (*func)(const char *, VALUE, void *), VALUE vargs, void *arg)
 {
-- 
cgit v1.2.3