naruse	2015-02-20 14:33:00 +0900 (Fri, 20 Feb 2015)

  New Revision: 49654

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49654

  Log:
    merge revision(s) 49170:
    
    * dir.c (dir_initialize): workaround of opendir failure at symlink
      directories on Windows via CIFS.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/dir.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49653)
+++ ruby_2_2/ChangeLog	(revision 49654)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Feb 20 14:32:14 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* dir.c (dir_initialize): workaround of opendir failure at symlink
+	  directories on Windows via CIFS.
+
 Thu Feb 19 17:05:47 2015  Shugo Maeda  <shugo@r...>
 
 	* class.c (rb_obj_singleton_methods): should use RTEST() to convert
Index: ruby_2_2/dir.c
===================================================================
--- ruby_2_2/dir.c	(revision 49653)
+++ ruby_2_2/dir.c	(revision 49654)
@@ -480,6 +480,15 @@ dir_initialize(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_2/dir.c#L480
 	    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);
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49653)
+++ ruby_2_2/version.h	(revision 49654)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-20"
-#define RUBY_PATCHLEVEL 62
+#define RUBY_PATCHLEVEL 63
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49170


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/