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 ea5726d1b3897502388fa600e3e5a695b06b21e3..9772e33fbc5a76bc6d7c0c5a949c5016a9f569c8 100644 (file)
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -1,43 +1,35 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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;
 
-       archive_xread_all(archive_handle, &magic, 2);
+       /* 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;
 }