revert last two commits. vfork cannot be used in subroutine,

[oweals/busybox.git] / archival / libunarchive / get_header_tar_gz.c

diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index 85070d97855e0fd607b5ba190e9e98dc2445d756..33c62729e55416ec36df204e0063ac93d5c9943c 100644 (file)
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -6,23 +6,29 @@
 #include "libbb.h"
 #include "unarchive.h"
 
-char get_header_tar_gz(archive_handle_t *archive_handle)
+char FAST_FUNC 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");
        }
+#endif
 
-       check_header_gzip_or_die(archive_handle->src_fd);
-
-       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");
        archive_handle->offset = 0;
-       while (get_header_tar(archive_handle) == EXIT_SUCCESS) /**/;
+       while (get_header_tar(archive_handle) == EXIT_SUCCESS)
+               continue;
 
        /* Can only do one file at a time */
        return EXIT_FAILURE;