archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

dir.c: cifs symlinkd on OSX

Browse source 
* 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
This commit is contained in:
nobu 2015-01-07 10:19:29 +00:00
parent 79219d9656
commit 10e74f035f
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 7 19:19:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (dir_initialize): workaround of opendir failure at symlink
directories on Windows via CIFS.
Wed Jan 7 18:52:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jan 7 18:52:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (need_normalization): not only HFS+, CIFS (SMB) is also * dir.c (need_normalization): not only HFS+, CIFS (SMB) is also

9
dir.c
View file

@ -480,6 +480,15 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
rb_gc(); rb_gc();
dp->dir = opendir(path); 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) { if (dp->dir == NULL) {
RB_GC_GUARD(dirname); RB_GC_GUARD(dirname);
rb_sys_fail_path(orig); rb_sys_fail_path(orig);