summaryrefslogtreecommitdiff
path: root/archival/libarchive/get_header_tar_gz.c
diff options
context:
space:
mode:
authorDenys Vlasenko2012-03-06 16:27:48 +0100
committerDenys Vlasenko2012-03-06 16:27:48 +0100
commit8a6a2f9c9c214b94bd945acd97ac8b28c25e194e (patch)
tree08b9a2af482bb50a7e369c01f9e9083680543fd4 /archival/libarchive/get_header_tar_gz.c
parent774bce8e8ba1e424c953e8f13aee8f0778c8a911 (diff)
downloadbusybox-8a6a2f9c9c214b94bd945acd97ac8b28c25e194e.zip
busybox-8a6a2f9c9c214b94bd945acd97ac8b28c25e194e.tar.gz
update seamless uncompression code
This change makes "tar tf hello_world.txz" work without adding special-casing for ".txz" extension. It also removes ever-growing magic checking code in rpm2cpio and get_header_tar - we reuse one which lives in setup_unzip_on_fd. function old new delta unpack_gz_stream 7 566 +559 check_signature16 - 70 +70 setup_unzip_on_fd 99 142 +43 handle_SIGCHLD - 41 +41 unpack_bz2_stream 342 376 +34 unzip_main 2352 2385 +33 bbunpack 503 533 +30 open_transformer 74 102 +28 unpack_Z_stream 1278 1304 +26 unpack_gunzip 101 123 +22 init_transformer_aux_data - 18 +18 unpack_xz_stream 2388 2402 +14 open_zipped 131 141 +10 rpm_main 1358 1363 +5 get_header_tar_lzma 52 57 +5 get_header_tar_bz2 52 57 +5 unpack_lzma_stream 2698 2702 +4 hash_find 234 233 -1 get_header_tar 1759 1733 -26 get_header_tar_gz 92 57 -35 unpack_uncompress 51 12 -39 rpm2cpio_main 201 147 -54 unpack_unxz 67 12 -55 unpack_bz2_stream_prime 55 - -55 get_header_tar_Z 86 - -86 unpack_gz_stream_with_info 539 - -539 ------------------------------------------------------------------------------ (add/remove: 3/3 grow/shrink: 14/6 up/down: 947/-890) Total: 57 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive/get_header_tar_gz.c')
-rw-r--r--archival/libarchive/get_header_tar_gz.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/archival/libarchive/get_header_tar_gz.c b/archival/libarchive/get_header_tar_gz.c
index b9679b0..0328434 100644
--- a/archival/libarchive/get_header_tar_gz.c
+++ b/archival/libarchive/get_header_tar_gz.c
@@ -8,25 +8,10 @@
char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
{
-#if BB_MMU
- uint16_t magic;
-#endif
-
/* Can't lseek over pipes */
archive_handle->seek = seek_by_read;
- /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case).
- * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will
- * need the header. */
-#if BB_MMU
- xread(archive_handle->src_fd, &magic, 2);
- /* Can skip this check, but error message will be less clear */
- if (magic != GZIP_MAGIC) {
- bb_error_msg_and_die("invalid gzip magic");
- }
-#endif
-
- open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip");
+ open_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip");
archive_handle->offset = 0;
while (get_header_tar(archive_handle) == EXIT_SUCCESS)
continue;