From: Sergey Ponomarev <stokito@gmail.com>
Date: Sat, 14 Sep 2019 18:14:43 +0000 (+0300)
Subject: #754 move sufixlist upper and improve error message on missing suffix
X-Git-Tag: v1.4.4~1^2~10^2~3^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b804dd3e5bd3397fa5bbb3a5313496e9156d4fb5;p=thirdparty%2Fzstd.git

#754 move sufixlist upper and improve error message on missing suffix
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 8a45563d4..e5fb1aad1 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -2169,12 +2169,24 @@ FIO_determineDstName(const char* srcFileName)
     static size_t dfnbCapacity = 0;
     static char* dstFileNameBuffer = NULL;   /* using static allocation : this function cannot be multi-threaded */
 
+    const char* suffixlist = ZSTD_EXTENSION
+    #ifdef ZSTD_GZDECOMPRESS
+        "/" GZ_EXTENSION
+    #endif
+    #ifdef ZSTD_LZMADECOMPRESS
+        "/" XZ_EXTENSION "/" LZMA_EXTENSION
+    #endif
+    #ifdef ZSTD_LZ4DECOMPRESS
+        "/" LZ4_EXTENSION
+    #endif
+    ;
+
     size_t const sfnSize = strlen(srcFileName);
     size_t suffixSize;
     const char* const suffixPtr = strrchr(srcFileName, '.');
     if (suffixPtr == NULL) {
-        DISPLAYLEVEL(1, "zstd: %s: unknown suffix -- ignored \n",
-                        srcFileName);
+        DISPLAYLEVEL(1, "zstd: %s: missing suffix (%s expected) -- ignored \n",
+                        srcFileName, suffixlist);
         return NULL;
     }
     suffixSize = strlen(suffixPtr);
@@ -2193,17 +2205,6 @@ FIO_determineDstName(const char* srcFileName)
             && strcmp(suffixPtr, LZ4_EXTENSION)
         #endif
             ) ) {
-        const char* suffixlist = ZSTD_EXTENSION
-        #ifdef ZSTD_GZDECOMPRESS
-            "/" GZ_EXTENSION
-        #endif
-        #ifdef ZSTD_LZMADECOMPRESS
-            "/" XZ_EXTENSION "/" LZMA_EXTENSION
-        #endif
-        #ifdef ZSTD_LZ4DECOMPRESS
-            "/" LZ4_EXTENSION
-        #endif
-        ;
         DISPLAYLEVEL(1, "zstd: %s: unknown suffix (%s expected) -- ignored \n",
                      srcFileName, suffixlist);
         return NULL;