From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Jun 2018 14:51:31 +0000 (+0200)
Subject: util: allow mkdtemp_malloc() to be called with NULL pattern
X-Git-Tag: v239~57^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f4030399350a853803aad244812b83c1dda3a35;p=thirdparty%2Fsystemd.git

util: allow mkdtemp_malloc() to be called with NULL pattern

In that case simply place the directory in /tmp.
---

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 5837163fed1..11223d5db8a 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1560,21 +1560,29 @@ int read_nul_string(FILE *f, char **ret) {
 }
 
 int mkdtemp_malloc(const char *template, char **ret) {
-        char *p;
+        _cleanup_free_ char *p = NULL;
+        int r;
 
-        assert(template);
         assert(ret);
 
-        p = strdup(template);
+        if (template)
+                p = strdup(template);
+        else {
+                const char *tmp;
+
+                r = tmp_dir(&tmp);
+                if (r < 0)
+                        return r;
+
+                p = strjoin(tmp, "/XXXXXX");
+        }
         if (!p)
                 return -ENOMEM;
 
-        if (!mkdtemp(p)) {
-                free(p);
+        if (!mkdtemp(p))
                 return -errno;
-        }
 
-        *ret = p;
+        *ret = TAKE_PTR(p);
         return 0;
 }