lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-05 19:15:58 +03:00
Code Activity

Resolving local merge conflicts

Browse Source
This commit is contained in:
Shashank Tavildar
2019-10-28 15:15:13 -07:00
parent 02433e0b15 55ee7d56e4
commit f422914619
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
programs/util.c
View File

@@ -330,6 +330,7 @@ int UTIL_prepareFileList(const char *dirName, char** bufStart, size_t* pos, char
YES => Skip the file (return 0) YES => Skip the file (return 0)
NO => return 1 NO => return 1
*/ */
int UTIL_isCompressedFile(const char *inputName) int UTIL_isCompressedFile(const char *inputName)
{ {
return compareExtensions(inputName,g_compressedFileExtensions); return compareExtensions(inputName,g_compressedFileExtensions);
@@ -337,12 +338,14 @@ int UTIL_isCompressedFile(const char *inputName)
int compareExtensions(const char* infilename, const char* extensionList[]) int compareExtensions(const char* infilename, const char* extensionList[])
{ {
int i=0;
while(*extensionList != NULL) while(*extensionList != NULL)
{ {
const char* ext = strstr(infilename,extensionList[i]); const char* ext = strstr(infilename,extensionList[i]);
if(ext) if(ext)
return 1; return 1;
++extensionList; ++extensionList;
i++;
} }
return 0; return 0;
} }

1
programs/zstdcli.c
View File

@@ -118,6 +118,7 @@ static int usage(const char* programName)
#endif #endif
DISPLAY( " -D file: use `file` as Dictionary \n"); DISPLAY( " -D file: use `file` as Dictionary \n");
DISPLAY( " -o file: result stored into `file` (only if 1 input file) \n"); DISPLAY( " -o file: result stored into `file` (only if 1 input file) \n");
DISPLAY( "--exclude-compressed: only compress files that are not previously compressed \n");
DISPLAY( " -f : overwrite output without prompting and (de)compress links \n"); DISPLAY( " -f : overwrite output without prompting and (de)compress links \n");
DISPLAY( "--rm : remove source file(s) after successful de/compression \n"); DISPLAY( "--rm : remove source file(s) after successful de/compression \n");
DISPLAY( " -k : preserve source file(s) (default) \n"); DISPLAY( " -k : preserve source file(s) (default) \n");

1
tests/playTests.sh
View File

@@ -232,6 +232,7 @@ else
println "Test is not successful" println "Test is not successful"
fi fi
println "Test completed" println "Test completed"
sleep 5
println "test : file removal" println "test : file removal"
$ZSTD -f --rm tmp $ZSTD -f --rm tmp