64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
|
From 6c2b6e9e2758b7491ce89920a8711c1b41100269 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Weimer <fweimer@redhat.com>
|
||
|
|
Date: Tue, 30 Oct 2018 13:55:50 +0100
|
||
|
|
Subject: [PATCH 31] support_blob_repeat: Call mkstemp directory for the
|
||
|
|
backing file
|
||
|
|
|
||
|
|
This avoids a warning during post-test cleanup.
|
||
|
|
|
||
|
|
(cherry picked from commit a91e9301c47bb688f4e496a19cfc68261ff18293)
|
||
|
|
---
|
||
|
|
ChangeLog | 4 ++++
|
||
|
|
support/blob_repeat.c | 14 +++++++++-----
|
||
|
|
2 files changed, 13 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ChangeLog b/ChangeLog
|
||
|
|
index a2a9fc3cc9..b4c48644ae 100644
|
||
|
|
--- a/ChangeLog
|
||
|
|
+++ b/ChangeLog
|
||
|
|
@@ -1,3 +1,7 @@
|
||
|
|
+2018-10-30 Florian Weimer <fweimer@redhat.com>
|
||
|
|
+
|
||
|
|
+ * support/blob_repeat.c (allocate_big): Call mkstemp directly.
|
||
|
|
+
|
||
|
|
2018-10-30 Florian Weimer <fweimer@redhat.com>
|
||
|
|
|
||
|
|
* stdlib/test-bz22786.c (do_test): Additional free calls to avoid
|
||
|
|
diff --git a/support/blob_repeat.c b/support/blob_repeat.c
|
||
|
|
index da4ca83043..16c1e448b9 100644
|
||
|
|
--- a/support/blob_repeat.c
|
||
|
|
+++ b/support/blob_repeat.c
|
||
|
|
@@ -23,8 +23,8 @@
|
||
|
|
#include <string.h>
|
||
|
|
#include <support/blob_repeat.h>
|
||
|
|
#include <support/check.h>
|
||
|
|
+#include <support/test-driver.h>
|
||
|
|
#include <support/support.h>
|
||
|
|
-#include <support/temp_file.h>
|
||
|
|
#include <support/xunistd.h>
|
||
|
|
#include <sys/mman.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
@@ -155,13 +155,17 @@ allocate_big (size_t total_size, const void *element, size_t element_size,
|
||
|
|
if (target == MAP_FAILED)
|
||
|
|
return (struct support_blob_repeat) { 0 };
|
||
|
|
|
||
|
|
- /* Create the backing file for the repeated mapping. */
|
||
|
|
+ /* Create the backing file for the repeated mapping. Call mkstemp
|
||
|
|
+ directly to remove the resources backing the temporary file
|
||
|
|
+ immediately, once support_blob_repeat_free is called. Using
|
||
|
|
+ create_temp_file would result in a warning during post-test
|
||
|
|
+ cleanup. */
|
||
|
|
int fd;
|
||
|
|
{
|
||
|
|
- char *temppath;
|
||
|
|
- fd = create_temp_file ("support_blob_repeat-", &temppath);
|
||
|
|
+ char *temppath = xasprintf ("%s/support_blob_repeat-XXXXXX", test_dir);
|
||
|
|
+ fd = mkstemp (temppath);
|
||
|
|
if (fd < 0)
|
||
|
|
- FAIL_EXIT1 ("create_temp_file: %m");
|
||
|
|
+ FAIL_EXIT1 ("mkstemp (\"%s\"): %m", temppath);
|
||
|
|
xunlink (temppath);
|
||
|
|
free (temppath);
|
||
|
|
}
|
||
|
|
|