CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 03:12:48 +02:00
Code Issues Projects Releases Wiki Activity

Attempt rmdir (actually, unlinkat-with-AT_REMOVEDIR) upon any

Browse Source 
fd_to_subdirp failure, not just when errno == EACCES.
* src/remove.c (remove_dir): Use unlinkat-with-AT_REMOVEDIR, not
rmdir, here, even though rmdir may happen to be adequate.
This commit is contained in:
Jim Meyering
2006-06-26 13:29:48 +00:00
parent 78b166d1b1
commit 7590adf9b9
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/remove.c
View File

@@ -1224,26 +1224,24 @@ remove_dir (int fd_cwd, Dirstack_state *ds, char const *dir,
if (dirp == NULL)
{
int saved_errno = errno;
if (errno == EACCES)
/* CAUTION: this test and diagnostic are identical to
those following the other use of fd_to_subdirp. */
if (errno == ENOENT && x->ignore_missing_files)
{
/* If fd_to_subdirp fails due to permissions, then try to
remove DIR via rmdir, in case it's just an empty directory. */
/* This use of rmdir just works, at least in the sole test I
have that exercises this code, but it'll soon go, to be
replaced by a use of unlinkat-with-AT_REMOVEDIR. */
if (rmdir (dir) == 0)
/* With -f, don't report "file not found". */
}
else
{
/* Upon fd_to_subdirp failure, try to remove DIR directly,
in case it's just an empty directory. */
int saved_errno = errno;
if (unlinkat (fd_cwd, dir, AT_REMOVEDIR) == 0)
return RM_OK;
errno = saved_errno;
error (0, saved_errno,
_("cannot remove %s"), quote (full_filename (dir)));
}
/* CAUTION: this test and diagnostic are identical to those
following the other use of fd_to_subdirp. */
if (errno != ENOENT || !x->ignore_missing_files)
error (0, errno,
_("cannot remove %s"), quote (full_filename (dir)));
return RM_ERROR;
}