Add gvfs-move

Original git commit by Alexander Larsson <alex@greebo.(none)> at 1173966192 +0100

svn path=/trunk/; revision=399

3 files changed, 134 insertions, 2 deletions

diff --git a/programs/.gitignore b/programs/.gitignore
index 1aea958e..8f33d3d4 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -7,5 +7,5 @@ gvfs-cat
 gvfs-info
 gvfs-mount
 gvfs-create
-
-
+gvfs-copy
+gvfs-move
diff --git a/programs/Makefile.am b/programs/Makefile.am
index cdeb631c..0efd657f 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -17,6 +17,7 @@ bin_PROGRAMS =					\
 	gvfs-ls					\
 	gvfs-info				\
 	gvfs-copy				\
+	gvfs-move				\
 	$(NULL)
 
 gvfs_cat_SOURCES = gvfs-cat.c
@@ -34,5 +35,8 @@ gvfs_info_LDADD = $(libraries)
 gvfs_ls_SOURCES = gvfs-ls.c
 gvfs_ls_LDADD = $(libraries)
 
+gvfs_move_SOURCES = gvfs-move.c
+gvfs_move_LDADD = $(libraries)
+
 gvfs_mount_SOURCES = gvfs-mount.c
 gvfs_mount_LDADD = $(libraries)
diff --git a/programs/gvfs-move.c b/programs/gvfs-move.c
new file mode 100644
index 00000000..3755d080
--- /dev/null
+++ b/programs/gvfs-move.c
@@ -0,0 +1,128 @@
+#include <config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <locale.h>
+#include <errno.h>
+#include <string.h>
+
+#include <glib.h>
+#include <gio/gfile.h>
+
+static gboolean interactive = FALSE;
+static gboolean backup = FALSE;
+
+static GOptionEntry entries[] = 
+{
+	{ "interactive", 'i', 0, G_OPTION_ARG_NONE, &interactive, "prompt before overwrite", NULL },
+	{ "backup", 'b', 0, G_OPTION_ARG_NONE, &backup, "backup existing destination files", NULL },
+	{ NULL }
+};
+
+static gboolean
+is_dir (GFile *file)
+{
+  GFileInfo *info;
+  gboolean res;
+  
+  info = g_file_get_info (file, G_FILE_ATTRIBUTE_STD_TYPE, 0, NULL, NULL);
+  res = info && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY;
+  if (info)
+    g_object_unref (info);
+  return res;
+}
+
+int
+main (int argc, char *argv[])
+{
+  GError *error;
+  GOptionContext *context;
+  GFile *source, *dest, *target;
+  gboolean dest_is_dir;
+  char *basename;
+  int i;
+  GFileCopyFlags flags;
+  
+  setlocale (LC_ALL, "");
+
+  g_type_init ();
+  
+  error = NULL;
+  context = g_option_context_new ("- output files at <location>");
+  g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+  g_option_context_parse (context, &argc, &argv, &error);
+
+  if (argc <= 2)
+    {
+      g_printerr ("Missing operand\n");
+      return 1;
+    }
+
+  dest = g_file_get_for_commandline_arg (argv[argc-1]);
+
+  dest_is_dir = is_dir (dest);
+
+  if (!dest_is_dir && argc > 3)
+    {
+      g_printerr ("Target %s is not a directory\n", argv[argc-1]);
+      g_object_unref (dest);
+      return 1;
+    }
+
+  for (i = 1; i < argc - 1; i++)
+    {
+      source = g_file_get_for_commandline_arg (argv[i]);
+
+      if (dest_is_dir)
+	{
+	  basename = g_file_get_basename (source);
+	  target = g_file_get_child (dest, basename);
+	  g_free (basename);
+	}
+      else
+	target = g_object_ref (dest);
+
+      flags = 0;
+      if (backup)
+	flags |= G_FILE_COPY_BACKUP;
+      if (!interactive)
+	flags |= G_FILE_COPY_OVERWRITE;
+	
+      error = NULL;
+      if (!g_file_move (source, target, flags, NULL, NULL, NULL, &error))
+	{
+	  if (interactive && g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_EXIST))
+	    {
+	      char line[16];
+	      
+	      g_error_free (error);
+	      error = NULL;
+
+	      basename = g_file_get_basename (target);
+	      g_print ("overwrite %s?", basename);
+	      g_free (basename);
+
+	      if (fgets(line, sizeof (line), stdin) &&
+		  line[0] == 'y')
+		{
+		  flags |= G_FILE_COPY_OVERWRITE;
+		  if (!g_file_move (source, target, flags, NULL, NULL, NULL, &error))
+		    goto move_failed;
+		}
+	    }
+	  else
+	    {
+	    move_failed:
+	      g_printerr ("Error moving file %s: %s\n", argv[i], error->message);
+	      g_error_free (error);
+	    }
+	}
+
+      g_object_unref (source);
+      g_object_unref (target);
+    }
+
+  g_object_unref (dest);
+
+  return 0;
+}