From 48726c8a06516a793377355303c2f9a22bf8ad07 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 12 Mar 2008 18:46:10 +0000 Subject: [PATCH] * syscalls.cc (rename): Handle a special case of trying to rename a mount point. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/syscalls.cc | 18 +++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 07f70fb19..43421a6ea 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-03-12 Corinna Vinschen + + * syscalls.cc (rename): Handle a special case of trying to rename a + mount point. + 2008-03-12 Corinna Vinschen * environ.h: Fix comment. diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index e421edd9c..548e2c66f 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1573,13 +1573,21 @@ rename (const char *oldpath, const char *newpath) /* First check if oldpath and newpath only differ by case. If so, it's just a request to change the case of the filename. By simply setting the file attributes to INVALID_FILE_ATTRIBUTES (which translates to - "file doesn't exist"), all later tests are skipped. */ - if (newpc.exists () - && equal_path - && !RtlEqualUnicodeString (oldpc.get_nt_native_path (), + "file doesn't exist"), all later tests are skipped. + If not, it's a request to change the case of the name of a mount + point. If we don't catch this here, the underlying directory would + be deleted, if it happens to be empty. */ + if (newpc.exists () && equal_path) + { + if (RtlEqualUnicodeString (oldpc.get_nt_native_path (), newpc.get_nt_native_path (), FALSE)) - newpc.file_attributes (INVALID_FILE_ATTRIBUTES); + { + set_errno (EACCES); + goto out; + } + newpc.file_attributes (INVALID_FILE_ATTRIBUTES); + } else if (oldpc.isdir ()) { if (newpc.exists () && !newpc.isdir ())