diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-15 07:38:16 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-15 07:38:16 -0800 |
| commit | f4611c3411c44e792f729a0780c31b0aa55fe004 (patch) | |
| tree | c676cef525d4af58a85886c585ee624c862b36d3 | |
| parent | 0e4df16ea5762fb11aac4cece97aa5210ccb6f0f (diff) | |
| parent | e15aa1d331f2ded59ab740559015850cdb8cb7fb (diff) | |
| download | engrampa-f4611c3411c44e792f729a0780c31b0aa55fe004.tar.bz2 engrampa-f4611c3411c44e792f729a0780c31b0aa55fe004.tar.xz | |
Merge pull request #34 from NiceandGently/master
add support for cab and .ar files + zip improvements
| -rw-r--r-- | data/engrampa.desktop.in.in | 2 | ||||
| -rw-r--r-- | src/fr-command-zip.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in index a19666a..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; +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 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); } |