ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#754 move sufixlist upper and improve error message on missing suffix

Browse Source
This commit is contained in:
Sergey Ponomarev
2019-09-14 21:14:43 +03:00
parent a4ca246eca
commit b804dd3e5b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/fileio.c
+14 -13
View File
@@ -2169,12 +2169,24 @@ FIO_determineDstName(const char* srcFileName)
static size_t dfnbCapacity = 0; static size_t dfnbCapacity = 0;
static char* dstFileNameBuffer = NULL; /* using static allocation : this function cannot be multi-threaded */ static char* dstFileNameBuffer = NULL; /* using static allocation : this function cannot be multi-threaded */
const char* suffixlist = ZSTD_EXTENSION
#ifdef ZSTD_GZDECOMPRESS
"/" GZ_EXTENSION
#endif
#ifdef ZSTD_LZMADECOMPRESS
"/" XZ_EXTENSION "/" LZMA_EXTENSION
#endif
#ifdef ZSTD_LZ4DECOMPRESS
"/" LZ4_EXTENSION
#endif
;
size_t const sfnSize = strlen(srcFileName); size_t const sfnSize = strlen(srcFileName);
size_t suffixSize; size_t suffixSize;
const char* const suffixPtr = strrchr(srcFileName, '.'); const char* const suffixPtr = strrchr(srcFileName, '.');
if (suffixPtr == NULL) { if (suffixPtr == NULL) {
DISPLAYLEVEL(1, "zstd: %s: unknown suffix -- ignored \n", DISPLAYLEVEL(1, "zstd: %s: missing suffix (%s expected) -- ignored \n",
srcFileName); srcFileName, suffixlist);
return NULL; return NULL;
} }
suffixSize = strlen(suffixPtr); suffixSize = strlen(suffixPtr);
@@ -2193,17 +2205,6 @@ FIO_determineDstName(const char* srcFileName)
&& strcmp(suffixPtr, LZ4_EXTENSION) && strcmp(suffixPtr, LZ4_EXTENSION)
#endif #endif
) ) { ) ) {
const char* suffixlist = ZSTD_EXTENSION
#ifdef ZSTD_GZDECOMPRESS
"/" GZ_EXTENSION
#endif
#ifdef ZSTD_LZMADECOMPRESS
"/" XZ_EXTENSION "/" LZMA_EXTENSION
#endif
#ifdef ZSTD_LZ4DECOMPRESS
"/" LZ4_EXTENSION
#endif
;
DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%s expected) -- ignored \n", DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%s expected) -- ignored \n",
srcFileName, suffixlist); srcFileName, suffixlist);
return NULL; return NULL;