From 86e69a44b4432c05cc5c6e9af912db14b8fbea72 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 24 Sep 2022 17:10:40 +0200 Subject: [PATCH] tmpfile-util: Introduce mkdtemp_open() --- src/basic/tmpfile-util.c | 20 ++++++++++++++++++++ src/basic/tmpfile-util.h | 1 + 2 files changed, 21 insertions(+) diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c index 34d3016ba93..f3f9062121e 100644 --- a/src/basic/tmpfile-util.c +++ b/src/basic/tmpfile-util.c @@ -358,3 +358,23 @@ int mkdtemp_malloc(const char *template, char **ret) { *ret = TAKE_PTR(p); return 0; } + +int mkdtemp_open(const char *template, int flags, char **ret) { + _cleanup_free_ char *p = NULL; + int fd, r; + + r = mkdtemp_malloc(template, &p); + if (r < 0) + return r; + + fd = RET_NERRNO(open(p, O_DIRECTORY|O_CLOEXEC|flags)); + if (fd < 0) { + (void) rmdir(p); + return fd; + } + + if (ret) + *ret = TAKE_PTR(p); + + return fd; +} diff --git a/src/basic/tmpfile-util.h b/src/basic/tmpfile-util.h index 610cbaf87e7..96e37cc5783 100644 --- a/src/basic/tmpfile-util.h +++ b/src/basic/tmpfile-util.h @@ -19,3 +19,4 @@ int link_tmpfile(int fd, const char *path, const char *target); int flink_tmpfile(FILE *f, const char *path, const char *target); int mkdtemp_malloc(const char *template, char **ret); +int mkdtemp_open(const char *template, int flags, char **ret); -- 2.47.3