Cygwin: rmdir: handle /dev in fhandler_dev::rmdir

The isdev_dev check in rmdir is unclean.  Create a virtual method
fhandler_dev::rmdir to handle this transparently.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index f912a9e47b75bc2ae76441bcc3e6fe66f4e12255..7762557d6cf2ed64d34a7c2cc6c250bbaf469dff 100644 (file)
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -410,8 +410,6 @@ rmdir (const char *dir)
        set_errno (ENOENT);
       else if (has_dot_last_component (dir, false))
        set_errno (EINVAL);
-      else if (isdev_dev (fh->dev ()))
-       set_errno (ENOTEMPTY);
       else if (!fh->rmdir ())
        res = 0;
       delete fh;

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index e1829e28f78dd333c0fcc642c7a59e8a2ca556eb..af1ef3a45c9dd815c8b1478edb596f1b42a8ca49 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1765,6 +1765,7 @@ public:
   int close ();
   int __reg2 fstat (struct stat *buf);
   int __reg2 fstatvfs (struct statvfs *buf);
+  int rmdir ();
   DIR __reg2 *opendir (int fd);
   int __reg3 readdir (DIR *, dirent *);
   void rewinddir (DIR *);

diff --git a/winsup/cygwin/fhandler_dev.cc b/winsup/cygwin/fhandler_dev.cc
index 28b0e3cf01f374eed7010dd1f89d2be194348f10..5fd75a58e3765526cd88243bc0cee091676c2117 100644 (file)
--- a/winsup/cygwin/fhandler_dev.cc
+++ b/winsup/cygwin/fhandler_dev.cc
@@ -107,6 +107,13 @@ fhandler_dev::fstatvfs (struct statvfs *sfs)
   return ret;
 }
 
+int
+fhandler_dev::rmdir ()
+{
+  set_errno (ENOTEMPTY);
+  return -1;
+}
+
 DIR *
 fhandler_dev::opendir (int fd)
 {