From: Sen Huang <senhuang96@fb.com>
Date: Wed, 9 Oct 2019 13:39:52 +0000 (-0400)
Subject: Only check for filename collisions when using --output-dir-flat
X-Git-Tag: v1.4.4~1^2~36^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1812%2Fhead;p=thirdparty%2Fzstd.git

Only check for filename collisions when using --output-dir-flat
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 81633947f..39cc70b9c 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -1553,7 +1553,8 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs, const char** inFileN
             const char* const dstFileName = FIO_determineCompressedName(srcFileName, outDirName, suffix);  /* cannot fail */
             error |= FIO_compressFilename_srcFile(prefs, ress, dstFileName, srcFileName, compressionLevel);
         }
-        FIO_checkFilenameCollisions(inFileNamesTable ,nbFiles);
+        if (outDirName)
+            FIO_checkFilenameCollisions(inFileNamesTable ,nbFiles);
     }
 
     FIO_freeCResources(ress);
@@ -2375,7 +2376,8 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
 
             error |= FIO_decompressSrcFile(prefs, ress, dstFileName, srcFileName);
         }
-        FIO_checkFilenameCollisions(srcNamesTable ,nbFiles);
+        if (outDirName)
+            FIO_checkFilenameCollisions(srcNamesTable ,nbFiles);
     }
 
     FIO_freeDResources(ress);