lzip/zutils
1
0
Fork 0
Code Issues Activity

Merging upstream version 1.12~pre2.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 06:01:55 +01:00
parent 64fda76e2e
commit f4079ace26
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
19 changed files with 422 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zutils.cc
View file

@ -255,11 +255,14 @@ int test_format( const int infd, uint8_t magic_data[],
gzip_magic_size = 2,
lzip_magic_size = 5,
xz_magic_size = 5,
zstd_magic_size = 4 };
zstd_magic_size = 4,
compress_magic_size = 2 };
const uint8_t bzip2_magic[bzip2_magic_size] =
{ 0x42, 0x5A, 0x68 }; // "BZh"
const uint8_t gzip_magic[gzip_magic_size] =
{ 0x1F, 0x8B };
const uint8_t compress_magic[compress_magic_size] =
{ 0x1F, 0x9D };
const uint8_t lzip_magic[lzip_magic_size] =
{ 0x4C, 0x5A, 0x49, 0x50, 0x01 }; // "LZIP\001"
const uint8_t xz_magic[xz_magic_size] =
@ -277,7 +280,8 @@ int test_format( const int infd, uint8_t magic_data[],
magic_data[3] >= '1' && magic_data[3] <= '9' &&
std::memcmp( magic_data + 4, "1AY&SY", 6 ) == 0 )
return fmt_bz2;
if( std::memcmp( magic_data, gzip_magic, gzip_magic_size ) == 0 )
if( std::memcmp( magic_data, gzip_magic, gzip_magic_size ) == 0 ||
std::memcmp( magic_data, compress_magic, compress_magic_size ) == 0 )
return fmt_gz;
if( std::memcmp( magic_data, zstd_magic, zstd_magic_size ) == 0 )
return fmt_zst;