From: Paul Cruz <paulcruz74@fb.com>
Date: Fri, 16 Jun 2017 00:00:59 +0000 (-0700)
Subject: added case for when file is not compressed with zstd (incorrect magic number)
X-Git-Tag: v1.3.0~1^2~21^2~16^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a2e55e2e2c7ffeb978d944a31696f2b7c5bcc1;p=thirdparty%2Fzstd.git

added case for when file is not compressed with zstd (incorrect magic number)
---

diff --git a/programs/fileio.c b/programs/fileio.c
index bb3f13d8e..908e0edb6 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -874,7 +874,7 @@ typedef struct {
 
 /*
  * Reads information from file, stores in *info
- * if successful, returns 0, otherwise returns 1
+ * if successful, returns 0, returns 1 for frame analysis error, returns 2 for file not compressed with zstd
  */
 static int getFileInfo(fileInfo_t* info, const char* inFileName){
     int detectError = 0;
@@ -998,6 +998,10 @@ static int getFileInfo(fileInfo_t* info, const char* inFileName){
                 }
                 info->numSkippableFrames++;
             }
+            else {
+                detectError = 2;
+                break;
+            }
         }
     }
     fclose(srcFile);
@@ -1043,8 +1047,12 @@ int FIO_listFile(const char* inFileName, int displayLevel){
     {
         int const error = getFileInfo(&info, inFileName);
         if (error == 1) {
+            /* display error, but provide output */
             DISPLAY("An error occurred with getting file info\n");
-            return 1;
+        }
+        else if (error == 2) {
+            DISPLAYOUT("File %s not compressed with zstd\n\n", inFileName);
+            return 0;
         }
     }
     displayInfo(inFileName, &info, displayLevel);