Now that zip format can create something usable, allow selecting it via

--format.

SVN-Revision: 1125

diff --git a/libarchive/archive_write_set_format.c b/libarchive/archive_write_set_format.c
index 4f561c4376f5945deaeb3db8aee729db1481dec3..c612807bf74958fd313cb6c5737611f57a4d824f 100644 (file)
--- a/libarchive/archive_write_set_format.c
+++ b/libarchive/archive_write_set_format.c
@@ -53,6 +53,7 @@ struct { int code; int (*setter)(struct archive *); } codes[] =
        { ARCHIVE_FORMAT_TAR_PAX_RESTRICTED,
                                archive_write_set_format_pax_restricted },
        { ARCHIVE_FORMAT_TAR_USTAR,     archive_write_set_format_ustar },
+       { ARCHIVE_FORMAT_ZIP,   archive_write_set_format_zip },
        { 0,            NULL }
 };
 

diff --git a/libarchive/archive_write_set_format_by_name.c b/libarchive/archive_write_set_format_by_name.c
index 6b6ff4541ace35d7d3ecfe0b1b2953ff7f7ac107..cf807950d17ac9ce5aa729a68d018b635139194f 100644 (file)
--- a/libarchive/archive_write_set_format_by_name.c
+++ b/libarchive/archive_write_set_format_by_name.c
@@ -57,6 +57,7 @@ struct { const char *name; int (*setter)(struct archive *); } names[] =
        { "shar",       archive_write_set_format_shar },
        { "shardump",   archive_write_set_format_shar_dump },
        { "ustar",      archive_write_set_format_ustar },
+       { "zip",        archive_write_set_format_zip },
        { NULL,         NULL }
 };