]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Only check for filename collisions when using --output-dir-flat 1812/head
authorSen Huang <senhuang96@fb.com>
Wed, 9 Oct 2019 13:39:52 +0000 (09:39 -0400)
committerSen Huang <senhuang96@fb.com>
Wed, 9 Oct 2019 13:39:52 +0000 (09:39 -0400)
programs/fileio.c

index 81633947f8ffa4da03972f45d2d0112194b5caaf..39cc70b9c97d3c8faf51ed9a930251e5b510c52f 100644 (file)
@@ -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);