mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-24 10:23:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

rm: with -I, prompt before deleting a write protected file

Browse Source 
This regression was introduced in commit v6.7-71-g0928c24

* src/rm.c (main): Make the -I option behave like --interactive=once.
* tests/rm/interactive-once.sh: Add cases for single and multiple files.
* NEWS: Mention the bug fix.
Fixes http://bugs.gnu.org/9308
This commit is contained in:
Sergio Durigan Junior 2013-09-25 11:02:08 +01:00 committed by Pádraig Brady
parent 3414301f59
commit 5ee7d8f55b
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -34,6 +34,9 @@ GNU coreutils NEWS -*- outline -*-
print approximately 2*N bytes of extraneous padding.
[Bug introduced in coreutils-7.0]
rm -I now prompts for confirmation before removing a write protected file.
[Bug introduced in coreutils-6.8]
tail --retry -f now waits for the files specified to appear. Before, tail
would immediately exit when such a file is inaccessible during the initial
open.

2
src/rm.c
View File

@ -244,7 +244,7 @@ main (int argc, char **argv)
break;
case 'I':
x.interactive = RMI_NEVER;
x.interactive = RMI_SOMETIMES;
x.ignore_missing_files = false;
prompt_once = true;
break;

26
tests/rm/interactive-once.sh
View File

@ -35,6 +35,15 @@ rm -I file1-* < in-n >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file1-1 && fail=1
if ls /dev/stdin >/dev/null 2>&1; then
echo 'one file, read only, answer no' >> err || fail=1
touch file1-1 || framework_failure_
chmod a-w file1-1 || framework_failure_
rm ---presume-input-tty -I file1-* < in-n >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file1-1 || fail=1
fi
echo 'three files, no recursion' >> err || fail=1
rm -I file2-* < in-n >> out 2>> err || fail=1
echo . >> err || fail=1
@ -58,6 +67,19 @@ test -f file3-2 && fail=1
test -f file3-3 && fail=1
test -f file3-4 && fail=1
if ls /dev/stdin >/dev/null 2>&1; then
echo 'four files, no recursion, 1 read only, answer yes no' >> err || fail=1
touch file3-1 file3-2 file3-3 file3-4 || framework_failure_
echo non_empty > file3-4 || framework_failure_ # to shorten diagnostic
chmod a-w file3-4 || framework_failure_
cat in-y in-n | rm ---presume-input-tty -I file3-* >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file3-1 && fail=1
test -f file3-2 && fail=1
test -f file3-3 && fail=1
test -f file3-4 || fail=1
fi
echo 'one file, recursion, answer no' >> err || fail=1
rm -I -R dir1-* < in-n >> out 2>> err || fail=1
echo . >> err || fail=1
@ -85,12 +107,16 @@ EOF
cat <<\EOF > experr || fail=1
one file, no recursion
.
one file, read only, answer no
rm: remove write-protected regular empty file 'file1-1'? .
three files, no recursion
.
four files, no recursion, answer no
rm: remove 4 arguments? .
four files, no recursion, answer yes
rm: remove 4 arguments? .
four files, no recursion, 1 read only, answer yes no
rm: remove 4 arguments? rm: remove write-protected regular file 'file3-4'? .
one file, recursion, answer no
rm: remove 1 argument recursively? .
one file, recursion, answer yes