diff options
| author | Eric Blake <ebb9@byu.net> | 2009-09-16 08:27:07 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2009-09-16 21:26:58 -0600 |
| commit | 2bad8c0deaf43743537a20fcdf7702d610fbe71d (patch) | |
| tree | 1f54a2ba98f26f6afb6142a73a014bd1e07e2e9f | |
| parent | fe6f4e305c4ae24c542c460b8abddea648c7e8d1 (diff) | |
| download | coreutils-2bad8c0deaf43743537a20fcdf7702d610fbe71d.tar.xz | |
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.
| -rw-r--r-- | bootstrap.conf | 1 | ||||
| -rw-r--r-- | src/rmdir.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 9cdfb79d6..fb5ed1584 100644 --- 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 3bfff22d4..826cebcfa 100644 --- 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 |