summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-08 05:58:34 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-08 05:58:34 +0000
commitd7abb533e23239b78bca6d18e9321632a66cf0bf (patch)
treed0a369e6515a7a15bb2e0ed9d29f27e44705eeb9
parent0d382f4878e176a286344fd6c8da27d0a6f91175 (diff)
* win32/win32.c (rb_w32_wreadlink): should treat junctions like as
symlinks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 037ac6e..9edbbe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 8 14:57:06 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_wreadlink): should treat junctions like as
+ symlinks.
+
Wed Apr 8 14:03:47 2015 Koichi Sasada <ko1@atdot.net>
* test/ruby/test_symbol.rb: fix syntax error.
diff --git a/win32/win32.c b/win32/win32.c
index d038464..20b7dc5 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4726,7 +4726,8 @@ rb_w32_wreadlink(const WCHAR *path, WCHAR *buf, size_t bufsize)
&rp, sizeof(rp), &ret, NULL)) {
e = map_errno(GetLastError());
}
- else if (rp.ReparseTag != IO_REPARSE_TAG_SYMLINK){
+ else if (rp.ReparseTag != IO_REPARSE_TAG_SYMLINK &&
+ rp.ReparseTag != IO_REPARSE_TAG_MOUNT_POINT){
e = EINVAL;
}
else {