From 2d5bdf5bc0e4714d42e5999a4e37553a6bf83575 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 28 Jan 2014 13:47:35 +0100 Subject: always use the same code for creating temporary files Let's unify our code here, and also always specifiy O_CLOEXEC. --- src/journal/test-catalog.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/journal/test-catalog.c') diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index ffe180265b..b087a8b81c 100644 --- a/src/journal/test-catalog.c +++ b/src/journal/test-catalog.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "util.h" #include "log.h" @@ -45,7 +46,9 @@ static void test_import(Hashmap *h, struct strbuf *sb, const char* contents, ssize_t size, int code) { int r; char name[] = "/tmp/test-catalog.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); + _cleanup_close_ int fd; + + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); assert(fd >= 0); assert_se(write(fd, contents, size) == size); @@ -98,10 +101,10 @@ static void test_catalog_importing(void) { static const char* database = NULL; static void test_catalog_update(void) { + static char name[] = "/tmp/test-catalog.XXXXXX"; int r; - static char name[] = "/tmp/test-catalog.XXXXXX"; - r = mkstemp(name); + r = mkostemp_safe(name, O_RDWR|O_CLOEXEC); assert(r >= 0); database = name; -- cgit v1.2.3-54-g00ecf