X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-file.c;fp=src%2Ftest%2Ftest-unit-file.c;h=a8d5b65e6d8249b6fb6197ec060789ddfa769d30;hp=1b4133b5d34004ba999d02b6cffc027541f52bd2;hb=2d5bdf5bc0e4714d42e5999a4e37553a6bf83575;hpb=7736202ce9149942e96e525c08d508daa448aff5 diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 1b4133b5d..a8d5b65e6 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "install.h" #include "install-printf.h" @@ -221,7 +222,9 @@ static void test_load_env_file_1(void) { int r; char name[] = "/tmp/test-load-env-file.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, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1)); @@ -242,7 +245,9 @@ static void test_load_env_file_2(void) { int r; char name[] = "/tmp/test-load-env-file.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, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2)); @@ -258,7 +263,9 @@ static void test_load_env_file_3(void) { int r; char name[] = "/tmp/test-load-env-file.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, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3)); @@ -270,10 +277,11 @@ static void test_load_env_file_3(void) { static void test_load_env_file_4(void) { _cleanup_strv_free_ char **data = NULL; + char name[] = "/tmp/test-load-env-file.XXXXXX"; + _cleanup_close_ int fd; int r; - char name[] = "/tmp/test-load-env-file.XXXXXX"; - _cleanup_close_ int fd = mkstemp(name); + fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); assert(fd >= 0); assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4));