* dir.cc (rmdir): Don't skip deleting fh in the ENOTEMPTY case.

This commit is contained in:
Corinna Vinschen 2014-08-21 08:46:35 +00:00
parent 854e058b56
commit 88fa851784
2 changed files with 5 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2014-08-21 Corinna Vinschen <corinna@vinschen.de>
* dir.cc (rmdir): Don't skip deleting fh in the ENOTEMPTY case.
2014-08-20 Corinna Vinschen <corinna@vinschen.de>
* tls_pbuf.h (tmp_pathbuf::tmp_pathbuf): Convert to inline method.

View File

@ -359,10 +359,7 @@ rmdir (const char *dir)
else if (has_dot_last_component (dir, false))
set_errno (EINVAL);
else if (isdev_dev (fh->dev ()))
{
set_errno (ENOTEMPTY);
goto done;
}
set_errno (ENOTEMPTY);
else if (!fh->rmdir ())
res = 0;