From: corinna <corinna>
Date: Thu, 22 Feb 2007 16:32:39 +0000 (+0000)
Subject: 	* dir.cc (rmdir): Move existance check in front of
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=33724f411d91afc6e8cd5d04d7bc0bb35b33df50;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* dir.cc (rmdir): Move existance check in front of
	has_dot_last_component check.  Simply setting errno in latter case.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8a002841d5..aa112093b5 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2007-02-22  Corinna Vinschen  <corinna@vinschen.de>
 
+	* 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  <corinna@vinschen.de>
+
 	* fhandler.cc (fhandler_base::write): Remove wincap.has_lseek_bug case.
 	Simplify seek beyond EOF case.
 	* times.cc (times): Remove wincap.has_get_process_times case.
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 63467b7fb4..3d0dbae7b2 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;