From 2d8ae88a228ac82c725f22aaee24accde8a12dcf Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Wed, 26 Mar 2014 13:36:16 +0000 Subject: mv: fix issues with previous prompt adjustments * src/copy.c (overwrite_ok): Fix the gettext calls so that the second string is tagged for translation. Display the correct "replace ..." prompt when in move_mode. * tests/mv/i-3.sh: Display the output on failure to ease debugging. --- src/copy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/copy.c b/src/copy.c index 71813dc40..781cc1e15 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1575,10 +1575,10 @@ overwrite_ok (struct cp_options const *x, char const *dst_name, strmode (dst_sb->st_mode, perms); perms[10] = '\0'; fprintf (stderr, - _((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? "), + (x->move_mode || 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]); -- cgit v1.2.3-54-g00ecf