From eab4de10233923598f2b27cb0b868c723179b971 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Thu, 17 Apr 2014 08:42:24 +0100 Subject: gvfs-move: Improve the interactive overwrite Mimic the output of mv by displaying the full URI and put a space between the output and the user's input. Accept either lower or upper-case 'y'. https://bugzilla.gnome.org/show_bug.cgi?id=637543 --- programs/gvfs-move.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'programs') diff --git a/programs/gvfs-move.c b/programs/gvfs-move.c index 22978748..057f982f 100644 --- a/programs/gvfs-move.c +++ b/programs/gvfs-move.c @@ -113,6 +113,7 @@ main (int argc, char *argv[]) GFile *source, *dest, *target; gboolean dest_is_dir; char *basename; + char *uri; int i; GFileCopyFlags flags; int retval = 0; @@ -208,12 +209,12 @@ main (int argc, char *argv[]) g_error_free (error); error = NULL; - basename = g_file_get_basename (target); - g_print ("overwrite %s?", basename); - g_free (basename); + uri = g_file_get_uri (target); + g_print (_("%s: overwrite ‘%s’? "), argv[0], uri); + g_free (uri); if (fgets(line, sizeof (line), stdin) && - line[0] == 'y') + (line[0] == 'y' || line[0] == 'Y')) { flags |= G_FILE_COPY_OVERWRITE; if (!g_file_move (source, target, flags, NULL, NULL, NULL, &error)) -- cgit v1.2.1