From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Wed, 25 Jan 2017 12:11:26 +0000 (+0100)
Subject: improved #232 fix
X-Git-Tag: v1.1.3^2~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F519%2Fhead;p=thirdparty%2Fzstd.git

improved #232 fix
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 9c3c2b7af..430cc07eb 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -138,6 +138,10 @@ static FILE* FIO_openSrcFile(const char* srcFileName)
         f = stdin;
         SET_BINARY_MODE(stdin);
     } else {
+        if (!UTIL_doesFileExists(srcFileName)) {
+            DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName);
+            return NULL;
+        }
         f = fopen(srcFileName, "rb");
         if ( f==NULL ) DISPLAYLEVEL(1, "zstd: %s: %s \n", srcFileName, strerror(errno));
     }
@@ -361,10 +365,6 @@ static int FIO_compressFilename_srcFile(cRess_t ress,
         DISPLAYLEVEL(1, "zstd: %s is a directory -- ignored \n", srcFileName);
         return 1;
     }
-    if (!UTIL_doesFileExists(srcFileName)) {
-        DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName);
-        return 1;
-    }
 
     ress.srcFile = FIO_openSrcFile(srcFileName);
     if (!ress.srcFile) return 1;   /* srcFile could not be opened */
@@ -724,10 +724,6 @@ static int FIO_decompressSrcFile(dRess_t ress, const char* dstFileName, const ch
         DISPLAYLEVEL(1, "zstd: %s is a directory -- ignored \n", srcFileName);
         return 1;
     }
-    if (!UTIL_doesFileExists(srcFileName)) {
-        DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n", srcFileName);
-        return 1;
-    }
 
     srcFile = FIO_openSrcFile(srcFileName);
     if (srcFile==0) return 1;