From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 18 Dec 2016 16:47:46 +0000 (-0500)
Subject: Change how a tmp dir is found
X-Git-Tag: 0.12.0~18^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33c9d13616c648b3a9592572c375616c77709576;p=check

Change how a tmp dir is found

It was found that on Windows the TMPDIR environment variable was
honored, but for Linux/et al it was not. This resulted in files ending
up in the build directory (the present directory when the tests
were run). As the test may not have permission to write in the build
directory, attempt to honor the P_tmpdir macro or TMPDIR environment
variable.
---

diff --git a/src/check_msg.c b/src/check_msg.c
index a8139d2..9483654 100644
--- a/src/check_msg.c
+++ b/src/check_msg.c
@@ -243,6 +243,13 @@ FILE *open_tmp_file(char **name)
     file = tmpfile();
     if(file == NULL)
     {
+        /*
+         * The heuristic for selecting a temporary folder is as follows:
+         * 1) If the TEMP environment variable is defined, use that directory.
+         * 2) If the P_tmpdir macro is defined, use that directory.
+         * 3) If the TMPDIR environment variable is defined, use that directory.
+         * 4) Use the platform defined temporary directory, or the current directory.
+         */
         char *tmp = getenv("TEMP");
         char *tmp_file = tempnam(tmp, "check_");
 
@@ -263,9 +270,27 @@ FILE *open_tmp_file(char **name)
         free(tmp_file);
     }
 #else
+    /*
+     * The heuristic for selecting a temporary folder is as follows:
+     * 1) If the TEMP environment variable is defined, use that directory.
+     * 2) If the P_tmpdir macro is defined, use that directory.
+     * 3) If the TMPDIR environment variable is defined, use that directory.
+     * 4) Use the current directory
+     */
+
     int fd = -1;
     const char *tmp_dir = getenv ("TEMP");
-    if (!tmp_dir)
+#ifdef P_tmpdir
+    if (tmp_dir == NULL)
+    {
+        tmp_dir = P_tmpdir;
+    }
+#endif /*P_tmpdir*/
+    if (tmp_dir == NULL)
+    {
+        tmp_dir = getenv ("TMPDIR");
+    }
+    if (tmp_dir == NULL)
     {
         tmp_dir = ".";
     }