drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2009-11-09 19:46:36 +00:00
parent ed66791aba
commit 16a72f7e4b
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2009-11-09 Corinna Vinschen <corinna@vinschen.de>
* 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.
2009-11-09 Corinna Vinschen <corinna@vinschen.de> 2009-11-09 Corinna Vinschen <corinna@vinschen.de>
* fhandler_console.cc (fhandler_console::read): Restrict generating * fhandler_console.cc (fhandler_console::read): Restrict generating

9
winsup/cygwin/path.cc
View File

@ -1873,18 +1873,15 @@ symlink_info::check_reparse_point (HANDLE h)
(WCHAR *)((char *)rp->MountPointReparseBuffer.PathBuffer (WCHAR *)((char *)rp->MountPointReparseBuffer.PathBuffer
+ rp->MountPointReparseBuffer.SubstituteNameOffset), + rp->MountPointReparseBuffer.SubstituteNameOffset),
rp->MountPointReparseBuffer.SubstituteNameLength); rp->MountPointReparseBuffer.SubstituteNameLength);
if (rp->MountPointReparseBuffer.PrintNameLength == 0 if (RtlEqualUnicodePathPrefix (&subst, &ro_u_volume, TRUE))
|| RtlEqualUnicodePathPrefix (&subst, &ro_u_volume, TRUE))
{ {
/* Volume mount point. Not treated as symlink. The return /* Volume mount point. Not treated as symlink. The return
value of -1 is a hint for the caller to treat this as a value of -1 is a hint for the caller to treat this as a
volume mount point. */ volume mount point. */
return -1; return -1;
} }
sys_wcstombs (srcbuf, SYMLINK_MAX + 1, sys_wcstombs (srcbuf, SYMLINK_MAX + 1, subst.Buffer,
(WCHAR *)((char *)rp->MountPointReparseBuffer.PathBuffer subst.Length / sizeof (WCHAR));
+ rp->MountPointReparseBuffer.SubstituteNameOffset),
rp->MountPointReparseBuffer.SubstituteNameLength / sizeof (WCHAR));
pflags = PATH_SYMLINK | PATH_REP; pflags = PATH_SYMLINK | PATH_REP;
fileattr &= ~FILE_ATTRIBUTE_DIRECTORY; fileattr &= ~FILE_ATTRIBUTE_DIRECTORY;
} }

10
winsup/cygwin/syscalls.cc
View File

@ -1758,6 +1758,16 @@ rename (const char *oldpath, const char *newpath)
set_errno (EROFS); set_errno (EROFS);
goto out; goto out;
} }
if (oldpc.has_attribute (FILE_ATTRIBUTE_REPARSE_POINT) && !oldpc.issymlink ())
{
/* Volume mount point. If we try to rename a volume mount point, NT
returns STATUS_NOT_SAME_DEVICE ==> Win32 ERROR_NOT_SAME_DEVICE ==>
errno EXDEV. That's bad since mv(1) will now perform a cross-device
move. So what we do here is to treat the volume mount point just
like Linux treats a mount point. */
set_errno (EBUSY);
goto out;
}
if (old_dir_requested && !oldpc.isdir ()) if (old_dir_requested && !oldpc.isdir ())
{ {
/* Reject rename("file/","x"). */ /* Reject rename("file/","x"). */