lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

fixes for tests and segfault

Browse Source
This commit is contained in:
Sen Huang
2019-09-06 11:10:53 -07:00
parent a9c807a948
commit 30bff50e06
5 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
programs/fileio.c
View File

@ -1453,7 +1453,9 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs, const char** inFileN
} } } }
FIO_freeCResources(ress); FIO_freeCResources(ress);
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles); if (outDirName)
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
return error; return error;
} }
@ -2274,24 +2276,12 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
} }
FIO_freeDResources(ress); FIO_freeDResources(ress);
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles); if (outDirName)
UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
return error; return error;
} }
void FIO_processMultipleFilenameDestinationDir(char** dstFilenameTable,
const char** filenameTable, unsigned filenameIdx,
const char* outFileName, const char* outDirName) {
int dirResult;
dirResult = UTIL_createDir(outDirName);
if (dirResult)
DISPLAY("Directory creation unsuccessful \n");
UTIL_createDestinationDirTable(filenameTable, filenameIdx, outDirName, dstFilenameTable);
if (outFileName) {
outFileName = dstFilenameTable[0]; /* in case -O is called with single file */
}
}
/* ************************************************************************** /* **************************************************************************
* .zst file info (--list command) * .zst file info (--list command)
***************************************************************************/ ***************************************************************************/

4
programs/fileio.h
View File

@ -118,10 +118,6 @@ int FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
const char* outFileName, const char* outFileName,
const char* dictFileName); const char* dictFileName);
void FIO_processMultipleFilenameDestinationDir(char** dstFilenameTable,
const char** filenameTable, unsigned filenameIdx,
const char* outFileName, const char* outDirName);
/*-************************************* /*-*************************************
* Advanced stuff (should actually be hosted elsewhere) * Advanced stuff (should actually be hosted elsewhere)

14
programs/util.c
View File

@ -123,6 +123,20 @@ void UTIL_createDestinationDirTable(const char** filenameTable, unsigned nbFiles
} }
} }
void UTIL_processMultipleFilenameDestinationDir(char** dstFilenameTable,
const char** filenameTable, unsigned filenameIdx,
const char* outFileName, const char* outDirName) {
int dirResult;
dirResult = UTIL_createDir(outDirName);
if (dirResult)
UTIL_DISPLAYLEVEL(1, "Directory creation unsuccessful\n");
UTIL_createDestinationDirTable(filenameTable, filenameIdx, outDirName, dstFilenameTable);
if (outFileName) {
outFileName = dstFilenameTable[0]; /* in case -O is called with single file */
}
}
void UTIL_freeDestinationFilenameTable(char** dstDirTable, unsigned nbFiles) { void UTIL_freeDestinationFilenameTable(char** dstDirTable, unsigned nbFiles) {
unsigned u; unsigned u;
for (u = 0; u < nbFiles; ++u) { for (u = 0; u < nbFiles; ++u) {

3
programs/util.h
View File

@ -133,6 +133,9 @@ int UTIL_isSameFile(const char* file1, const char* file2);
void UTIL_createDestinationDirTable(const char** filenameTable, unsigned filenameIdx, void UTIL_createDestinationDirTable(const char** filenameTable, unsigned filenameIdx,
const char* outDirName, char** dstFilenameTable); const char* outDirName, char** dstFilenameTable);
void UTIL_freeDestinationFilenameTable(char** dstDirTable, unsigned nbFiles); void UTIL_freeDestinationFilenameTable(char** dstDirTable, unsigned nbFiles);
void UTIL_processMultipleFilenameDestinationDir(char** dstFilenameTable,
const char** filenameTable, unsigned filenameIdx,
const char* outFileName, const char* outDirName);
U32 UTIL_isLink(const char* infilename); U32 UTIL_isLink(const char* infilename);
#define UTIL_FILESIZE_UNKNOWN ((U64)(-1)) #define UTIL_FILESIZE_UNKNOWN ((U64)(-1))

5
programs/zstdcli.c
View File

@ -1178,8 +1178,9 @@ int main(int argCount, const char* argv[])
if (adaptMax < cLevel) cLevel = adaptMax; if (adaptMax < cLevel) cLevel = adaptMax;
if (outDirName) { if (outDirName) {
printf("ok\n");
dstFilenameTable = (char**)malloc(filenameIdx * sizeof(char*)); dstFilenameTable = (char**)malloc(filenameIdx * sizeof(char*));
FIO_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName); UTIL_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName);
} }
if ((filenameIdx==1) && outFileName) if ((filenameIdx==1) && outFileName)
@ -1203,7 +1204,7 @@ int main(int argCount, const char* argv[])
if (outDirName) { if (outDirName) {
dstFilenameTable = (char**)malloc(filenameIdx * sizeof(char*)); dstFilenameTable = (char**)malloc(filenameIdx * sizeof(char*));
FIO_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName); UTIL_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName);
} }
if (filenameIdx==1 && outFileName) if (filenameIdx==1 && outFileName)
operationResult = FIO_decompressFilename(prefs, outFileName, filenameTable[0], dictFileName); operationResult = FIO_decompressFilename(prefs, outFileName, filenameTable[0], dictFileName);