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 /src/copy.c | |
| 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 'src/copy.c')
| -rw-r--r-- | src/copy.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/copy.c b/src/copy.c index 49983869f..bd4df05fb 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1566,7 +1566,8 @@ writable_destination (char const *file, mode_t mode) } static void -overwrite_prompt (char const *dst_name, struct stat const *dst_sb) +overwrite_prompt (struct cp_options const *x, char const *dst_name, + struct stat const *dst_sb) { if (! writable_destination (dst_name, dst_sb->st_mode)) { @@ -1574,7 +1575,10 @@ overwrite_prompt (char const *dst_name, struct stat const *dst_sb) strmode (dst_sb->st_mode, perms); perms[10] = '\0'; fprintf (stderr, - _("%s: try to overwrite %s, overriding mode %04lo (%s)? "), + _((x->unlink_dest_before_opening + || x->unlink_dest_after_failed_open) + ? "%s: replace %s, overriding mode %04lo (%s)? " + : "%s: unwritable %s (mode %04lo, %s); try anyway? "), program_name, quote (dst_name), (unsigned long int) (dst_sb->st_mode & CHMOD_MODE_BITS), &perms[1]); @@ -1638,7 +1642,7 @@ abandon_move (const struct cp_options *x, || (x->interactive == I_UNSPECIFIED && x->stdin_tty && ! writable_destination (dst_name, dst_sb->st_mode))) - && (overwrite_prompt (dst_name, dst_sb), 1) + && (overwrite_prompt (x, dst_name, dst_sb), 1) && ! yesno ())); } @@ -1913,7 +1917,7 @@ copy_internal (char const *src_name, char const *dst_name, if (! S_ISDIR (src_mode) && (x->interactive == I_ALWAYS_NO || (x->interactive == I_ASK_USER - && (overwrite_prompt (dst_name, &dst_sb), 1) + && (overwrite_prompt (x, dst_name, &dst_sb), 1) && ! yesno ()))) return true; } |