diff options
author | Sergio Durigan Junior <sergiodj@sergiodj.net> | 2013-09-25 11:02:08 +0100 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2013-09-26 11:25:05 +0100 |
commit | 5ee7d8f55bb0a48fd2cd5bc3c12b3db588d98beb (patch) | |
tree | 48ec7575d1262f4099818edf68b07233b5350f1f /tests | |
parent | 3414301f5951c1805aa9185cce13f421f09042de (diff) | |
download | coreutils-5ee7d8f55bb0a48fd2cd5bc3c12b3db588d98beb.tar.xz |
rm: with -I, prompt before deleting a write protected file
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
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/rm/interactive-once.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/rm/interactive-once.sh b/tests/rm/interactive-once.sh index dcda5b848..1064c0851 100755 --- a/tests/rm/interactive-once.sh +++ b/tests/rm/interactive-once.sh @@ -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 |