From 849ebae524c85c102aad9b085c6725bd20de6a32 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sat, 14 Nov 2020 10:52:19 -0800 Subject: fixed force --sparse mode --- programs/lz4io.c | 2 +- tmp | Bin 0 -> 65536 bytes tmpsparse | Bin 0 -> 65536 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tmp create mode 100644 tmpsparse diff --git a/programs/lz4io.c b/programs/lz4io.c index 975f590..36be639 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -272,7 +272,7 @@ int LZ4IO_setNotificationLevel(int level) /* Default setting : 0 (disabled) */ int LZ4IO_setSparseFile(LZ4IO_prefs_t* const prefs, int enable) { - prefs->sparseFileSupport = (enable!=0); + prefs->sparseFileSupport = 2*(enable!=0); return prefs->sparseFileSupport; } diff --git a/tmp b/tmp new file mode 100644 index 0000000..c97c12f Binary files /dev/null and b/tmp differ diff --git a/tmpsparse b/tmpsparse new file mode 100644 index 0000000..c97c12f Binary files /dev/null and b/tmpsparse differ -- cgit v0.12 From 7315c6e7a00494b2b8618379209732260686524f Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sat, 14 Nov 2020 11:13:08 -0800 Subject: LZ4IO_openDstFile() doesn't need pref mutability --- programs/lz4io.c | 63 ++++++++++++++++++++++++++++------------------------- programs/platform.h | 6 ++--- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/programs/lz4io.c b/programs/lz4io.c index 36be639..302d747 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -159,28 +159,28 @@ struct LZ4IO_prefs_s { LZ4IO_prefs_t* LZ4IO_defaultPreferences(void) { - LZ4IO_prefs_t* const ret = (LZ4IO_prefs_t*)malloc(sizeof(LZ4IO_prefs_t)); - if (!ret) EXM_THROW(21, "Allocation error : not enough memory"); - ret->passThrough = 0; - ret->overwrite = 1; - ret->testMode = 0; - ret->blockSizeId = LZ4IO_BLOCKSIZEID_DEFAULT; - ret->blockSize = 0; - ret->blockChecksum = 0; - ret->streamChecksum = 1; - ret->blockIndependence = 1; - ret->sparseFileSupport = 1; - ret->contentSizeFlag = 0; - ret->useDictionary = 0; - ret->favorDecSpeed = 0; - ret->dictionaryFilename = NULL; - ret->removeSrcFile = 0; - return ret; + LZ4IO_prefs_t* const ret = (LZ4IO_prefs_t*)malloc(sizeof(*ret)); + if (!ret) EXM_THROW(21, "Allocation error : not enough memory"); + ret->passThrough = 0; + ret->overwrite = 1; + ret->testMode = 0; + ret->blockSizeId = LZ4IO_BLOCKSIZEID_DEFAULT; + ret->blockSize = 0; + ret->blockChecksum = 0; + ret->streamChecksum = 1; + ret->blockIndependence = 1; + ret->sparseFileSupport = 1; + ret->contentSizeFlag = 0; + ret->useDictionary = 0; + ret->favorDecSpeed = 0; + ret->dictionaryFilename = NULL; + ret->removeSrcFile = 0; + return ret; } void LZ4IO_freePreferences(LZ4IO_prefs_t* const prefs) { - free(prefs); + free(prefs); } @@ -242,20 +242,21 @@ size_t LZ4IO_setBlockSize(LZ4IO_prefs_t* const prefs, size_t blockSize) return prefs->blockSize; } +/* Default setting : 1 == independent blocks */ int LZ4IO_setBlockMode(LZ4IO_prefs_t* const prefs, LZ4IO_blockMode_t blockMode) { prefs->blockIndependence = (blockMode == LZ4IO_blockIndependent); return prefs->blockIndependence; } -/* Default setting : no block checksum */ +/* Default setting : 0 == no block checksum */ int LZ4IO_setBlockChecksumMode(LZ4IO_prefs_t* const prefs, int enable) { prefs->blockChecksum = (enable != 0); return prefs->blockChecksum; } -/* Default setting : checksum enabled */ +/* Default setting : 1 == checksum enabled */ int LZ4IO_setStreamChecksumMode(LZ4IO_prefs_t* const prefs, int enable) { prefs->streamChecksum = (enable != 0); @@ -269,10 +270,10 @@ int LZ4IO_setNotificationLevel(int level) return g_displayLevel; } -/* Default setting : 0 (disabled) */ +/* Default setting : 1 (auto: enabled on file, disabled on stdout) */ int LZ4IO_setSparseFile(LZ4IO_prefs_t* const prefs, int enable) { - prefs->sparseFileSupport = 2*(enable!=0); + prefs->sparseFileSupport = 2*(enable!=0); /* 2==force enable */ return prefs->sparseFileSupport; } @@ -328,7 +329,7 @@ static FILE* LZ4IO_openSrcFile(const char* srcFileName) * prefs is writable, because sparseFileSupport might be updated. * condition : `dstFileName` must be non-NULL. * @result : FILE* to `dstFileName`, or NULL if it fails */ -static FILE* LZ4IO_openDstFile(LZ4IO_prefs_t* const prefs, const char* dstFileName) +static FILE* LZ4IO_openDstFile(const char* dstFileName, const LZ4IO_prefs_t* const prefs) { FILE* f; assert(dstFileName != NULL); @@ -338,7 +339,6 @@ static FILE* LZ4IO_openDstFile(LZ4IO_prefs_t* const prefs, const char* dstFileNa f = stdout; SET_BINARY_MODE(stdout); if (prefs->sparseFileSupport==1) { - prefs->sparseFileSupport = 0; DISPLAYLEVEL(4, "Sparse File Support automatically disabled on stdout ;" " to force-enable it, add --sparse command \n"); } @@ -364,7 +364,9 @@ static FILE* LZ4IO_openDstFile(LZ4IO_prefs_t* const prefs, const char* dstFileNa } /* sparse file */ - if (f && prefs->sparseFileSupport) { SET_SPARSE_FILE_MODE(f); } + { int const sparseMode = (prefs->sparseFileSupport - (f==stdout)) > 0; + if (f && sparseMode) SET_SPARSE_FILE_MODE(f); + } return f; } @@ -414,7 +416,7 @@ int LZ4IO_compressFilename_Legacy(LZ4IO_prefs_t* const prefs, if (finput == NULL) EXM_THROW(20, "%s : open file error ", input_filename); - foutput = LZ4IO_openDstFile(prefs, output_filename); + foutput = LZ4IO_openDstFile(output_filename, prefs); if (foutput == NULL) { fclose(finput); EXM_THROW(20, "%s : open file error ", input_filename); @@ -665,7 +667,7 @@ LZ4IO_compressFilename_extRess(LZ4IO_prefs_t* const io_prefs, cRess_t ress, /* Init */ FILE* const srcFile = LZ4IO_openSrcFile(srcFileName); if (srcFile == NULL) return 1; - dstFile = LZ4IO_openDstFile(io_prefs, dstFileName); + dstFile = LZ4IO_openDstFile(dstFileName, io_prefs); if (dstFile == NULL) { fclose(srcFile); return 1; } memset(&prefs, 0, sizeof(prefs)); @@ -872,8 +874,9 @@ LZ4IO_fwriteSparse(FILE* file, size_t bufferSizeT = bufferSize / sizeT; const size_t* const bufferTEnd = bufferT + bufferSizeT; const size_t segmentSizeT = (32 KB) / sizeT; + int const sparseMode = (sparseFileSupport - (file==stdout)) > 0; - if (!sparseFileSupport) { /* normal write */ + if (!sparseMode) { /* normal write */ size_t const sizeCheck = fwrite(buffer, 1, bufferSize, file); if (sizeCheck != bufferSize) EXM_THROW(70, "Write error : cannot write decoded block"); return 0; @@ -1263,7 +1266,7 @@ LZ4IO_decompressDstFile(LZ4IO_prefs_t* const prefs, { stat_t statbuf; int stat_result = 0; - FILE* const foutput = LZ4IO_openDstFile(prefs, output_filename); + FILE* const foutput = LZ4IO_openDstFile(output_filename, prefs); if (foutput==NULL) return 1; /* failure */ if ( strcmp(input_filename, stdinmark) @@ -1316,7 +1319,7 @@ int LZ4IO_decompressMultipleFilenames(LZ4IO_prefs_t* const prefs, dRess_t ress = LZ4IO_createDResources(prefs); if (outFileName==NULL) EXM_THROW(70, "Memory allocation error"); - ress.dstFile = LZ4IO_openDstFile(prefs, stdoutmark); + ress.dstFile = LZ4IO_openDstFile(stdoutmark, prefs); for (i=0; i= 1 is equal to found _POSIX_VERSION -***************************************************************/ +************************************************************** */ #if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) /* UNIX-like OS */ \ || defined(__midipix__) || defined(__VMS)) # if (defined(__APPLE__) && defined(__MACH__)) || defined(__SVR4) || defined(_AIX) || defined(__hpux) /* POSIX.1–2001 (SUSv3) conformant */ \ @@ -105,7 +105,7 @@ extern "C" { /*-********************************************* * Detect if isatty() and fileno() are available -************************************************/ +*********************************************** */ #if (defined(__linux__) && (PLATFORM_POSIX_VERSION >= 1)) || (PLATFORM_POSIX_VERSION >= 200112L) || defined(__DJGPP__) # include /* isatty */ # define IS_CONSOLE(stdStream) isatty(fileno(stdStream)) @@ -128,7 +128,7 @@ static __inline int IS_CONSOLE(FILE* stdStream) /****************************** * OS-specific Includes -******************************/ +***************************** */ #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) # include /* _O_BINARY */ # include /* _setmode, _fileno, _get_osfhandle */ -- cgit v0.12 From 36eadb205ae1fda0d92b9e4c0c1eb1ee79e7b943 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sat, 14 Nov 2020 12:40:17 -0800 Subject: all usages of prefs within lz4io are const --- programs/lz4cli.c | 21 +++++++++++-------- programs/lz4io.c | 62 +++++++++++++++++++++++++++---------------------------- programs/lz4io.h | 10 ++++----- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/programs/lz4cli.c b/programs/lz4cli.c index d7d4f81..523b8a8 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -93,11 +93,11 @@ static unsigned displayLevel = 2; /* 0 : no display ; 1: errors only ; 2 : dow ***************************************/ #define DEFAULT_COMPRESSOR LZ4IO_compressFilename #define DEFAULT_DECOMPRESSOR LZ4IO_decompressFilename -int LZ4IO_compressFilename_Legacy(LZ4IO_prefs_t* const prefs, const char* input_filename, const char* output_filename, int compressionlevel); /* hidden function */ -int LZ4IO_compressMultipleFilenames_Legacy(LZ4IO_prefs_t* const prefs, +int LZ4IO_compressFilename_Legacy(const char* input_filename, const char* output_filename, int compressionlevel, const LZ4IO_prefs_t* prefs); /* hidden function */ +int LZ4IO_compressMultipleFilenames_Legacy( const char** inFileNamesTable, int ifntSize, const char* suffix, - int compressionLevel); + int compressionLevel, const LZ4IO_prefs_t* prefs); /*-*************************** * Functions @@ -747,10 +747,11 @@ int main(int argc, const char** argv) if (ifnIdx == 0) multiple_inputs = 0; if (mode == om_decompress) { if (multiple_inputs) { + const char* const dec_extension = !strcmp(output_filename,stdoutmark) ? stdoutmark : LZ4_EXTENSION; assert(ifnIdx <= INT_MAX); - operationResult = LZ4IO_decompressMultipleFilenames(prefs, inFileNames, (int)ifnIdx, !strcmp(output_filename,stdoutmark) ? stdoutmark : LZ4_EXTENSION); + operationResult = LZ4IO_decompressMultipleFilenames(inFileNames, (int)ifnIdx, dec_extension, prefs); } else { - operationResult = DEFAULT_DECOMPRESSOR(prefs, input_filename, output_filename); + operationResult = DEFAULT_DECOMPRESSOR(input_filename, output_filename, prefs); } } else if (mode == om_list){ operationResult = LZ4IO_displayCompressedFilesInfo(inFileNames, ifnIdx); @@ -758,16 +759,18 @@ int main(int argc, const char** argv) if (legacy_format) { DISPLAYLEVEL(3, "! Generating LZ4 Legacy format (deprecated) ! \n"); if(multiple_inputs){ - LZ4IO_compressMultipleFilenames_Legacy(prefs, inFileNames, (int)ifnIdx, !strcmp(output_filename,stdoutmark) ? stdoutmark : LZ4_EXTENSION, cLevel); + const char* const leg_extension = !strcmp(output_filename,stdoutmark) ? stdoutmark : LZ4_EXTENSION; + LZ4IO_compressMultipleFilenames_Legacy(inFileNames, (int)ifnIdx, leg_extension, cLevel, prefs); } else { - LZ4IO_compressFilename_Legacy(prefs, input_filename, output_filename, cLevel); + LZ4IO_compressFilename_Legacy(input_filename, output_filename, cLevel, prefs); } } else { if (multiple_inputs) { + const char* const comp_extension = !strcmp(output_filename,stdoutmark) ? stdoutmark : LZ4_EXTENSION; assert(ifnIdx <= INT_MAX); - operationResult = LZ4IO_compressMultipleFilenames(prefs, inFileNames, (int)ifnIdx, !strcmp(output_filename,stdoutmark) ? stdoutmark : LZ4_EXTENSION, cLevel); + operationResult = LZ4IO_compressMultipleFilenames(inFileNames, (int)ifnIdx, comp_extension, cLevel, prefs); } else { - operationResult = DEFAULT_COMPRESSOR(prefs, input_filename, output_filename, cLevel); + operationResult = DEFAULT_COMPRESSOR(input_filename, output_filename, cLevel, prefs); } } } _cleanup: diff --git a/programs/lz4io.c b/programs/lz4io.c index 302d747..4c4678c 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -178,7 +178,7 @@ LZ4IO_prefs_t* LZ4IO_defaultPreferences(void) return ret; } -void LZ4IO_freePreferences(LZ4IO_prefs_t* const prefs) +void LZ4IO_freePreferences(LZ4IO_prefs_t* prefs) { free(prefs); } @@ -396,9 +396,8 @@ static int LZ4IO_LZ4_compress(const char* src, char* dst, int srcSize, int dstSi /* LZ4IO_compressFilename_Legacy : * This function is intentionally "hidden" (not published in .h) * It generates compressed streams using the old 'legacy' format */ -int LZ4IO_compressFilename_Legacy(LZ4IO_prefs_t* const prefs, - const char* input_filename, const char* output_filename, - int compressionlevel) +int LZ4IO_compressFilename_Legacy(const char* input_filename, const char* output_filename, + int compressionlevel, const LZ4IO_prefs_t* prefs) { typedef int (*compress_f)(const char* src, char* dst, int srcSize, int dstSize, int cLevel); compress_f const compressionFunction = (compressionlevel < 3) ? LZ4IO_LZ4_compress : LZ4_compress_HC; @@ -483,10 +482,10 @@ int LZ4IO_compressFilename_Legacy(LZ4IO_prefs_t* const prefs, /* LZ4IO_compressMultipleFilenames_Legacy : * This function is intentionally "hidden" (not published in .h) * It generates multiple compressed streams using the old 'legacy' format */ -int LZ4IO_compressMultipleFilenames_Legacy(LZ4IO_prefs_t* const prefs, +int LZ4IO_compressMultipleFilenames_Legacy( const char** inFileNamesTable, int ifntSize, const char* suffix, - int compressionLevel) + int compressionLevel, const LZ4IO_prefs_t* prefs) { int i; int missed_files = 0; @@ -500,9 +499,9 @@ int LZ4IO_compressMultipleFilenames_Legacy(LZ4IO_prefs_t* const prefs, for (i=0; iblockSize; cRess_t ress; @@ -644,14 +643,13 @@ static void LZ4IO_freeCResources(cRess_t ress) /* * LZ4IO_compressFilename_extRess() - * io_prefs is mutable, as it may update sparseFileSupport * result : 0 : compression completed correctly * 1 : missing or pb opening srcFileName */ static int -LZ4IO_compressFilename_extRess(LZ4IO_prefs_t* const io_prefs, cRess_t ress, +LZ4IO_compressFilename_extRess(cRess_t ress, const char* srcFileName, const char* dstFileName, - int compressionLevel) + int compressionLevel, const LZ4IO_prefs_t* const io_prefs) { unsigned long long filesize = 0; unsigned long long compressedfilesize = 0; @@ -773,13 +771,13 @@ LZ4IO_compressFilename_extRess(LZ4IO_prefs_t* const io_prefs, cRess_t ress, } -int LZ4IO_compressFilename(LZ4IO_prefs_t* const prefs, const char* srcFileName, const char* dstFileName, int compressionLevel) +int LZ4IO_compressFilename(const char* srcFileName, const char* dstFileName, int compressionLevel, const LZ4IO_prefs_t* prefs) { UTIL_time_t const timeStart = UTIL_getTime(); clock_t const cpuStart = clock(); cRess_t const ress = LZ4IO_createCResources(prefs); - int const result = LZ4IO_compressFilename_extRess(prefs, ress, srcFileName, dstFileName, compressionLevel); + int const result = LZ4IO_compressFilename_extRess(ress, srcFileName, dstFileName, compressionLevel, prefs); /* Free resources */ LZ4IO_freeCResources(ress); @@ -797,10 +795,11 @@ int LZ4IO_compressFilename(LZ4IO_prefs_t* const prefs, const char* srcFileName, } -int LZ4IO_compressMultipleFilenames(LZ4IO_prefs_t* const prefs, +int LZ4IO_compressMultipleFilenames( const char** inFileNamesTable, int ifntSize, const char* suffix, - int compressionLevel) + int compressionLevel, + const LZ4IO_prefs_t* prefs) { int i; int missed_files = 0; @@ -816,9 +815,9 @@ int LZ4IO_compressMultipleFilenames(LZ4IO_prefs_t* const prefs, for (i=0; i Date: Sat, 14 Nov 2020 12:44:18 -0800 Subject: fix minor parse warning --- programs/lz4io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/lz4io.c b/programs/lz4io.c index 4c4678c..a274798 100644 --- a/programs/lz4io.c +++ b/programs/lz4io.c @@ -365,7 +365,7 @@ static FILE* LZ4IO_openDstFile(const char* dstFileName, const LZ4IO_prefs_t* con /* sparse file */ { int const sparseMode = (prefs->sparseFileSupport - (f==stdout)) > 0; - if (f && sparseMode) SET_SPARSE_FILE_MODE(f); + if (f && sparseMode) { SET_SPARSE_FILE_MODE(f); } } return f; -- cgit v0.12