trivial fixes to make bbox compile with gcc 4.3.0

[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 ad26f465a8f63702c1b6885585020bf19dda1211..9772e33fbc5a76bc6d7c0c5a949c5016a9f569c8 100644 (file)
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -3,29 +3,33 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-
 #include "libbb.h"
 #include "unarchive.h"
 
 char get_header_tar_gz(archive_handle_t *archive_handle)
 {
+#if BB_MMU
        unsigned char magic[2];
+#endif
 
-       /* Cant lseek over pipe's */
-       archive_handle->seek = seek_by_char;
+       /* 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");
+               bb_error_msg_and_die("invalid gzip magic");
        }
+#endif
 
-       check_header_gzip(archive_handle->src_fd);
-
-       archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip);
+       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);
+       return EXIT_FAILURE;
 }