From 25402a6a9c66fb827490e72430082740ab89bfc0 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 11 Nov 2013 21:11:35 +0100
Subject: fixed error when creating zip archives with files starting with an
hyphen
---
src/fr-command-zip.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index 8c51bef..aa2b9fc 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -253,6 +253,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);
@@ -275,6 +276,7 @@ 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 +321,7 @@ 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;
--
cgit v1.2.1
From 93134547b19b35556388b4a94df29ff5570d1c06 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 11 Nov 2013 21:30:02 +0100
Subject: zip: fixed -- position for the extraction command, added for list and
test
---
src/fr-command-zip.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index aa2b9fc..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);
@@ -254,6 +255,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);
@@ -277,6 +279,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;
@@ -322,6 +325,7 @@ fr_command_zip_extract (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;
@@ -340,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);
}
--
cgit v1.2.1
From 05fde63e637e17dc2d082b7fdad20581b9cf74a0 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 11 Nov 2013 22:24:15 +0100
Subject: Add Microsoft Cabinet to the supported mime types
---
data/engrampa.desktop.in.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in
index a19666a..0f09e54 100644
--- a/data/engrampa.desktop.in.in
+++ b/data/engrampa.desktop.in.in
@@ -9,7 +9,7 @@ Terminal=false
Type=Application
Icon=engrampa
Categories=GTK;Utility;Archiving;Compression;
-MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;
+MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/vnd.ms-cab-compressed;
X-MATE-DocPath=engrampa/engrampa.xml
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=engrampa
--
cgit v1.2.1
From e15aa1d331f2ded59ab740559015850cdb8cb7fb Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 11 Nov 2013 22:45:29 +0100
Subject: Add *.ar files as supported
---
data/engrampa.desktop.in.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in
index 0f09e54..58e71b3 100644
--- a/data/engrampa.desktop.in.in
+++ b/data/engrampa.desktop.in.in
@@ -9,7 +9,7 @@ Terminal=false
Type=Application
Icon=engrampa
Categories=GTK;Utility;Archiving;Compression;
-MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/vnd.ms-cab-compressed;
+MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed;
X-MATE-DocPath=engrampa/engrampa.xml
X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=engrampa
--
cgit v1.2.1