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 a99061411fbeb6a5b37915937df0150dcf933bf0..33c62729e55416ec36df204e0063ac93d5c9943c 100644 (file)
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -6,7 +6,7 @@
 #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];
@@ -23,13 +23,12 @@ char get_header_tar_gz(archive_handle_t *archive_handle)
        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, "gunzip", "gunzip", "-cf", "-", NULL);
+       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;