summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-12-15 07:38:16 -0800
committerStefano Karapetsas <[email protected]>2013-12-15 07:38:16 -0800
commitf4611c3411c44e792f729a0780c31b0aa55fe004 (patch)
treec676cef525d4af58a85886c585ee624c862b36d3 /src
parent0e4df16ea5762fb11aac4cece97aa5210ccb6f0f (diff)
parente15aa1d331f2ded59ab740559015850cdb8cb7fb (diff)
downloadengrampa-f4611c3411c44e792f729a0780c31b0aa55fe004.tar.bz2
engrampa-f4611c3411c44e792f729a0780c31b0aa55fe004.tar.xz
Merge pull request #34 from NiceandGently/master
add support for cab and .ar files + zip improvements
Diffstat (limited to 'src')
-rw-r--r--src/fr-command-zip.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index 8c51bef..2aa332e 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -190,6 +190,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,8 @@ 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);
@@ -275,6 +278,8 @@ fr_command_zip_delete (FrCommand *comm,
fr_process_add_arg (comm->process, "-d");
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,6 +324,8 @@ fr_command_zip_extract (FrCommand *comm,
add_password_arg (comm, comm->password);
fr_process_add_arg (comm->process, comm->filename);
+ fr_process_add_arg (comm->process, "--");
+
for (scan = file_list; scan; scan = scan->next) {
char *escaped;
@@ -337,6 +344,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);
}