diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 11:00:50 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 11:00:50 +0000 |
| commit | 1f106a915e154e8d2de285e60ed8b8fd59842496 (patch) | |
| tree | c595fc52ebda1319c776259c64ea26a10f2929b7 /dir.c | |
| parent | 538ba389836b090be5c913cdfe820d3d3f626e2b (diff) | |
merge revision(s) 57248: [Backport #13573]
dir.c: getattrlist on OSX 10.5
* dir.c (is_case_sensitive): use getattrlist() if fgetattrlist()
is unavailable, on OSX 10.5. [ruby-core:68829] [Bug #11054]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -1470,8 +1470,13 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle } #ifdef HAVE_GETATTRLIST +# if defined HAVE_FGETATTRLIST +# define is_case_sensitive(dirp, path) is_case_sensitive(dirp) +# else +# define is_case_sensitive(dirp, path) is_case_sensitive(path) +# endif static int -is_case_sensitive(DIR *dirp) +is_case_sensitive(DIR *dirp, const char *path) { struct { u_int32_t length; @@ -1482,8 +1487,13 @@ is_case_sensitive(DIR *dirp) const int idx = VOL_CAPABILITIES_FORMAT; const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE; +# if defined HAVE_FGETATTRLIST if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) return -1; +# else + if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) + return -1; +# endif if (!(cap->valid[idx] & mask)) return -1; return (cap->capabilities[idx] & mask) != 0; @@ -1778,7 +1788,7 @@ glob_helper( } # endif # ifdef HAVE_GETATTRLIST - if (is_case_sensitive(dirp) == 0) + if (is_case_sensitive(dirp, path) == 0) flags |= FNM_CASEFOLD; # endif while ((dp = READDIR(dirp, enc)) != NULL) { |