diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-24 23:14:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-24 23:18:41 -0700 |
| commit | 4b25fdbdabce1b758e55880d0aa3947614d94c3d (patch) | |
| tree | c67488717b39abf12bb3fae00f60b1f05ad4087d /tests | |
| parent | 5f9a5b3f0346f4fb6b758953d4eaeff3d6a419d6 (diff) | |
| download | coreutils-4b25fdbdabce1b758e55880d0aa3947614d94c3d.tar.xz | |
cp: improve quality of overwrite prompt
* src/copy.c (overwrite_prompt): New arg X. All callers changed.
Use X to improve the quality of the prompt (Bug#17087).
* tests/mv/i-2.sh, tests/mv/i-3.sh: Change test to match new prompt.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/mv/i-2.sh | 2 | ||||
| -rwxr-xr-x | tests/mv/i-3.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/mv/i-2.sh b/tests/mv/i-2.sh index 62d63af77..4202b5c5b 100755 --- a/tests/mv/i-2.sh +++ b/tests/mv/i-2.sh @@ -36,7 +36,7 @@ cp -if e f < y > out 2>&1 || fail=1 # Make sure out contains the prompt. case "$(cat out)" in - "cp: try to overwrite 'f', overriding mode 0000 (---------)?"*) ;; + "cp: replace 'f', overriding mode 0000 (---------)?"*) ;; *) fail=1 ;; esac diff --git a/tests/mv/i-3.sh b/tests/mv/i-3.sh index e03dc9999..690af7385 100755 --- a/tests/mv/i-3.sh +++ b/tests/mv/i-3.sh @@ -46,7 +46,7 @@ check_overwrite_prompt() { local delay="$1" case "$(cat out)" in - "mv: try to overwrite 'g', overriding mode 0000"*) ;; + "mv: replace 'g', overriding mode 0000"*) ;; *) sleep $delay; return 1;; esac } |