Ignore:
Timestamp:
Jan 1, 2014, 12:47:38 AM (7 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.21.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi-busybox/archival/libarchive/get_header_tar_gz.c

    r2725 r3232  
    55
    66#include "libbb.h"
    7 #include "archive.h"
     7#include "bb_archive.h"
    88
    99char FAST_FUNC get_header_tar_gz(archive_handle_t *archive_handle)
    1010{
    11 #if BB_MMU
    12     unsigned char magic[2];
    13 #endif
    14 
    1511    /* Can't lseek over pipes */
    1612    archive_handle->seek = seek_by_read;
    1713
    18     /* Check gzip magic only if open_transformer will invoke unpack_gz_stream (MMU case).
    19      * Otherwise, it will invoke an external helper "gunzip -cf" (NOMMU case) which will
    20      * need the header. */
    21 #if BB_MMU
    22     xread(archive_handle->src_fd, &magic, 2);
    23     /* Can skip this check, but error message will be less clear */
    24     if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
    25         bb_error_msg_and_die("invalid gzip magic");
    26     }
    27 #endif
    28 
    29     open_transformer(archive_handle->src_fd, unpack_gz_stream, "gunzip");
     14    open_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip");
    3015    archive_handle->offset = 0;
    3116    while (get_header_tar(archive_handle) == EXIT_SUCCESS)
Note: See TracChangeset for help on using the changeset viewer.