From 0f7ac147bd6d1472cc0fff7c7e206abf34712e19 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 12 Mar 2008 18:54:24 +0000 Subject: [PATCH] * syscalls.cc (rename): Just return with 0 if filenames are identical, per POSIX. Drop comment added in previous patch. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/syscalls.cc | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 43421a6ea..f36a1797d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-03-12 Corinna Vinschen + + * syscalls.cc (rename): Just return with 0 if filenames are identical, + per POSIX. Drop comment added in previous patch. + 2008-03-12 Corinna Vinschen * syscalls.cc (rename): Handle a special case of trying to rename a diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 548e2c66f..337d50282 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1573,17 +1573,14 @@ 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 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. */ + "file doesn't exist"), all later tests are skipped. */ if (newpc.exists () && equal_path) { if (RtlEqualUnicodeString (oldpc.get_nt_native_path (), newpc.get_nt_native_path (), FALSE)) { - set_errno (EACCES); + res = 0; goto out; } newpc.file_attributes (INVALID_FILE_ATTRIBUTES);