if tmpfile() fails, remember the filename and delete it later

One feature of tmpfile() is to unlink the file, causing it to be
deleted after it is closed. Unlinking an open file fails in Windows.
To prevent the case where the temp directory just fills up with
files, the created file name is remembered, and deleted when
it is closed.

Certainly, if a unit test fails before it deletes the file,
the temp directory will still fill up. However, this is better
than not deleting the files.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@814 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/src/check_msg.c b/src/check_msg.c
index a011c3d4d98c5d593e41d4e6564a38fec2d5aad1..6c75d665c7d77bab812180d4b37ca25ad28f0905 100644 (file)
--- a/src/check_msg.c
+++ b/src/check_msg.c
@@ -54,7 +54,9 @@
  */
 
 static FILE *send_file1;
+static char *send_file1_name;
 static FILE *send_file2;
+static char *send_file2_name;
 
 static FILE * get_pipe(void);
 static void setup_pipe (void);
@@ -189,10 +191,22 @@ void teardown_messaging(void)
   teardown_pipe();
 }
 
-static FILE *
-open_tmp_file (void)
+/**
+ * Open a temporary file.
+ *
+ * If the file could be unlinked upon creation, the name
+ * of the file is not returned via 'name'. However, if the
+ * file could not be unlinked, the name is returned,
+ * expecting the caller to both delete the file and
+ * free the 'name' field after the file is closed.
+ */
+static FILE * open_tmp_file (char ** name)
 {
-  /* workaround from Bug 3314868, but maybe tmpfile works if TMPDIR is set */
+  *name = NULL;
+  /* Windows does not like tmpfile(). This is likely because tmpfile()
+   * call unlink() on the file before returning it, to make sure the
+   * file is deleted when it is closed. The unlink() call also fails
+   * on Windows if the file is still open. */
   /* also note that mkstemp is apparently a C90 replacement for tmpfile */
   /* perhaps all we need to do on Windows is set TMPDIR to whatever is
      stored in TEMP for tmpfile to work */
@@ -214,7 +228,7 @@ open_tmp_file (void)
        */
       char *uniq_tmp_file = ck_strdup_printf("%s.%d",tmp_file, getpid());
       file = fopen (uniq_tmp_file, "w+b");
-      free(uniq_tmp_file);
+      *name = uniq_tmp_file;
       free (tmp_file);
     }
   return file;
@@ -225,12 +239,12 @@ setup_pipe (void)
 {
   if (send_file1 == NULL)
     {
-      send_file1 = open_tmp_file ();
+      send_file1 = open_tmp_file (&send_file1_name);
       return;
     }
   if (send_file2 == NULL)
     {
-      send_file2 = open_tmp_file ();
+      send_file2 = open_tmp_file (&send_file2_name);
       return;
     }
   eprintf ("Only one nesting of suite runs supported", __FILE__, __LINE__);
@@ -241,9 +255,19 @@ static void teardown_pipe(void)
   if (send_file2 != 0) {
     fclose(send_file2);
     send_file2 = 0;
+    if(send_file2_name != NULL) {
+               unlink(send_file2_name);
+               free(send_file2_name);
+               send_file2_name = NULL;
+       }
   } else if (send_file1 != 0) {
     fclose(send_file1);
     send_file1 = 0;
+    if(send_file1_name != NULL) {
+               unlink(send_file1_name);
+               free(send_file1_name);
+               send_file1_name = NULL;
+       }
   } else {
     eprintf("No messaging setup", __FILE__, __LINE__);
   }