bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-07 23:31:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

zstd fixes

Browse Source 
Change-Id: Iae2862b011e027b1e26e33ef53393e1ec90e4fde
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2016-10-29 21:19:35 +02:00
parent 9d14d9ac92
commit d600f01867
5 changed files with 98 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -4809,12 +4809,18 @@ fi
if test "$have_zstd" = "yes"; then
echo "zstd library: yes"
antispam_libs="$antispam_libs -lzstd"
defs="$defs -DHAVE_ZSTD"
if test "$(which zstd)" = ""; then echo "Error: cannot find the zstd binary"; exit 1; fi
zstd_magic=$(echo this is a test | zstd | hexdump -C | awk '/00000000/{print "ntohl(0x"$2$3$4$5 ")"}')
cat >>confdefs.h <<_ACEOF
#define HAVE_ZSTD 1
#define ZSTD_DETECTED_MAGICNUMBER $zstd_magic
_ACEOF
antispam_libs="$antispam_libs -lzstd"
fi
if test "$have_zip" = "yes"; then

8
configure.in
View File

@ -441,8 +441,14 @@ fi
if test "$have_zstd" = "yes"; then
echo "zstd library: yes"
AC_DEFINE_UNQUOTED(HAVE_ZSTD, 1, [libzstd support])
antispam_libs="$antispam_libs -lzstd"
defs="$defs -DHAVE_ZSTD"
if test "$(which zstd)" = ""; then echo "Error: cannot find the zstd binary"; exit 1; fi
zstd_magic=$(echo this is a test | zstd | hexdump -C | awk '/00000000/{print "ntohl(0x"$2$3$4$5 ")"}')
AC_DEFINE_UNQUOTED(ZSTD_DETECTED_MAGICNUMBER, $zstd_magic, [detected zstd magic number])
fi
if test "$have_zip" = "yes"; then

3
piler-config.h.in
View File

@ -26,9 +26,8 @@
#undef HAVE_LIBWRAP
#undef HAVE_ZSTD
#undef HAVE_TWEAK_SENT_TIME
#undef HAVE_SUPPORT_FOR_COMPAT_STORAGE_LAYOUT
#undef ZSTD_DETECTED_MAGICNUMBER

79
src/archive.c
View File

@ -20,6 +20,10 @@
#include <assert.h>
#include <piler.h>
#ifdef HAVE_ZSTD
#include <zstd.h>
#endif
void zerr(int ret){
@ -131,12 +135,53 @@ int inf(unsigned char *in, int len, int mode, char **buffer, FILE *dest){
}
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);
if(rSize == 0)
return Z_DATA_ERROR;
if(mode == WRITE_TO_STDOUT){
void* const rBuff = malloc((size_t)rSize);
if(!rBuff) return Z_MEM_ERROR;
dSize = ZSTD_decompress(rBuff, rSize, in, len);
if(dSize != rSize){
printf("error decoding buffer: %s\n", ZSTD_getErrorName(dSize));
return Z_DATA_ERROR;
}
fwrite(rBuff, 1, dSize, dest);
free(rBuff);
}
else {
*buffer = malloc((size_t)rSize);
if(!*buffer) return Z_MEM_ERROR;
memset(*buffer, 0, rSize);
dSize = ZSTD_decompress(*buffer, rSize, in, len);
if(dSize != rSize){
printf("error decoding buffer: %s\n", ZSTD_getErrorName(dSize));
return Z_DATA_ERROR;
}
}
return Z_OK;
}
int retrieve_file_from_archive(char *filename, int mode, char **buffer, FILE *dest, struct __config *cfg){
int rc=0, n, olen, tlen, len, fd=-1;
unsigned char *s=NULL, *addr=NULL, inbuf[REALLYBIGBUFSIZE];
struct stat st;
EVP_CIPHER_CTX ctx;
#ifdef HAVE_ZSTD
unsigned long magic;
#endif
if(filename == NULL) return 1;
@ -188,11 +233,39 @@ int retrieve_file_from_archive(char *filename, int mode, char **buffer, FILE *de
tlen += olen;
rc = inf(s, tlen, mode, buffer, dest);
if(st.st_size > 4){
memcpy(&magic, addr, 4);
#ifdef HAVE_ZSTD
if(magic == ZSTD_DETECTED_MAGICNUMBER){
rc = zstd_inf(s, tlen, mode, buffer, dest);
}
else {
#endif
rc = inf(s, tlen, mode, buffer, dest);
#ifdef HAVE_ZSTD
}
#endif
}
}
else {
addr = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
rc = inf(addr, st.st_size, mode, buffer, dest);
if(st.st_size > 4){
#ifdef HAVE_ZSTD
memcpy(&magic, addr, 4);
if(magic == ZSTD_DETECTED_MAGICNUMBER){
rc = zstd_inf(addr, st.st_size, mode, buffer, dest);
}
else {
#endif
rc = inf(addr, st.st_size, mode, buffer, dest);
#ifdef HAVE_ZSTD
}
#endif
}
munmap(addr, st.st_size);
}

10
src/store.c
View File

@ -97,22 +97,24 @@ int store_file(struct session_data *sdata, char *filename, int len, struct __con
if(dst == NULL){
munmap(addr, len);
syslog(LOG_PRIORITY, "%s: cannot malloc for zstd buffer", sdata->ttmpfile);
syslog(LOG_PRIORITY, "%s: ERROR: cannot malloc for zstd buffer", sdata->ttmpfile);
return ret;
}
size_t const cSize = ZSTD_compress(dst, destlen, addr, len, 1);
size_t const cSize = ZSTD_compress(dst, dstlen, addr, len, 1);
if(ZSTD_isError(cSize)){
syslog(LOG_PRIORITY, "%s: error zstd compressing: %s", sdata->ttmpfile, ZSTD_getErrorName(cSize));
syslog(LOG_PRIORITY, "%s: ERROR: zstd compressing: %s", sdata->ttmpfile, ZSTD_getErrorName(cSize));
rc = ERR;
}
dstlen = cSize;
#else
dstlen = compressBound(len);
dst = malloc(dstlen);
if(dst == NULL){
munmap(addr, len);
syslog(LOG_PRIORITY, "%s: cannot malloc for z buffer", sdata->ttmpfile);
syslog(LOG_PRIORITY, "%s: ERROR: cannot malloc for z buffer", sdata->ttmpfile);
return ret;
}