allow analysis even if file does not have zst extension

This commit is contained in:
Paul Cruz
2017-06-15 15:02:54 -07:00
parent a9b77c83e5
commit 4495e9a826
+5 -10
View File
@@ -914,8 +914,8 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
} }
size_t const headerSize = ZSTD_frameHeaderSize(headerBuffer, numBytesRead); size_t const headerSize = ZSTD_frameHeaderSize(headerBuffer, numBytesRead);
if (ZSTD_isError(headerSize)) { if (ZSTD_isError(headerSize)) {
fclose(srcFile);
DISPLAY("Error: could not determine frame header size\n"); DISPLAY("Error: could not determine frame header size\n");
fclose(srcFile);
return 1; return 1;
} }
@@ -1037,25 +1037,20 @@ void displayInfo(const char* inFileName, fileInfo_t* info, int displayLevel){
DISPLAYOUT("Check: XXH64\n"); DISPLAYOUT("Check: XXH64\n");
} }
} }
DISPLAYOUT("\n");
} }
int FIO_listFile(const char* inFileName, int displayLevel){ int FIO_listFile(const char* inFileName, int displayLevel){
const char* const suffixPtr = strrchr(inFileName, '.');
DISPLAY("File: %s\n", inFileName); DISPLAY("File: %s\n", inFileName);
if (!suffixPtr || strcmp(suffixPtr, ZSTD_EXTENSION)) {
DISPLAYLEVEL(1, "file %s was not compressed with zstd -- ignoring\n\n", inFileName);
return 1;
}
else {
fileInfo_t* info = (fileInfo_t*)malloc(sizeof(fileInfo_t)); fileInfo_t* info = (fileInfo_t*)malloc(sizeof(fileInfo_t));
int error = getFileInfo(info, inFileName); int error = getFileInfo(info, inFileName);
if (error == 1) { if (error == 1) {
DISPLAY("An error occurred with getting file info\n"); DISPLAY("An error occurred with getting file info\n");
exit(1); return 1;
} }
displayInfo(inFileName, info, displayLevel); displayInfo(inFileName, info, displayLevel);
} free(info);
DISPLAY("\n");
return 0; return 0;
} }