kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume

Browse source 
mount point should be treated as directory, not symlink.
  [ruby-core:72483] [Bug #11874]

* win32/win32.c (rb_w32_read_reparse_point): check the reparse point is
  a volume mount point or not.

* win32/file.c (rb_readlink): follow above change (but this pass won't
  be used).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-01-29 08:13:42 +00:00
parent c0b13e292f
commit 47f6196cf0
3 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Fri Jan 29 17:07:27 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume
mount point should be treated as directory, not symlink.
[ruby-core:72483] [Bug #11874]
* win32/win32.c (rb_w32_read_reparse_point): check the reparse point is
a volume mount point or not.
* win32/file.c (rb_readlink): follow above change (but this pass won't
be used).
Fri Jan 29 16:17:07 2016 Lucas Buchala <lucasbuchala@gmail.com> Fri Jan 29 16:17:07 2016 Lucas Buchala <lucasbuchala@gmail.com>
* enum.c (enum_take_while, enum_drop_while): rename block * enum.c (enum_take_while, enum_drop_while): rename block

3
win32/file.c
View file

@ -689,7 +689,10 @@ rb_readlink(VALUE path, rb_encoding *resultenc)
ALLOCV_END(wpathbuf); ALLOCV_END(wpathbuf);
if (e) { if (e) {
ALLOCV_END(wtmp); ALLOCV_END(wtmp);
if (e != -1)
rb_syserr_fail_path(rb_w32_map_errno(e), path); rb_syserr_fail_path(rb_w32_map_errno(e), path);
else /* not symlink; maybe volume mount point */
rb_syserr_fail_path(EINVAL, path);
} }
enc = resultenc; enc = resultenc;
cp = path_cp = code_page(enc); cp = path_cp = code_page(enc);

23
win32/win32.c
View file

@ -4804,8 +4804,20 @@ reparse_symlink(const WCHAR *path, rb_w32_reparse_buffer_t *rp, size_t size)
int int
rb_w32_reparse_symlink_p(const WCHAR *path) rb_w32_reparse_symlink_p(const WCHAR *path)
{ {
rb_w32_reparse_buffer_t rp; VALUE wtmp = 0;
switch (reparse_symlink(path, &rp, sizeof(rp))) { rb_w32_reparse_buffer_t rbuf, *rp = &rbuf;
WCHAR *wbuf;
DWORD len;
int e;
e = rb_w32_read_reparse_point(path, rp, sizeof(rbuf), &wbuf, &len);
if (e == ERROR_MORE_DATA) {
size_t size = rb_w32_reparse_buffer_size(len + 1);
rp = ALLOCV(wtmp, size);
e = rb_w32_read_reparse_point(path, rp, size, &wbuf, &len);
ALLOCV_END(wtmp);
}
switch (e) {
case 0: case 0:
case ERROR_MORE_DATA: case ERROR_MORE_DATA:
return TRUE; return TRUE;
@ -4830,6 +4842,7 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp,
*len = ret / sizeof(WCHAR); *len = ret / sizeof(WCHAR);
} }
else { /* IO_REPARSE_TAG_MOUNT_POINT */ else { /* IO_REPARSE_TAG_MOUNT_POINT */
static const WCHAR *volume = L"Volume{";
/* +4/-4 means to drop "\??\" */ /* +4/-4 means to drop "\??\" */
name = ((char *)rp->MountPointReparseBuffer.PathBuffer + name = ((char *)rp->MountPointReparseBuffer.PathBuffer +
rp->MountPointReparseBuffer.SubstituteNameOffset + rp->MountPointReparseBuffer.SubstituteNameOffset +
@ -4837,6 +4850,9 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp,
ret = rp->MountPointReparseBuffer.SubstituteNameLength; ret = rp->MountPointReparseBuffer.SubstituteNameLength;
*len = ret / sizeof(WCHAR); *len = ret / sizeof(WCHAR);
ret -= 4 * sizeof(WCHAR); ret -= 4 * sizeof(WCHAR);
if (ret > sizeof(volume) - 1 * sizeof(WCHAR) &&
memcmp(name, volume, sizeof(volume) - 1 * sizeof(WCHAR)) == 0)
return -1;
} }
*result = name; *result = name;
if (e) { if (e) {
@ -5295,7 +5311,10 @@ fileattr_to_unixmode(DWORD attr, const WCHAR *path)
} }
if (attr & FILE_ATTRIBUTE_REPARSE_POINT) { if (attr & FILE_ATTRIBUTE_REPARSE_POINT) {
if (rb_w32_reparse_symlink_p(path))
mode |= S_IFLNK | S_IEXEC; mode |= S_IFLNK | S_IEXEC;
else
mode |= S_IFDIR | S_IEXEC;
} }
else if (attr & FILE_ATTRIBUTE_DIRECTORY) { else if (attr & FILE_ATTRIBUTE_DIRECTORY) {
mode |= S_IFDIR | S_IEXEC; mode |= S_IFDIR | S_IEXEC;