kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 57248: [Backport #13573]

Browse source 
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
This commit is contained in:
usa 2017-06-30 11:00:50 +00:00
parent 538ba38983
commit 1f106a915e
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jun 30 20:00:18 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (is_case_sensitive): use getattrlist() if fgetattrlist() is
unavailable, on OSX 10.5. [Bug #11054]
Fri Jun 30 19:58:16 2017 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir

14
dir.c
View file

@ -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) {

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-06-30"
#define RUBY_PATCHLEVEL 319
#define RUBY_PATCHLEVEL 320
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 6