mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-27 12:04:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

rm: --dir (-d): fix bugs in handling of empty, inaccessible directories

Browse Source 
* src/remove.c (prompt, rm_fts): In the dir-handling code of both of
these functions, relax a "get_dir_status (...) == DS_EMPTY" condition
to instead test only "get_dir_status (...) != 0", enabling flow control
to reach the prompt function also for unreadable directories. However,
that function itself also needed special handling for this case:
(prompt): Handle empty, inaccessible directories properly,
deleting them with -d (--dir), and prompting about whether to delete
with -i (--interactive).
* tests/rm/empty-inacc.sh: Add tests for the new code.
Reported by наб <nabijaczleweli@nabijaczleweli.xyz> in
bugs.debian.org/1015273
* NEWS (Bug fixes): Mention this.
This commit is contained in:
Jim Meyering 2023-02-06 09:01:55 -08:00
parent 95f4ee0577
commit a0803c4bad
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -36,6 +36,10 @@ GNU coreutils NEWS -*- outline -*-
'mv --backup=simple f d/' no longer mistakenly backs up d/f to f~.
[bug introduced in coreutils-9.1]
rm -d (--dir) now properly handles unreadable empty directories.
E.g., before, this would fail to remove d: mkdir -m0 d; src/rm -d d
[bug introduced in v8.19 with the addition of this option]
runcon --compute no longer looks up the specified command in the $PATH
so that there is no mismatch between the inspected and executed file.
[bug introduced when runcon was introduced in coreutils-6.9.90]

25
src/remove.c
View File

@ -212,7 +212,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
int wp_errno = 0;
if (!x->ignore_missing_files
&& ((x->interactive == RMI_ALWAYS) || x->stdin_tty)
&& (x->interactive == RMI_ALWAYS || x->stdin_tty)
&& dirent_type != DT_LNK)
{
write_protected = write_protected_non_symlink (fd_cwd, filename, sbuf);
@ -254,7 +254,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
prompting the user */
if ( ! (x->recursive
|| (x->remove_empty_directories
&& get_dir_status (fts, ent, dir_status) == DS_EMPTY)))
&& get_dir_status (fts, ent, dir_status) != 0)))
{
write_protected = -1;
wp_errno = *dir_status <= 0 ? EISDIR : *dir_status;
@ -281,8 +281,23 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
program_name, quoted_name);
else if (0 < *dir_status)
{
error (0, *dir_status, _("cannot remove %s"), quoted_name);
return RM_ERROR;
if ( ! (x->remove_empty_directories && *dir_status == EACCES))
{
error (0, *dir_status, _("cannot remove %s"), quoted_name);
return RM_ERROR;
}
/* The following code can lead to a successful deletion only with
the --dir (-d) option (remove_empty_directories) and an empty
inaccessible directory. In the first prompt call for a directory,
we'd normally ask whether to descend into it, but in this case
(it's inaccessible), that is not possible, so don't prompt. */
if (mode == PA_DESCEND_INTO_DIR)
return RM_OK;
fprintf (stderr,
_("%s: attempt removal of inaccessible directory %s? "),
program_name, quoted_name);
}
else
{
@ -434,7 +449,7 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x)
case FTS_D: /* preorder directory */
if (! x->recursive
&& !(x->remove_empty_directories
&& get_dir_status (fts, ent, &dir_status) == DS_EMPTY))
&& get_dir_status (fts, ent, &dir_status) != 0))
{
/* This is the first (pre-order) encounter with a directory
that we cannot delete.

27
tests/rm/empty-inacc.sh
View File

@ -24,8 +24,7 @@ mkdir -m0 inacc || framework_failure_
# Also exercise the different code path that's taken for a directory
# that is empty (hence removable) and unreadable.
mkdir -m a-r -p a/unreadable
mkdir -m a-r -p a/unreadable || framework_failure_
# This would fail for e.g., coreutils-5.93.
rm -rf inacc || fail=1
@ -35,4 +34,28 @@ test -d inacc && fail=1
rm -rf a || fail=1
test -d a && fail=1
# Ensure that using rm -d removes an unreadable empty directory.
mkdir -m a-r unreadable2 || framework_failure_
mkdir -m0 inacc2 || framework_failure_
# These would fail for coreutils-9.1 and prior.
rm -d unreadable2 || fail=1
test -d unreadable2 && fail=1
rm -d inacc2 || fail=1
test -d inacc2 && fail=1
# Test the interactive code paths that are new with 9.2:
mkdir -m0 inacc2 || framework_failure_
echo n | rm ---presume-input-tty -di inacc2 > out 2>&1 || fail=1
# decline: ensure it was not deleted, and the prompt was as expected.
printf "rm: attempt removal of inaccessible directory 'inacc2'? " > exp
test -d inacc2 || fail=1
compare exp out || fail=1
echo y | rm ---presume-input-tty -di inacc2 > out 2>&1 || fail=1
# accept: ensure it **was** deleted, and the prompt was as expected.
test -d inacc2 && fail=1
compare exp out || fail=1
Exit $fail