summaryrefslogtreecommitdiff
path: root/archival/libunarchive/get_header_tar_gz.c
diff options
context:
space:
mode:
authorDenis Vlasenko2007-09-05 11:48:32 +0000
committerDenis Vlasenko2007-09-05 11:48:32 +0000
commit211f7f88ae67e875bed50409b2edbb6d740fc648 (patch)
treeae37652f75374919fff81e732fd2ab867e6a947a /archival/libunarchive/get_header_tar_gz.c
parentbeffd43d8e393b68787a00d9c6078a2b367afd01 (diff)
downloadbusybox-211f7f88ae67e875bed50409b2edbb6d740fc648.zip
busybox-211f7f88ae67e875bed50409b2edbb6d740fc648.tar.gz
tar + gzip/bzip2/etc: support NOMMU machines (by Alex Landau <landau_alex@yahoo.com>)
Diffstat (limited to 'archival/libunarchive/get_header_tar_gz.c')
-rw-r--r--archival/libunarchive/get_header_tar_gz.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index 85070d9..a990614 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -8,19 +8,26 @@
char get_header_tar_gz(archive_handle_t *archive_handle)
{
+#if BB_MMU
unsigned char magic[2];
+#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);
if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
bb_error_msg_and_die("invalid gzip magic");
}
check_header_gzip_or_die(archive_handle->src_fd);
+#endif
- archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream);
+ archive_handle->src_fd = open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip", "gunzip", "-cf", "-", NULL);
archive_handle->offset = 0;
while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;