From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 2DC163870883; Tue, 19 Jan 2021 09:54:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2DC163870883 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: rmdir: handle /dev in fhandler_dev::rmdir X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 31ccf40583a4473d34be9d24409aa99afd055ba3 X-Git-Newrev: 877f0d13f0f6c6cc8b7988951edac73709d82861 Message-Id: <20210119095448.2DC163870883@sourceware.org> Date: Tue, 19 Jan 2021 09:54:48 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2021 09:54:48 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=877f0d13f0f6c6cc8b7988951edac73709d82861 commit 877f0d13f0f6c6cc8b7988951edac73709d82861 Author: Corinna Vinschen Date: Tue Jan 19 10:50:36 2021 +0100 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 Diff: --- winsup/cygwin/dir.cc | 2 -- winsup/cygwin/fhandler.h | 1 + winsup/cygwin/fhandler_dev.cc | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index f912a9e47..7762557d6 100644 --- 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 e1829e28f..af1ef3a45 100644 --- 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 28b0e3cf0..5fd75a58e 100644 --- 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) {