From c5ebb370510b5a2c7fbeac332a2480f51e0c9070 Mon Sep 17 00:00:00 2001 From: Sen Huang Date: Wed, 9 Oct 2019 09:39:52 -0400 Subject: [PATCH] Only check for filename collisions when using --output-dir-flat --- programs/fileio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); -- 2.47.2