diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 19:06:36 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-19 19:06:36 +0000 |
commit | ddf1f59df5fbff6c659177bc36e161b2ae285d5f (patch) | |
tree | 94bdeb974cbe8e1a9a1ef97eda915a66d9b6a910 | |
parent | 9eb78a21387b6a90f5f9558de79b59f6348156fc (diff) |
merge revision(s) 50218: [Backport #11054] [Backport #11069]
* dir.c (need_normalization): 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_2@50549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | dir.c | 20 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed May 20 03:46:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dir.c (need_normalization): use getattrlist() if fgetattrlist() + is unavailable, on OSX 10.5. [ruby-core:68829] [Bug #11054] + Wed May 20 03:25:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * proc.c (proc_binding): replicate env from method object, and diff --git a/configure.in b/configure.in index 0178573ea5..7330df41ad 100644 --- a/configure.in +++ b/configure.in @@ -2036,6 +2036,7 @@ AC_CHECK_FUNCS(fchmod) AC_CHECK_FUNCS(fchown) AC_CHECK_FUNCS(fcntl) AC_CHECK_FUNCS(fdatasync) +AC_CHECK_FUNCS(fgetattrlist) AC_CHECK_FUNCS(fmod) AC_CHECK_FUNCS(fsync) AC_CHECK_FUNCS(ftruncate) @@ -103,13 +103,23 @@ char *strchr(char*,char); #include <sys/mount.h> #include <sys/vnode.h> +# if defined HAVE_FGETATTRLIST || !defined HAVE_GETATTRLIST +# define need_normalization(dirp, path) need_normalization(dirp) +# else +# define need_normalization(dirp, path) need_normalization(path) +# endif static inline int -need_normalization(DIR *dirp) +need_normalization(DIR *dirp, const char *path) { -# ifdef HAVE_GETATTRLIST +# if defined HAVE_FGETATTRLIST || defined HAVE_GETATTRLIST u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)]; struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,}; - if (!fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), 0)) { +# if defined HAVE_FGETATTRLIST + int ret = fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), 0); +# else + int ret = getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0); +# endif + if (!ret) { const fsobj_tag_t *tag = (void *)(attrbuf+1); switch (*tag) { case VT_HFS: @@ -694,7 +704,7 @@ dir_each(VALUE dir) RETURN_ENUMERATOR(dir, 0, 0); GetDIR(dir, dirp); rewinddir(dirp->dir); - IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir)); + IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir, RSTRING_PTR(dirp->path))); while ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) { const char *name = dp->d_name; size_t namlen = NAMLEN(dp); @@ -1661,7 +1671,7 @@ glob_helper( # endif return 0; } - IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp)); + IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : ".")); # if NORMALIZE_UTF8PATH if (!(norm_p || magical || recursive)) { @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-05-20" -#define RUBY_PATCHLEVEL 108 +#define RUBY_PATCHLEVEL 109 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 |