Fix core dump and mark cli-e-2.test as passing now.

0-wiz-0 · Mar 5, 2024 · 093a472 · 093a472
1 parent 6dc075d
commit 093a472
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(XFAIL_TESTS
   cli-e.test
-  cli-e-2.test
   sort-dupes.test
 )
 

diff --git a/regress/cli-e-2.test b/regress/cli-e-2.test
@@ -6,7 +6,9 @@ stdout
 Rezipping - dupe.zip
 --------------------------------------------------
 Adding - abc (4 bytes)...Done
+Not done
 end-of-inline-data
 stderr
 Zip file "dupe.zip" contains more than one file named "abc"
+!!!! There were problems! !!!!
 end-of-inline-data
diff --git a/src/trrntzip.c b/src/trrntzip.c
@@ -601,7 +601,7 @@ int MigrateZip(const char *zip_path, const char *pDir, WORKSPACE *ws,
 
   // If there was an error above then clean up and return.
   if (error) {
-    fprintf(mig->fProcessLog, "Not done\n");
+    logprint(stdout, mig->fProcessLog, "Not done\n");
     unzClose(UnZipHandle);
     zipClose(ZipHandle, NULL);
     remove(szTmpZipFileName);
@@ -869,11 +869,11 @@ void DisplayMigrateSummary(WORKSPACE *ws, MIGRATE *mig) {
 
     if (mig->bErrorEncountered) {
       if (ws->fErrorLog)
-        fprintf(mig->fProcessLog,
-                "!!!! There were problems! See \"%s\" for details! !!!!\n",
-                ws->pszErrorLogFile);
+        logprint(stdout, mig->fProcessLog,
+                 "!!!! There were problems! See \"%s\" for details! !!!!\n",
+                 ws->pszErrorLogFile);
       else
-        fprintf(mig->fProcessLog, "!!!! There were problems! !!!!\n");
+        logprint(stdout, mig->fProcessLog, "!!!! There were problems! !!!!\n");
     }
   }
 }