]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
added in correct error return from main in zstdcli.c
authorPaul Cruz <paulcruz74@fb.com>
Fri, 16 Jun 2017 00:46:49 +0000 (17:46 -0700)
committerPaul Cruz <paulcruz74@fb.com>
Fri, 16 Jun 2017 00:46:49 +0000 (17:46 -0700)
programs/fileio.c
programs/zstdcli.c

index 5ab3c5be0e5e733dd3484210b3fa76a37085aa97..2f51b95cfc71bfb693e10c43dd02fef6bde9cff3 100644 (file)
@@ -1057,11 +1057,11 @@ int FIO_listFile(const char* inFileName, int displayLevel){
         }
         else if (error == 2) {
             DISPLAYOUT("File %s not compressed with zstd\n\n", inFileName);
-            return 0;
+            return 1;
         }
+        displayInfo(inFileName, &info, displayLevel);
+        return error;
     }
-    displayInfo(inFileName, &info, displayLevel);
-    return 0;
 }
 
 int FIO_compressMultipleFilenames(const char** inFileNamesTable, unsigned nbFiles,
index c71e80bdd38b785bcd96a1631ce256ea032c5fea..a556403510bba2d24d0f4d5716bea86a145851e4 100644 (file)
@@ -675,7 +675,7 @@ int main(int argCount, const char* argv[])
         }
     }
 #endif
-    if(operation==zom_list){
+    if (operation == zom_list) {
         g_displayOut = stdout;
         if(filenameIdx==0){
             DISPLAY("No files given\n");
@@ -686,12 +686,13 @@ int main(int argCount, const char* argv[])
         DISPLAY("===========================================\n");
         DISPLAY("Number of files listed: %d\n", filenameIdx);
         {
+            int error = 0;
             unsigned u;
             for(u=0; u<filenameIdx;u++){
-                FIO_listFile(filenameTable[u],g_displayLevel);
+                error = FIO_listFile(filenameTable[u],g_displayLevel);
             }
+            CLEAN_RETURN(error);
         }
-        CLEAN_RETURN(0);
     }
     /* Check if benchmark is selected */
     if (operation==zom_bench) {