From: Timo Heister <timo.heister@gmail.com>
Date: Sat, 5 May 2018 02:00:43 +0000 (-0400)
Subject: use std::tmpfile instead of tmpnam
X-Git-Tag: v9.0.0-rc1~1^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6471%2Fhead;p=dealii.git

use std::tmpfile instead of tmpnam
---

diff --git a/source/gmsh/utilities.cc b/source/gmsh/utilities.cc
index 2f363bdc01..c020c77630 100644
--- a/source/gmsh/utilities.cc
+++ b/source/gmsh/utilities.cc
@@ -54,12 +54,16 @@ namespace Gmsh
                                            const AdditionalParameters &prm)
   {
     std::string base_name = prm.output_base_name;
+    FILE *tmp_file = nullptr;
     if (base_name == "")
-      base_name = std::tmpnam(nullptr);
+      {
+        tmp_file = std::tmpfile();
+        AssertThrow(tmp_file != nullptr, ExcMessage("Creating temporary file failed!"));
+      }
 
     const std::string iges_file_name     = base_name+".iges";
     const std::string geo_file_name      = base_name+".geo";
-    const std::string msh_file_name     = base_name+".msh";
+    const std::string msh_file_name      = base_name+".msh";
     const std::string log_file_name      = base_name+".log";
     const std::string warnings_file_name = base_name+"_warn.log";
 
@@ -95,6 +99,10 @@ namespace Gmsh
 
     if (base_name != prm.output_base_name)
       {
+        // clean up if the filenames are temporary ones
+        AssertThrow(tmp_file != nullptr, ExcInternalError());
+        const int ret = std::fclose(tmp_file);
+        AssertThrow(ret == 0, ExcInternalError());
         {
           const auto ret_value = std::remove(iges_file_name.c_str());
           AssertThrow(ret_value == 0, ExcMessage("Failed to remove "+iges_file_name));