xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-06 15:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add support of lz4 and zstd compression for squashfs files

Browse Source
This commit is contained in:
Tino Reichardt
2020-04-12 23:33:35 +02:00
parent 5245d379db
commit 35771b555d
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
CPP/7zip/Archive/SquashfsHandler.cpp
View File

@@ -6,6 +6,7 @@
#include "../../../C/CpuArch.h"
#include "../../../C/LzmaDec.h"
#include "../../../C/Xz.h"
#include "../../../C/lz4/lz4.h"
#include "../../Common/ComTry.h"
#include "../../Common/MyLinux.h"
@@ -26,6 +27,7 @@
#include "../Compress/CopyCoder.h"
#include "../Compress/ZlibDecoder.h"
// #include "../Compress/LzmaDecoder.h"
#include "../Compress/ZstdDecoder.h"
namespace NArchive {
namespace NSquashfs {
@@ -66,6 +68,8 @@ static const UInt32 kSignature32_B2 = 0x73687371;
#define kMethod_LZMA 2
#define kMethod_LZO 3
#define kMethod_XZ 4
#define kMethod_LZ4 5
#define kMethod_ZSTD 6
static const char * const k_Methods[] =
{
@@ -74,6 +78,8 @@ static const char * const k_Methods[] =
, "LZMA"
, "LZO"
, "XZ"
, "LZ4"
, "ZSTD"
};
static const UInt32 kMetadataBlockSizeLog = 13;
@@ -873,6 +879,9 @@ class CHandler:
NCompress::NZlib::CDecoder *_zlibDecoderSpec;
CMyComPtr<ICompressCoder> _zlibDecoder;
NCompress::NZSTD::CDecoder *_zstdDecoderSpec;
CMyComPtr<ICompressCoder> _zstdDecoder;
CXzUnpacker _xz;
CByteBuffer _inputBuffer;
@@ -1116,6 +1125,21 @@ static HRESULT LzoDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *src
}
}
static HRESULT Lz4Decode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen)
{
const char *Src = (const char *)src;
char *Dst = (char *)dest;
int compressedSize = (int)*srcLen;
int dstCapacity = (int)*destLen;
// int LZ4_decompress_safe (const char* src, char* dst, int compressedSize, int dstCapacity);
int rv = LZ4_decompress_safe(Src, Dst, compressedSize, dstCapacity);
if (rv == 0)
return S_FALSE;
*destLen = rv;
return S_OK;
}
HRESULT CHandler::Decompress(ISequentialOutStream *outStream, Byte *outBuf, bool *outBufWasWritten, UInt32 *outBufWasWrittenSize, UInt32 inSize, UInt32 outSizeMax)
{
if (outBuf)
@@ -1156,7 +1180,18 @@ HRESULT CHandler::Decompress(ISequentialOutStream *outStream, Byte *outBuf, bool
if (inSize != _zlibDecoderSpec->GetInputProcessedSize())
return S_FALSE;
}
/*
else if (method == kMethod_ZSTD)
{
if (!_zstdDecoder)
{
_zstdDecoderSpec = new NCompress::NZSTD::CDecoder();
_zstdDecoder = _zstdDecoderSpec;
}
RINOK(_zstdDecoder->Code(_limitedInStream, outStream, NULL, NULL, NULL));
if (inSize != _zstdDecoderSpec->GetInputProcessedSize())
return S_FALSE;
}
/*
else if (method == kMethod_LZMA)
{
if (!_lzmaDecoder)
@@ -1210,6 +1245,10 @@ HRESULT CHandler::Decompress(ISequentialOutStream *outStream, Byte *outBuf, bool
{
RINOK(LzoDecode(dest, &destLen, _inputBuffer, &srcLen));
}
else if (method == kMethod_LZ4)
{
RINOK(Lz4Decode(dest, &destLen, _inputBuffer, &srcLen));
}
else if (method == kMethod_LZMA)
{
Byte props[5];
@@ -1539,6 +1578,8 @@ HRESULT CHandler::Open2(IInStream *inStream)
case kMethod_LZMA:
case kMethod_LZO:
case kMethod_XZ:
case kMethod_LZ4:
case kMethod_ZSTD:
break;
default:
return E_NOTIMPL;