48 lines
1.7 KiB
Text
48 lines
1.7 KiB
Text
$NetBSD: patch-unzip,v 1.2 2010/06/15 20:48:23 drochner Exp $
|
|
|
|
--- src/fr-command-zip.c.orig 2010-03-11 17:44:54.000000000 +0000
|
|
+++ src/fr-command-zip.c
|
|
@@ -33,6 +33,7 @@
|
|
#include "fr-command.h"
|
|
#include "fr-command-zip.h"
|
|
|
|
+#define FR_UNZIP_COMMAND "@@UNZIP_COMMAND@@"
|
|
#define EMPTY_ARCHIVE_WARNING "Empty zipfile."
|
|
#define ZIP_SPECIAL_CHARACTERS "[]*?!^-\\"
|
|
|
|
@@ -187,7 +188,7 @@ fr_command_zip_list (FrCommand *comm)
|
|
{
|
|
fr_process_set_out_line_func (comm->process, list__process_line, comm);
|
|
|
|
- fr_process_begin_command (comm->process, "unzip");
|
|
+ fr_process_begin_command (comm->process, FR_UNZIP_COMMAND);
|
|
fr_process_set_begin_func (comm->process, list__begin, comm);
|
|
fr_process_add_arg (comm->process, "-ZTs");
|
|
fr_process_add_arg (comm->process, comm->filename);
|
|
@@ -302,7 +303,7 @@ fr_command_zip_extract (FrCommand *comm
|
|
process_line__common,
|
|
comm);
|
|
|
|
- fr_process_begin_command (comm->process, "unzip");
|
|
+ fr_process_begin_command (comm->process, FR_UNZIP_COMMAND);
|
|
|
|
if (dest_dir != NULL) {
|
|
fr_process_add_arg (comm->process, "-d");
|
|
@@ -334,7 +335,7 @@ fr_command_zip_extract (FrCommand *comm
|
|
static void
|
|
fr_command_zip_test (FrCommand *comm)
|
|
{
|
|
- fr_process_begin_command (comm->process, "unzip");
|
|
+ fr_process_begin_command (comm->process, FR_UNZIP_COMMAND);
|
|
fr_process_add_arg (comm->process, "-t");
|
|
add_password_arg (comm, comm->password);
|
|
fr_process_add_arg (comm->process, comm->filename);
|
|
@@ -400,7 +401,7 @@ fr_command_zip_get_capabilities (FrComma
|
|
else
|
|
capabilities |= FR_COMMAND_CAN_READ_WRITE;
|
|
}
|
|
- else if (is_program_available ("unzip", check_command))
|
|
+ else if (is_program_available (FR_UNZIP_COMMAND, check_command))
|
|
capabilities |= FR_COMMAND_CAN_READ;
|
|
|
|
return capabilities;
|