[file-roller] zip: fixed -- position for the extraction command, added for list and test



commit 28436ba1c76541e29d930c3ee8e29805ac09259c
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Feb 11 20:22:17 2011 +0100

    zip: fixed -- position for the extraction command, added for list and test
    
    [bug #639664]

 src/fr-command-zip.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index 32c4410..8be5a1b 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -189,6 +189,7 @@ fr_command_zip_list (FrCommand  *comm)
 	fr_process_begin_command (comm->process, "unzip");
 	fr_process_set_begin_func (comm->process, list__begin, comm);
 	fr_process_add_arg (comm->process, "-ZTs");
+	fr_process_add_arg (comm->process, "--");
 	fr_process_add_arg (comm->process, comm->filename);
 	fr_process_end_command (comm->process);
 	fr_process_start (comm->process);
@@ -253,6 +254,7 @@ fr_command_zip_add (FrCommand     *comm,
 
 	fr_process_add_arg (comm->process, comm->filename);
 	fr_process_add_arg (comm->process, "--");
+
 	for (scan = file_list; scan; scan = scan->next)
 		fr_process_add_arg (comm->process, scan->data);
 
@@ -276,6 +278,7 @@ fr_command_zip_delete (FrCommand  *comm,
 
 	fr_process_add_arg (comm->process, comm->filename);
 	fr_process_add_arg (comm->process, "--");
+
 	for (scan = file_list; scan; scan = scan->next) {
 		char *escaped;
 
@@ -319,8 +322,9 @@ fr_command_zip_extract (FrCommand  *comm,
 		fr_process_add_arg (comm->process, "-j");
 	add_password_arg (comm, comm->password);
 
-	fr_process_add_arg (comm->process, comm->filename);
 	fr_process_add_arg (comm->process, "--");
+	fr_process_add_arg (comm->process, comm->filename);
+
 	for (scan = file_list; scan; scan = scan->next) {
 		char *escaped;
 
@@ -339,6 +343,7 @@ fr_command_zip_test (FrCommand   *comm)
 	fr_process_begin_command (comm->process, "unzip");
 	fr_process_add_arg (comm->process, "-t");
 	add_password_arg (comm, comm->password);
+	fr_process_add_arg (comm->process, "--");
 	fr_process_add_arg (comm->process, comm->filename);
 	fr_process_end_command (comm->process);
 }



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