X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-tmpfiles.c;h=4b72c4a8faaaa361726b714bf7e2ccdfd2343f48;hb=63c372cb9df3bee01e3bf8cd7f96f336bddda846;hp=f25a0dca525b96d30b75eb35e33a59200bf07921;hpb=65b3903ff576488eaabb51d3c4fbf9c73d867d7c;p=elogind.git diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c index f25a0dca5..4b72c4a8f 100644 --- a/src/test/test-tmpfiles.c +++ b/src/test/test-tmpfiles.c @@ -30,18 +30,18 @@ int main(int argc, char** argv) { const char *p = argv[1] ?: "/tmp"; - char *pattern = strappenda(p, "/systemd-test-XXXXXX"); + char *pattern = strjoina(p, "/systemd-test-XXXXXX"); _cleanup_close_ int fd, fd2; _cleanup_free_ char *cmd, *cmd2; - fd = open_tmpfile(p, O_RDWR); - assert(fd >= 0); + fd = open_tmpfile(p, O_RDWR|O_CLOEXEC); + assert_se(fd >= 0); assert_se(asprintf(&cmd, "ls -l /proc/"PID_FMT"/fd/%d", getpid(), fd) > 0); system(cmd); - fd2 = mkostemp_safe(pattern, O_RDWR); - assert(fd >= 0); + fd2 = mkostemp_safe(pattern, O_RDWR|O_CLOEXEC); + assert_se(fd >= 0); assert_se(unlink(pattern) == 0); assert_se(asprintf(&cmd2, "ls -l /proc/"PID_FMT"/fd/%d", getpid(), fd2) > 0);