summaryrefslogtreecommitdiff
path: root/release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c
diff options
context:
space:
mode:
Diffstat (limited to 'release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c')
-rw-r--r--release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c55
1 files changed, 21 insertions, 34 deletions
diff --git a/release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c b/release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c
index 7792432a..e88b720a 100644
--- a/release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c
+++ b/release/src/router/busybox/archival/libunarchive/get_header_tar_gz.c
@@ -1,49 +1,36 @@
+/* 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"
-extern 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;
- 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);
+ /* Can skip this check, but error message will be less clear */
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);
-
- GZ_gzReadOpen(archive_handle->src_fd, 0, 0);
-
- archive_handle->read = read_gz;
- archive_handle->seek = seek_by_char;
-
+ open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip");
archive_handle->offset = 0;
- while (get_header_tar(archive_handle) == EXIT_SUCCESS);
-
- /* Cleanup */
- GZ_gzReadClose();
+ while (get_header_tar(archive_handle) == EXIT_SUCCESS)
+ continue;
- check_trailer_gzip(archive_handle->src_fd);
-
- /* Can only do one tar.bz2 per archive */
- return(EXIT_FAILURE);
+ /* Can only do one file at a time */
+ return EXIT_FAILURE;
}
-