From 03d5ce6d087057ba45f913fa7be12a646a204b99 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 22 Feb 2007 16:32:39 +0000 Subject: * dir.cc (rmdir): Move existance check in front of has_dot_last_component check. Simply setting errno in latter case. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/dir.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 8a002841d..aa112093b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2007-02-22 Corinna Vinschen + + * dir.cc (rmdir): Move existance check in front of + has_dot_last_component check. Simply setting errno in latter case. + 2007-02-22 Corinna Vinschen * fhandler.cc (fhandler_base::write): Remove wincap.has_lseek_bug case. diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 63467b7fb..3d0dbae7b 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -307,10 +307,10 @@ rmdir (const char *dir) debug_printf ("got %d error from build_fh_name", fh->error ()); set_errno (fh->error ()); } - else if (has_dot_last_component (dir, false)) - set_errno (fh->exists () ? EINVAL : ENOENT); else if (!fh->exists ()) set_errno (ENOENT); + else if (has_dot_last_component (dir, false)) + set_errno (EINVAL); else if (!fh->rmdir ()) res = 0; -- cgit v1.2.3