From 30bff50e06d84d1d426fee62acd34223abc69f1b Mon Sep 17 00:00:00 2001
From: Sen Huang <senhuang96@fb.com>
Date: Fri, 6 Sep 2019 11:10:53 -0700
Subject: [PATCH] fixes for tests and segfault

---
 programs/fileio.c  | 22 ++++++----------------
 programs/fileio.h  |  4 ----
 programs/util.c    | 14 ++++++++++++++
 programs/util.h    |  3 +++
 programs/zstdcli.c |  5 +++--
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/programs/fileio.c b/programs/fileio.c
index 194ea85c4..cc8809f94 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -1453,7 +1453,9 @@ int FIO_compressMultipleFilenames(FIO_prefs_t* const prefs, const char** inFileN
     }   }
 
     FIO_freeCResources(ress);
-    UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
+    if (outDirName)
+        UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
+        
     return error;
 }
 
@@ -2274,24 +2276,12 @@ FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
     }
 
     FIO_freeDResources(ress);
-    UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
+    if (outDirName)
+        UTIL_freeDestinationFilenameTable(dstFileNamesTable, nbFiles);
+
     return error;
 }
 
-void FIO_processMultipleFilenameDestinationDir(char** dstFilenameTable,
-                                              const char** filenameTable, unsigned filenameIdx,
-                                              const char* outFileName, const char* outDirName) {
-    int dirResult;
-    dirResult = UTIL_createDir(outDirName);
-    if (dirResult)
-        DISPLAY("Directory creation unsuccessful \n");
-
-    UTIL_createDestinationDirTable(filenameTable, filenameIdx, outDirName, dstFilenameTable);
-    if (outFileName) {
-        outFileName = dstFilenameTable[0]; /* in case -O is called with single file */
-    }
-}
-
 /* **************************************************************************
  *  .zst file info (--list command)
  ***************************************************************************/
diff --git a/programs/fileio.h b/programs/fileio.h
index 1b435c5f3..40cd8985f 100644
--- a/programs/fileio.h
+++ b/programs/fileio.h
@@ -118,10 +118,6 @@ int FIO_decompressMultipleFilenames(FIO_prefs_t* const prefs,
                                     const char* outFileName,
                                     const char* dictFileName);
 
-void FIO_processMultipleFilenameDestinationDir(char** dstFilenameTable,
-                                              const char** filenameTable, unsigned filenameIdx,
-                                              const char* outFileName, const char* outDirName);
-
 
 /*-*************************************
 *  Advanced stuff (should actually be hosted elsewhere)
diff --git a/programs/util.c b/programs/util.c
index 3b134f9cd..f00bfd608 100644
--- a/programs/util.c
+++ b/programs/util.c
@@ -123,6 +123,20 @@ void UTIL_createDestinationDirTable(const char** filenameTable, unsigned nbFiles
     } 
 }
 
+void UTIL_processMultipleFilenameDestinationDir(char** dstFilenameTable,
+                                              const char** filenameTable, unsigned filenameIdx,
+                                              const char* outFileName, const char* outDirName) {
+    int dirResult;
+    dirResult = UTIL_createDir(outDirName);
+    if (dirResult)
+        UTIL_DISPLAYLEVEL(1, "Directory creation unsuccessful\n");
+
+    UTIL_createDestinationDirTable(filenameTable, filenameIdx, outDirName, dstFilenameTable);
+    if (outFileName) {
+        outFileName = dstFilenameTable[0]; /* in case -O is called with single file */
+    }
+}
+
 void UTIL_freeDestinationFilenameTable(char** dstDirTable, unsigned nbFiles) {
     unsigned u;
     for (u = 0; u < nbFiles; ++u) {
diff --git a/programs/util.h b/programs/util.h
index 1c1273262..9615504ca 100644
--- a/programs/util.h
+++ b/programs/util.h
@@ -133,6 +133,9 @@ int UTIL_isSameFile(const char* file1, const char* file2);
 void UTIL_createDestinationDirTable(const char** filenameTable, unsigned filenameIdx,
         const char* outDirName,  char** dstFilenameTable);
 void UTIL_freeDestinationFilenameTable(char** dstDirTable, unsigned nbFiles);
+void UTIL_processMultipleFilenameDestinationDir(char** dstFilenameTable,
+                                              const char** filenameTable, unsigned filenameIdx,
+                                              const char* outFileName, const char* outDirName);
 
 U32 UTIL_isLink(const char* infilename);
 #define UTIL_FILESIZE_UNKNOWN  ((U64)(-1))
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 9029f6344..606c162f7 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -1178,8 +1178,9 @@ int main(int argCount, const char* argv[])
         if (adaptMax < cLevel) cLevel = adaptMax;
 
         if (outDirName) {
+            printf("ok\n");
             dstFilenameTable = (char**)malloc(filenameIdx * sizeof(char*));
-            FIO_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName);
+            UTIL_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName);
         }
 
         if ((filenameIdx==1) && outFileName)
@@ -1203,7 +1204,7 @@ int main(int argCount, const char* argv[])
 
         if (outDirName) {
             dstFilenameTable = (char**)malloc(filenameIdx * sizeof(char*));
-            FIO_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName);
+            UTIL_processMultipleFilenameDestinationDir(dstFilenameTable, filenameTable, filenameIdx, outFileName, outDirName);
         }
         if (filenameIdx==1 && outFileName)
             operationResult = FIO_decompressFilename(prefs, outFileName, filenameTable[0], dictFileName);