nobu	2015-01-08 12:53:45 +0900 (Thu, 08 Jan 2015)

  New Revision: 49178

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

  Log:
    dir.c: OSX case-folding
    
    * dir.c (glob_helper): match in case-folding only if the directory
      resides on a case-insensitve file system, on OSX.
      [ruby-core:67364] [Bug #10700]

  Modified files:
    trunk/ChangeLog
    trunk/dir.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49177)
+++ ChangeLog	(revision 49178)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jan  8 12:53:44 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* dir.c (glob_helper): match in case-folding only if the directory
+	  resides on a case-insensitve file system, on OSX.
+	  [ruby-core:67364] [Bug #10700]
+
 Thu Jan  8 11:39:18 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* .travis.yml: Remove redundant configuration option.
Index: dir.c
===================================================================
--- dir.c	(revision 49177)
+++ dir.c	(revision 49178)
@@ -1351,6 +1351,24 @@ join_path(const char *path, long len, in https://github.com/ruby/ruby/blob/trunk/dir.c#L1351
 }
 
 #ifdef HAVE_GETATTRLIST
+static int
+is_case_sensitive(DIR *dirp)
+{
+    u_int32_t attrbuf[SIZEUP32(vol_capabilities_attr_t) + 1];
+    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, 0, ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES};
+    const vol_capabilities_attr_t *cap = (void *)(attrbuf+1);
+    const int idx = VOL_CAPABILITIES_FORMAT;
+    const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE;
+    struct statfs sf;
+
+    if (fstatfs(dirfd(dirp), &sf)) return -1;
+    if (getattrlist(sf.f_mntonname, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
+	return -1;
+    if (!(cap->valid[idx] & mask))
+	return -1;
+    return (cap->capabilities[idx] & mask) != 0;
+}
+
 static char *
 replace_real_basename(char *path, long base, int norm_p)
 {
@@ -1542,7 +1560,10 @@ glob_helper( https://github.com/ruby/ruby/blob/trunk/dir.c#L1560
 	    closedir(dirp);
 	    goto literally;
 	}
-	flags |= FNM_CASEFOLD;
+# endif
+# ifdef HAVE_GETATTRLIST
+	if (is_case_sensitive(dirp) == 0)
+	    flags |= FNM_CASEFOLD;
 # endif
 	while ((dp = READDIR(dirp, enc)) != NULL) {
 	    char *buf;

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