diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
| commit | 60063627a6d540871061854a362047e6517f821c (patch) | |
| tree | 0de228630450c64e085f2e3f5141b5ba17eccab3 /archival/libarchive/open_transformer.c | |
| parent | ec39cb770ddd5c0e085d5c4ee10be65bab5e7a44 (diff) | |
| parent | 9a595bb36ded308e6d4336aef2c1cd3ac738a398 (diff) | |
| download | busybox-w32-FRP.tar.gz busybox-w32-FRP.tar.bz2 busybox-w32-FRP.zip | |
Merge branch 'busybox' into mergeFRP
Diffstat (limited to 'archival/libarchive/open_transformer.c')
| -rw-r--r-- | archival/libarchive/open_transformer.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c index 0a8c657b7..1c5c185d0 100644 --- a/archival/libarchive/open_transformer.c +++ b/archival/libarchive/open_transformer.c | |||
| @@ -183,6 +183,13 @@ static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_comp | |||
| 183 | USE_FOR_NOMMU(xstate->xformer_prog = "gunzip";) | 183 | USE_FOR_NOMMU(xstate->xformer_prog = "gunzip";) |
| 184 | goto found_magic; | 184 | goto found_magic; |
| 185 | } | 185 | } |
| 186 | if (ENABLE_FEATURE_SEAMLESS_Z | ||
| 187 | && magic.b16[0] == COMPRESS_MAGIC | ||
| 188 | ) { | ||
| 189 | xstate->xformer = unpack_Z_stream; | ||
| 190 | USE_FOR_NOMMU(xstate->xformer_prog = "uncompress";) | ||
| 191 | goto found_magic; | ||
| 192 | } | ||
| 186 | if (ENABLE_FEATURE_SEAMLESS_BZ2 | 193 | if (ENABLE_FEATURE_SEAMLESS_BZ2 |
| 187 | && magic.b16[0] == BZIP2_MAGIC | 194 | && magic.b16[0] == BZIP2_MAGIC |
| 188 | ) { | 195 | ) { |