diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-17 07:16:37 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-17 07:16:37 +0000 |
commit | 7405ea0c0f8841270c5f6d77d529cb926c66b958 (patch) | |
tree | 71f82f961449b121febdf7a87db128ef44931f65 /dir.c | |
parent | cec9163e7bf3bcc77ba6a6ad612df95e1733c0d6 (diff) |
merge revision(s) 49178: [Backport #10700]
* 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/branches/ruby_2_2@49296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 23 |
1 files changed, 22 insertions, 1 deletions
@@ -1327,6 +1327,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 hfs_p) { @@ -1518,7 +1536,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; |