[gvfs] gvfs-move: Improve the interactive overwrite

[Ross Lagerwall <rossl src gnome org>]

commit eab4de10233923598f2b27cb0b868c723179b971
Author: Ross Lagerwall <rosslagerwall gmail com>
Date:   Thu Apr 17 08:42:24 2014 +0100

    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 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/programs/gvfs-move.c b/programs/gvfs-move.c
index 2297874..057f982 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))