Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_gz.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_gz.c (modified) (1 diff)

branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_gz.c

@@ -5 +5 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 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);
-    /* 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");
-    }
-#endif
-
-    open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip");
+    open_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)