[file-roller] added the -- switch to mv to deal with files starting with --



commit 274a0a73d2004cce3165b031dc289d3e982a613f
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Nov 27 10:11:41 2012 +0100

    added the -- switch to mv to deal with files starting with --

 src/fr-command-tar.c |    2 ++
 src/fr-command.c     |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index 3ca7be9..8ef36e5 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -695,6 +695,7 @@ fr_command_tar_recompress (FrCommand *comm)
 
 		fr_process_begin_command (comm->process, "mv");
 		fr_process_add_arg (comm->process, "-f");
+		fr_process_add_arg (comm->process, "--");
 		fr_process_add_arg (comm->process, new_name);
 		fr_process_add_arg (comm->process, comm->filename);
 		fr_process_end_command (comm->process);
@@ -862,6 +863,7 @@ fr_command_tar_uncompress (FrCommand *comm)
 		if (archive_exists) {
 			fr_process_begin_command (comm->process, "mv");
 			fr_process_add_arg (comm->process, "-f");
+			fr_process_add_arg (comm->process, "--");
 			fr_process_add_arg (comm->process, comm->filename);
 			fr_process_add_arg (comm->process, tmp_name);
 			fr_process_end_command (comm->process);
diff --git a/src/fr-command.c b/src/fr-command.c
index 480cf9e..2ac3671 100644
--- a/src/fr-command.c
+++ b/src/fr-command.c
@@ -1109,6 +1109,7 @@ _fr_command_add (FrCommand      *self,
 		if (use_tmp_subdirectory) {
 			fr_process_begin_command (self->process, "mv");
 			fr_process_add_arg (self->process, "-f");
+			fr_process_add_arg (self->process, "--");
 			fr_process_add_arg (self->process, tmp_archive_filename);
 			fr_process_add_arg (self->process, archive_filename);
 			fr_process_end_command (self->process);
@@ -1657,6 +1658,7 @@ _fr_command_remove (FrCommand     *self,
 
 	fr_process_begin_command (self->process, "mv");
 	fr_process_add_arg (self->process, "-f");
+	fr_process_add_arg (self->process, "--");
 	fr_process_add_arg (self->process, tmp_archive_filename);
 	fr_process_add_arg (self->process, archive_filename);
 	fr_process_end_command (self->process);
@@ -1771,6 +1773,7 @@ move_files_to_dir (FrCommand *self,
 		fr_process_add_arg (self->process, "-f");
 	else
 		fr_process_add_arg (self->process, "-n");
+	fr_process_add_arg (self->process, "--");
 	for (scan = list; scan; scan = scan->next) {
 		char *filename = scan->data;
 
@@ -2546,6 +2549,7 @@ fr_command_rename (FrArchive           *archive,
 
 		fr_process_begin_command (self->process, "mv");
 		fr_process_add_arg (self->process, "-f");
+		fr_process_add_arg (self->process, "--");
 		fr_process_add_arg_file (self->process, old_file);
 		fr_process_add_arg_file (self->process, new_file);
 		fr_process_end_command (self->process);
@@ -2571,6 +2575,7 @@ fr_command_rename (FrArchive           *archive,
 		if (! is_dir) {
 			fr_process_begin_command (self->process, "mv");
 			fr_process_add_arg (self->process, "-f");
+			fr_process_add_arg (self->process, "--");
 			fr_process_add_arg_file (self->process, old_file);
 			fr_process_add_arg_file (self->process, new_file);
 			fr_process_end_command (self->process);
@@ -2702,6 +2707,7 @@ fr_command_paste_clipboard (FrArchive           *archive,
 			fr_process_set_ignore_error (command->process, TRUE);
 			fr_process_set_working_dir_file (command->process, tmp_dir);
 			fr_process_add_arg (command->process, "-f");
+			fr_process_add_arg (command->process, "--");
 			if (old_name[0] == '/')
 				old_name = old_name + 1;
 			fr_process_add_arg (command->process, old_name);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]