* dir.cc (mkdir): Reorganize check for trailing dot to return correct error

when directory exists.
* fhandler_disk_file.cc (fhandler_disk_file::mkdir): Remove special test for
path ending in '.'.

1 files changed, 2 insertions, 6 deletions

diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index 0b588b5fc..0caf2df3a 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -265,12 +265,6 @@ mkdir (const char *dir, mode_t mode)
   if (efault.faulted (EFAULT))
     return -1;
 
-  if (has_dot_last_component (dir))
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
   if (!(fh = build_fh_name (dir, NULL, PC_SYM_NOFOLLOW)))
     goto done;   /* errno already set */;
 
@@ -279,6 +273,8 @@ mkdir (const char *dir, mode_t mode)
       debug_printf ("got %d error from build_fh_name", fh->error ());
       set_errno (fh->error ());
     }
+  else if (has_dot_last_component (dir))
+    set_errno (fh->exists () ? EEXIST : ENOENT);
   else if (!fh->mkdir (mode))
     res = 0;
   delete fh;