From 9ac1c69cd4c283c2b7bfa3c2db6c038510c20057 Mon Sep 17 00:00:00 2001 From: SJ Date: Sat, 29 Oct 2016 21:32:28 +0200 Subject: [PATCH] zstd compile fix Change-Id: I216f71fc3ec1769644d58fa7657cb3de7ba61939 Signed-off-by: SJ --- src/archive.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/archive.c b/src/archive.c index 6b23f308..2e4fd643 100644 --- a/src/archive.c +++ b/src/archive.c @@ -135,6 +135,7 @@ int inf(unsigned char *in, int len, int mode, char **buffer, FILE *dest){ } +#ifdef HAVE_ZSTD int zstd_inf(unsigned char *in, int len, int mode, char **buffer, FILE *dest){ size_t dSize; unsigned long long const rSize = ZSTD_getDecompressedSize(in, len); @@ -171,7 +172,7 @@ int zstd_inf(unsigned char *in, int len, int mode, char **buffer, FILE *dest){ return Z_OK; } - +#endif int retrieve_file_from_archive(char *filename, int mode, char **buffer, FILE *dest, struct __config *cfg){ @@ -235,8 +236,9 @@ int retrieve_file_from_archive(char *filename, int mode, char **buffer, FILE *de tlen += olen; if(st.st_size > 4){ - memcpy(&magic, addr, 4); #ifdef HAVE_ZSTD + memcpy(&magic, addr, 4); + if(magic == ZSTD_DETECTED_MAGICNUMBER){ rc = zstd_inf(s, tlen, mode, buffer, dest); }