From 124d4c50103e42048dd76d0ab549de6bc216413b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 27 Mar 2008 13:02:07 +0000 Subject: [PATCH] * syscalls.cc (rename): Fix setting errno in case of trailing "/." --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/syscalls.cc | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 624acd316..57292c634 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2008-03-27 Corinna Vinschen + + * syscalls.cc (rename): Fix setting errno in case of trailing "/." + 2008-03-27 Corinna Vinschen * fhandler_socket.cc: Create shared objects session local throughout. diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index d5f468344..eb3993d3d 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1497,10 +1497,16 @@ rename (const char *oldpath, const char *newpath) if (efault.faulted (EFAULT)) return -1; - if (has_dot_last_component (oldpath, true) - || has_dot_last_component (newpath, true)) + if (has_dot_last_component (oldpath, true)) { - set_errno (EINVAL); + oldpc.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes); + set_errno (oldpc.isdir () ? EBUSY : ENOTDIR); + goto out; + } + if (has_dot_last_component (newpath, true)) + { + newpc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes); + set_errno (!newpc.exists () ? ENOENT : newpc.isdir () ? EBUSY : ENOTDIR); goto out; }