rm: make ‘rm -d DIR’ more like ‘rmdir DIR’

* src/remove.c (rm_fts): When not recursive,
arrange for ‘rm -d DIR’ to behave more like ‘rmdir DIR’.
This works better for Ceph snapshot directories.
Problem reported by Yannick Le Pennec (bug#78245).
This commit is contained in:
Paul Eggert committed 2025-10-06 13:37:21 -07:00
1 parent ce8c22d25f
commit bae32db8fe
2 files changed
+12 -10

No files matched your search

+4
View File
@@ -11,6 +11,10 @@ GNU coreutils NEWS -*- outline -*-
for all length adjustable algorithms (blake2b, sha2, sha3).
[bug introduced in coreutils-9.2]
'rm -d DIR' no longer fails on Ceph snapshot directories.
Although these directories are nonempty, 'rmdir DIR' succeeds on them.
[bug introduced in coreutils-8.16]
'tail' outputs the correct number of lines again for non-small -n values.
Previously it may have output too few lines.
[bug introduced in coreutils-9.8]
+8 -10
View File
@@ -446,18 +446,16 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x)
switch (ent->fts_info)
{
case FTS_D: /* preorder directory */
if (! x->recursive
&& !(x->remove_empty_directories
&& get_dir_status (fts, ent, &dir_status) != 0))
if (!x->recursive)
{
/* This is the first (pre-order) encounter with a directory
that we cannot delete.
Not recursive, and it's not an empty directory (if we're removing
them) so arrange to skip contents. */
int err = x->remove_empty_directories ? ENOTEMPTY : EISDIR;
error (0, err, _("cannot remove %s"), quoteaf (ent->fts_path));
/* Not recursive, so skip contents, and fail now unless
removing empty directories. */
fts_set (fts, ent, FTS_SKIP);
if (x->remove_empty_directories)
return RM_OK;
error (0, EISDIR, _("cannot remove %s"), quoteaf (ent->fts_path));
mark_ancestor_dirs (ent);
fts_skip_tree (fts, ent);
ignore_value (fts_read (fts));
return RM_ERROR;
}