summaryrefslogtreecommitdiffstats
path: root/programs/lz4io.c
diff options
context:
space:
mode:
authorgabrielstedman <gabriwinter@gmail.com>2019-04-22 08:58:26 (GMT)
committergabrielstedman <gabriwinter@gmail.com>2019-04-22 09:02:46 (GMT)
commit0acebbe53dd1b15071f2c48a7b060299b5d03622 (patch)
treeb5e09fc4253f29d6468358a4350c2b69fe4ac46a /programs/lz4io.c
parent9d0960c354c9018957856334b1901bd693efe995 (diff)
downloadlz4-0acebbe53dd1b15071f2c48a7b060299b5d03622.zip
lz4-0acebbe53dd1b15071f2c48a7b060299b5d03622.tar.gz
lz4-0acebbe53dd1b15071f2c48a7b060299b5d03622.tar.bz2
FR #598 - Move LZ4F_compFileInfo_t def to lz4frame.h discard output_file
assert if in om_list mode
Diffstat (limited to 'programs/lz4io.c')
-rw-r--r--programs/lz4io.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/programs/lz4io.c b/programs/lz4io.c
index 61fa13f..070e22a 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -1218,6 +1218,7 @@ static int LZ4IO_getCompressedFileInfo(const char* input_filename, LZ4F_compFil
const char *b,
*e;
char *t;
+ stat_t statbuf;
size_t readSize = LZ4F_HEADER_SIZE_MAX;
LZ4F_errorCode_t errorCode;
dRess_t ress;
@@ -1227,10 +1228,12 @@ static int LZ4IO_getCompressedFileInfo(const char* input_filename, LZ4F_compFil
if (finput==NULL) return 1;
/* Get file size */
- if (!UTIL_getFileStat(input_filename, &cfinfo->fileStat)){
+ if (!UTIL_getFileStat(input_filename, &statbuf)){
EXM_THROW(60, "Can't stat file : %s", input_filename);
}
+ cfinfo->fileSize = statbuf.st_size;
+
/* Get basename without extension */
b = strrchr(input_filename, '/');
if (!b){
@@ -1336,11 +1339,11 @@ int LZ4IO_displayCompressedFilesInfo(const char** inFileNames, const size_t ifnI
break;
}
if(cfinfo.frameInfo.contentSize){
- ratio = (double)cfinfo.fileStat.st_size / cfinfo.frameInfo.contentSize;
- DISPLAY("%-16d\t%-20lu\t%-20llu\t%-8.4f\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileStat.st_size,cfinfo.frameInfo.contentSize, ratio, cfinfo.fileName);
+ ratio = (double)cfinfo.fileSize / cfinfo.frameInfo.contentSize;
+ DISPLAY("%-16d\t%-20lu\t%-20llu\t%-8.4f\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileSize,cfinfo.frameInfo.contentSize, ratio, cfinfo.fileName);
}
else{
- DISPLAY("%-16d\t%-20lu\t%-20s\t%-10s\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileStat.st_size, "-", "-", cfinfo.fileName);
+ DISPLAY("%-16d\t%-20lu\t%-20s\t%-10s\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileSize, "-", "-", cfinfo.fileName);
}
}
return op_result;