Added : option `-t` to test compressed files integrity

diff --git a/lib/zstd_internal.h b/lib/zstd_internal.h
index 318fd55f64408673ab57f614272a262f0b52420b..26fc85785197ee0c65886f106e5d0934d70a0ca5 100644 (file)
--- a/lib/zstd_internal.h
+++ b/lib/zstd_internal.h
@@ -50,7 +50,6 @@
 /*-*************************************
 *  Common constants
 ***************************************/
-#define ZSTD_MAGICNUMBER 0xFD2FB525   /* v0.5 */
 #define ZSTD_DICT_MAGIC  0xEC30A435
 
 #define KB *(1 <<10)

diff --git a/lib/zstd_static.h b/lib/zstd_static.h
index 258327b155d95e20a91112b93d2d3f22ebb744ec..61216535b36face96a3cf2ad1c1a9a3ed1b69750 100644 (file)
--- a/lib/zstd_static.h
+++ b/lib/zstd_static.h
@@ -48,6 +48,12 @@ extern "C" {
 #include "mem.h"
 
 
+/*-*************************************
+*  Constants
+***************************************/
+#define ZSTD_MAGICNUMBER 0xFD2FB525   /* v0.5 */
+
+
 /*-*************************************
 *  Types
 ***************************************/

diff --git a/programs/fileio.c b/programs/fileio.c
index 003e1bd51f3accf70dd3b34b9946ef91764350f5..e2ad9e84be09a2ed2ba619d79cdb43138de430d2 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -587,7 +587,10 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* srcFileName)
             continue;
         }
 #endif   /* ZSTD_LEGACY_SUPPORT */
-
+        if (MEM_readLE32(ress.srcBuffer) !=  ZSTD_MAGICNUMBER) {
+            DISPLAYLEVEL(1, "zstd: %s: not in zstd format \n", srcFileName);
+            return 1;
+        }
         filesize += FIO_decompressFrame(ress, dstFile, srcFile, toRead);
     }
 
@@ -648,13 +651,24 @@ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles
        if (dstFileName==NULL) EXM_THROW(70, "not enough memory for dstFileName");
     ress = FIO_createDResources(dictFileName);
 
-    if (suffix) {
+    if (!strcmp(suffix, stdoutmark) || !strcmp(suffix, nulmark)) {
+        ress.dstFile = FIO_openDstFile(suffix);
+        if (ress.dstFile == 0) EXM_THROW(71, "cannot open %s", suffix);
+        for (u=0; u<nbFiles; u++)
+            missingFiles += FIO_decompressSrcFile(ress, srcNamesTable[u]);
+        if (fclose(ress.dstFile)) EXM_THROW(39, "Write error : cannot properly close %s", stdoutmark);
+    } else {
         for (u=0; u<nbFiles; u++) {   /* create dstFileName */
             const char* srcFileName = srcNamesTable[u];
             size_t sfnSize = strlen(srcFileName);
             const char* suffixPtr = srcFileName + sfnSize - suffixSize;
-            if (dfnSize <= sfnSize-suffixSize+1) { free(dstFileName); dfnSize = sfnSize + 20; dstFileName = (char*)malloc(dfnSize); if (dstFileName==NULL) EXM_THROW(71, "not enough memory for dstFileName"); }
-            if (sfnSize <= suffixSize  ||  strcmp(suffixPtr, suffix) != 0) {
+            if (dfnSize+suffixSize <= sfnSize+1) {
+                free(dstFileName);
+                dfnSize = sfnSize + 20;
+                dstFileName = (char*)malloc(dfnSize);
+                if (dstFileName==NULL) EXM_THROW(71, "not enough memory for dstFileName");
+            }
+            if (sfnSize <= suffixSize || strcmp(suffixPtr, suffix) != 0) {
                 DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%4s expected) -- ignored \n", srcFileName, suffix);
                 skippedFiles++;
                 continue;
@@ -663,15 +677,10 @@ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles
             dstFileName[sfnSize-suffixSize] = '\0';
 
             missingFiles += FIO_decompressFile_extRess(ress, dstFileName, srcFileName);
-        }
-    } else {
-        ress.dstFile = stdout;
-        for (u=0; u<nbFiles; u++)
-            missingFiles += FIO_decompressSrcFile(ress, srcNamesTable[u]);
-        if (fclose(ress.dstFile)) EXM_THROW(39, "Write error : cannot properly close %s", stdoutmark);
-    }
+    }   }
 
     FIO_freeDResources(ress);
     free(dstFileName);
     return missingFiles + skippedFiles;
 }
