6b4f4b528
Denys Vlasenko
2017-01-09
Subject
unzip: optional support for xz
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libarchive/Kbuild.src+1 -0
| @@ -61,6 +61,7 @@ lib-$(CONFIG_FEATURE_UNZIP_LZMA) += open_transformer.o decompress_unlzma. | |
| lib-$(CONFIG_UNXZ) += open_transformer.o decompress_unxz.o | |
| lib-$(CONFIG_XZCAT) += open_transformer.o decompress_unxz.o | |
| lib-$(CONFIG_XZ) += open_transformer.o decompress_unxz.o | |
| + | lib-$(CONFIG_FEATURE_UNZIP_XZ) += open_transformer.o decompress_unxz.o |
| lib-$(CONFIG_GUNZIP) += open_transformer.o decompress_gunzip.o | |
| lib-$(CONFIG_ZCAT) += open_transformer.o decompress_gunzip.o | |
| lib-$(CONFIG_UNCOMPRESS) += open_transformer.o decompress_uncompress.o | |
archival/unzip.c+13 -0
| @@ -46,6 +46,11 @@ | |
| //config: bool "Support compression method 14 (lzma)" | |
| //config: default y | |
| //config: depends on FEATURE_UNZIP_CDF && DESKTOP | |
| + | //config: |
| + | //config:config FEATURE_UNZIP_XZ |
| + | //config: bool "Support compression method 95 (xz)" |
| + | //config: default y |
| + | //config: depends on FEATURE_UNZIP_CDF && DESKTOP |
| //applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| //kbuild:lib-$(CONFIG_UNZIP) += unzip.o | |
| @@ -371,6 +376,14 @@ static void unzip_extract(zip_header_t *zip, int dst_fd) | |
| if (xstate.bytes_out < 0) | |
| bb_error_msg_and_die("inflate error"); | |
| } | |
| + | #endif |
| + | #if ENABLE_FEATURE_UNZIP_XZ |
| + | else if (zip->fmt.method == 95) { |
| + | /* Not tested yet */ |
| + | xstate.bytes_out = unpack_xz_stream(&xstate); |
| + | if (xstate.bytes_out < 0) |
| + | bb_error_msg_and_die("inflate error"); |
| + | } |
| #endif | |
| else { | |
| bb_error_msg_and_die("unsupported method %u", zip->fmt.method); | |