From 94cfa2893ccab71341d4671201253339d56d6c97 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 1 Feb 2016 12:08:08 +0000 Subject: [PATCH] win32.c: volume_prefix_len * win32/win32.c (rb_w32_read_reparse_point): name the prefix length to be dropped. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32/win32.c b/win32/win32.c index 34ad5fedb1..9b069e588d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4843,13 +4843,13 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp, } else { /* IO_REPARSE_TAG_MOUNT_POINT */ static const WCHAR *volume = L"Volume{"; - /* +4/-4 means to drop "\??\" */ + enum {volume_prefix_len = rb_strlen_lit("\\??\\")}; name = ((char *)rp->MountPointReparseBuffer.PathBuffer + rp->MountPointReparseBuffer.SubstituteNameOffset + - 4 * sizeof(WCHAR)); + volume_prefix_len * sizeof(WCHAR)); ret = rp->MountPointReparseBuffer.SubstituteNameLength; *len = ret / sizeof(WCHAR); - ret -= 4 * sizeof(WCHAR); + ret -= volume_prefix_len * sizeof(WCHAR); if (ret > sizeof(volume) - 1 * sizeof(WCHAR) && memcmp(name, volume, sizeof(volume) - 1 * sizeof(WCHAR)) == 0) return -1;