+

diff --git a/programs/fileio.h b/programs/fileio.h
index caae8768b9c66dbfe5b68b5d7f28f3d358c12630..ee3cf2278a91a4368392d1228f451a38f92d60d3 100644 (file)
--- a/programs/fileio.h
+++ b/programs/fileio.h
@@ -64,7 +64,6 @@ int FIO_decompressFilename (const char* outfilename, const char* infilename, con
 *  Multiple File functions
 ***************************************/
 /** FIO_compressMultipleFilenames() :
-    if `suffix == NULL`, output is stdout.
     @return : nb of missing files */
 int FIO_compressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles,
                                   const char* suffix,

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index cd285f515e0cf96813d0844229fe90c47703b85f..7a6dae99c68a049b9b2c17ad673ef3096919f36c 100644 (file)
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -115,7 +115,7 @@ static int usage(const char* programName)
     DISPLAY( " -#     : # compression level (1-%u, default:1) \n", ZSTD_maxCLevel());
     DISPLAY( " -d     : decompression \n");
     DISPLAY( " -D file: use `file` as Dictionary \n");
-    DISPLAY( " -o file: result stored into `file` (only possible if 1 input file) \n");
+    DISPLAY( " -o file: result stored into `file` (only if 1 input file) \n");
     DISPLAY( " -f     : overwrite output without prompting \n");
     DISPLAY( " -h/-H  : display help/long help and exit\n");
     return 0;
@@ -128,6 +128,7 @@ static int usage_advanced(const char* programName)
     DISPLAY( "\n");
     DISPLAY( "Advanced arguments :\n");
     DISPLAY( " -V     : display Version number and exit\n");
+    DISPLAY( " -t     : test compressed file integrity \n");
     DISPLAY( " -v     : verbose mode\n");
     DISPLAY( " -q     : suppress warnings; specify twice to suppress errors too\n");
     DISPLAY( " -c     : force write to standard output, even if it is the console\n");
@@ -266,6 +267,9 @@ int main(int argCount, const char** argv)
                     /* keep source file (default anyway, so useless; for gzip/xz compatibility) */
                 case 'k': argument++; break;
 
+                    /* test compressed file */
+                case 't': decode=1; outFileName=nulmark; FIO_overwriteMode(); argument++; break;
+
                     /* dictionary name */
                 case 'o': nextArgumentIsOutFileName=1; argument++; break;
 
@@ -380,7 +384,7 @@ int main(int argCount, const char** argv)
     if (outFileName && !strcmp(outFileName, stdoutmark) && IS_CONSOLE(stdout) && !forceStdout) return badusage(programName);
 
     /* user-selected output filename, only possible with a single file */
-    if (outFileName && strcmp(outFileName,stdoutmark) && (filenameIdx>1)) {
+    if (outFileName && strcmp(outFileName,stdoutmark) && strcmp(outFileName,nulmark) && (filenameIdx>1)) {
         DISPLAY("Too many files (%u) on the command line. \n", filenameIdx);
         return filenameIdx;
     }
@@ -395,12 +399,12 @@ int main(int argCount, const char** argv)
       if (filenameIdx==1 && outFileName)
         operationResult = FIO_decompressFilename(outFileName, filenameTable[0], dictFileName);
       else
-        operationResult = FIO_decompressMultipleFilenames(filenameTable, filenameIdx, forceStdout ? NULL : ZSTD_EXTENSION, dictFileName);
+        operationResult = FIO_decompressMultipleFilenames(filenameTable, filenameIdx, outFileName ? outFileName : ZSTD_EXTENSION, dictFileName);
     } else {  /* compression */
         if (filenameIdx==1 && outFileName)
           operationResult = FIO_compressFilename(outFileName, filenameTable[0], dictFileName, cLevel);
         else
-          operationResult = FIO_compressMultipleFilenames(filenameTable, filenameIdx, forceStdout ? NULL : ZSTD_EXTENSION, dictFileName, cLevel);
+          operationResult = FIO_compressMultipleFilenames(filenameTable, filenameIdx, outFileName ? outFileName : ZSTD_EXTENSION, dictFileName, cLevel);
     }
 
 _end: