X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-tmpfiles.c;h=90e49d454233b393be27cb95e144a4de8969face;hb=b6e676ce41508e2aeea22202fc8f234126177f52;hp=f25a0dca525b96d30b75eb35e33a59200bf07921;hpb=65b3903ff576488eaabb51d3c4fbf9c73d867d7c;p=elogind.git

diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index f25a0dca5..90e49d454 100644
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -30,18 +28,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);