From 10e74f035f4c89246389de654f21a5f9b82ed95c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 7 Jan 2015 10:19:29 +0000 Subject: dir.c: cifs symlinkd on OSX * dir.c (dir_initialize): workaround of opendir failure at symlink directories on Windows via CIFS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ dir.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 59af0c7362..da8fdd7929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 7 19:19:26 2015 Nobuyoshi Nakada + + * dir.c (dir_initialize): workaround of opendir failure at symlink + directories on Windows via CIFS. + Wed Jan 7 18:52:50 2015 Nobuyoshi Nakada * dir.c (need_normalization): not only HFS+, CIFS (SMB) is also diff --git a/dir.c b/dir.c index 292e9b8b82..e8b20afd24 100644 --- a/dir.c +++ b/dir.c @@ -480,6 +480,15 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) rb_gc(); dp->dir = opendir(path); } +#ifdef HAVE_GETATTRLIST + else if (errno == EIO) { + u_int32_t attrbuf[1]; + struct attrlist al = {ATTR_BIT_MAP_COUNT, 0}; + if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) { + dp->dir = opendir(path); + } + } +#endif if (dp->dir == NULL) { RB_GC_GUARD(dirname); rb_sys_fail_path(orig); -- cgit v1.2.3