rm, rmdir: improve cross-compilation support

* bootstrap.conf (gnulib_modules): Drop rmdir-errno.
* src/rmdir.c (errno_rmdir_non_empty): Check both cases allowed by
POSIX, rather than relying on configure-time check that might
fail during cross-compilation.  Reverts commit 9b6eb98d41.

diff --git a/bootstrap.conf b/bootstrap.conf
index 9cdfb79d6c6f5914920dfea33e100b97abbe8b77..fb5ed158408662ddda2a4e813e1663d46c006115 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -179,7 +179,6 @@ gnulib_modules="
   regex
   rename-dest-slash
   rmdir
-  rmdir-errno
   root-dev-ino
   rpmatch
   safe-read

diff --git a/src/rmdir.c b/src/rmdir.c
index 3bfff22d452c7bda1a55958f992100769f922fd9..826cebcfa40570d0bd616387e75f8cda69acd368 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -74,7 +74,7 @@ static struct option const longopts[] =
 static bool
 errno_rmdir_non_empty (int error_number)
 {
-  return (error_number == RMDIR_ERRNO_NOT_EMPTY);
+  return error_number == ENOTEMPTY || error_number == EEXIST;
 }
 
 /* Return true if when rmdir fails with errno == ERROR_NUMBER