From 16a72f7e4b7d5c974dbd4c8fbaaa5ac8c3628db1 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 9 Nov 2009 19:46:36 +0000 Subject: * path.cc (symlink_info::check_reparse_point): Always check SubstituteName for volume string to recognize volume mount points. Reuse subst when calling sys_wcstombs. * syscalls.cc (rename): Set errno to EBUSY when trying to rename volume mount points. Explain why. --- winsup/cygwin/path.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/path.cc') diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 1f95073b9..daf780e84 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1873,18 +1873,15 @@ symlink_info::check_reparse_point (HANDLE h) (WCHAR *)((char *)rp->MountPointReparseBuffer.PathBuffer + rp->MountPointReparseBuffer.SubstituteNameOffset), rp->MountPointReparseBuffer.SubstituteNameLength); - if (rp->MountPointReparseBuffer.PrintNameLength == 0 - || RtlEqualUnicodePathPrefix (&subst, &ro_u_volume, TRUE)) + if (RtlEqualUnicodePathPrefix (&subst, &ro_u_volume, TRUE)) { /* Volume mount point. Not treated as symlink. The return value of -1 is a hint for the caller to treat this as a volume mount point. */ return -1; } - sys_wcstombs (srcbuf, SYMLINK_MAX + 1, - (WCHAR *)((char *)rp->MountPointReparseBuffer.PathBuffer - + rp->MountPointReparseBuffer.SubstituteNameOffset), - rp->MountPointReparseBuffer.SubstituteNameLength / sizeof (WCHAR)); + sys_wcstombs (srcbuf, SYMLINK_MAX + 1, subst.Buffer, + subst.Length / sizeof (WCHAR)); pflags = PATH_SYMLINK | PATH_REP; fileattr &= ~FILE_ATTRIBUTE_DIRECTORY; } -- cgit v1.2.3