From: Paul Cruz <paulcruz74@fb.com>
Date: Tue, 6 Jun 2017 16:21:42 +0000 (-0700)
Subject: added display for compressed size
X-Git-Tag: v1.3.0~1^2~21^2~18^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f06f4f2663269161820a9dfa9a9fdfa11adf78e;p=thirdparty%2Fzstd.git

added display for compressed size
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 7a8907ab9..c836020c9 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -862,13 +862,23 @@ int FIO_compressFilename(const char* dstFileName, const char* srcFileName,
     return result;
 }
 
-int FIO_listFile(const char* infilename){
+int FIO_listFile(const char* infilename, int displayLevel){
     DISPLAY("FILE DETECTED: %s\n", infilename);
     const char* const suffixPtr = strrchr(infilename, '.');
     if(!suffixPtr || strcmp(suffixPtr, ZSTD_EXTENSION)){
         DISPLAYLEVEL(1, "file %s was not compressed with zstd -- ignoring\n", infilename);
         return 1; 
     }
+    else{
+        U64 const compSize = UTIL_getFileSize(infilename); 
+        if(displayLevel<=2){
+            DISPLAY("Skippable  Non-Skippable  Compressed  Uncompressed  Ratio  Check  Filename\n");     
+            DISPLAY("                          %7.2f MB\n", (double)compSize/(1 MB)); 
+        }
+        else{
+            DISPLAY("Compressed Size: %.2f MB (%llu B)\n", (double)compSize/(1 MB), compSize);
+        }
+    }
     return 0;
 }
 
diff --git a/programs/fileio.h b/programs/fileio.h
index 4ca1a2b38..b28ba1de7 100644
--- a/programs/fileio.h
+++ b/programs/fileio.h
@@ -70,7 +70,7 @@ int FIO_compressFilename (const char* outfilename, const char* infilename, const
     @return : 0 == ok;  1 == pb with src file. */
 int FIO_decompressFilename (const char* outfilename, const char* infilename, const char* dictFileName);
 
-int FIO_listFile(const char* infilename);
+int FIO_listFile(const char* infilename, int displayLevel);
 
 /*-*************************************
 *  Multiple File functions
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index be0a447bb..74f2606bc 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -680,7 +680,7 @@ int main(int argCount, const char* argv[])
         unsigned u;
         DISPLAY("Number of files listed: %d\n", filenameIdx);
         for(u=0; u<filenameIdx;u++){
-            FIO_listFile(filenameTable[u]);             
+            FIO_listFile(filenameTable[u],g_displayLevel);             
         }
         CLEAN_RETURN(0);
     }