AuroraMiddleware/zstd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed xzstd

Browse Source 
--format=xz was missing a break, making the execution continue into lz4 error message
This commit is contained in:
Yann Collet 2017-05-02 15:40:42 -07:00
parent 705de8eba4
commit 2e63a877f3
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/Makefile
View File

@ -140,15 +140,13 @@ $(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
zstd : CPPFLAGS += $(ZLIBCPP) $(THREAD_CPP) zstd : CPPFLAGS += $(ZLIBCPP) $(THREAD_CPP)
zstd : LDFLAGS += $(ZLIBLD) $(THREAD_LD) zstd : LDFLAGS += $(ZLIBLD) $(THREAD_LD)
zstd : LZMA_MSG := $(NO_LZMA_MSG) zstd zstd-nogz zstd4 : LZMA_MSG := ""
zstd zstd-nogz xzstd : LZ4_MSG := ""
zstd-nogz : ZLIB_MSG := $(NO_ZLIB_MSG) zstd-nogz : ZLIB_MSG := $(NO_ZLIB_MSG)
zstd-nogz : LZMA_MSG := $(NO_LZMA_MSG)
xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP) xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP)
xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD) xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD)
xzstd : LZ4_MSG := $(NO_LZ4_MSG)
zstd4 : CPPFLAGS += $(ZLIBCPP) $(LZ4CPP) zstd4 : CPPFLAGS += $(ZLIBCPP) $(LZ4CPP)
zstd4 : LDFLAGS += $(ZLIBLD) $(LZ4LD) zstd4 : LDFLAGS += $(ZLIBLD) $(LZ4LD)
zstd4 : LZMA_MSG := $(NO_LZMA_MSG)
zstd zstd-nogz xzstd zstd4 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) zstd zstd-nogz xzstd zstd4 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
zstd zstd-nogz xzstd zstd4 : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o zstd zstd-nogz xzstd zstd4 : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
@echo "$(THREAD_MSG)" @echo "$(THREAD_MSG)"

4
programs/fileio.c
View File

@ -617,6 +617,7 @@ static int FIO_compressFilename_internal(cRess_t ress,
switch (g_compressionType) { switch (g_compressionType) {
case FIO_zstdCompression: case FIO_zstdCompression:
break; break;
case FIO_gzipCompression: case FIO_gzipCompression:
#ifdef ZSTD_GZCOMPRESS #ifdef ZSTD_GZCOMPRESS
compressedfilesize = FIO_compressGzFrame(&ress, srcFileName, fileSize, compressionLevel, &readsize); compressedfilesize = FIO_compressGzFrame(&ress, srcFileName, fileSize, compressionLevel, &readsize);
@ -625,6 +626,7 @@ static int FIO_compressFilename_internal(cRess_t ress,
EXM_THROW(20, "zstd: %s: file cannot be compressed as gzip (zstd compiled without ZSTD_GZCOMPRESS) -- ignored \n", srcFileName); EXM_THROW(20, "zstd: %s: file cannot be compressed as gzip (zstd compiled without ZSTD_GZCOMPRESS) -- ignored \n", srcFileName);
#endif #endif
goto finish; goto finish;
case FIO_xzCompression: case FIO_xzCompression:
case FIO_lzmaCompression: case FIO_lzmaCompression:
#ifdef ZSTD_LZMACOMPRESS #ifdef ZSTD_LZMACOMPRESS
@ -633,6 +635,8 @@ static int FIO_compressFilename_internal(cRess_t ress,
(void)compressionLevel; (void)compressionLevel;
EXM_THROW(20, "zstd: %s: file cannot be compressed as xz/lzma (zstd compiled without ZSTD_LZMACOMPRESS) -- ignored \n", srcFileName); EXM_THROW(20, "zstd: %s: file cannot be compressed as xz/lzma (zstd compiled without ZSTD_LZMACOMPRESS) -- ignored \n", srcFileName);
#endif #endif
goto finish;
case FIO_lz4Compression: case FIO_lz4Compression:
#ifdef ZSTD_LZ4COMPRESS #ifdef ZSTD_LZ4COMPRESS
compressedfilesize = FIO_compressLz4Frame(&ress, srcFileName, fileSize, compressionLevel, &readsize); compressedfilesize = FIO_compressLz4Frame(&ress, srcFileName, fileSize, compressionLevel, &readsize);

4
programs/zstdcli.c
View File

@ -514,11 +514,11 @@ int main(int argCount, const char* argv[])
/* Quiet mode */ /* Quiet mode */
case 'q': g_displayLevel--; argument++; break; case 'q': g_displayLevel--; argument++; break;
/* keep source file (default); for gzip/xz compatibility */ /* keep source file (default) */
case 'k': FIO_setRemoveSrcFile(0); argument++; break; case 'k': FIO_setRemoveSrcFile(0); argument++; break;
/* Checksum */ /* Checksum */
case 'C': argument++; FIO_setChecksumFlag(2); break; case 'C': FIO_setChecksumFlag(2); argument++; break;
/* test compressed file */ /* test compressed file */
case 't': operation=zom_test; argument++; break; case 't': operation=zom_test; argument++; break;