From d6aa766ad52d9f2c0813bf89fc28c1ad69b58edb Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 8 Jan 2015 03:53:45 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index 1cdb9865e5..5c582ddb76 100644 --- a/dir.c +++ b/dir.c @@ -1351,6 +1351,24 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle } #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( 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; -- cgit v1.2.3