From e7fadef378f4f0df0925aca2f5c062d0b02c343a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Jun 2015 19:09:02 +0200
Subject: [PATCH] util: when creating temporary file names, allow including
 extra id string in it

This adds a "char *extra" parameter to tempfn_xxxxxx(), tempfn_random(),
tempfn_ranomd_child(). If non-NULL this string is included in the middle
of the newly created file name. This is useful for being able to
distuingish the kind of temporary file when we see one.

This also adds tests for the three call.

For now, we don't make use of this at all, but port all users over.
---
 src/shared/copy.c         | 2 +-
 src/shared/machine-pool.c | 2 +-
 src/shared/util.h         | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/shared/copy.c b/src/shared/copy.c
index 1282cb88b..230e7e4d3 100644
--- a/src/shared/copy.c
+++ b/src/shared/copy.c
@@ -396,7 +396,7 @@ int copy_file_atomic(const char *from, const char *to, mode_t mode, bool replace
         assert(from);
         assert(to);
 
-        r = tempfn_random(to, &t);
+        r = tempfn_random(to, NULL, &t);
         if (r < 0)
                 return r;
 
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index 8c64908b1..8af78f47d 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -75,7 +75,7 @@ static int setup_machine_raw(uint64_t size, sd_bus_error *error) {
         if (errno != ENOENT)
                 return sd_bus_error_set_errnof(error, errno, "Failed to open /var/lib/machines.raw: %m");
 
-        r = tempfn_xxxxxx("/var/lib/machines.raw", &tmp);
+        r = tempfn_xxxxxx("/var/lib/machines.raw", NULL, &tmp);
         if (r < 0)
                 return r;
 
diff --git a/src/shared/util.h b/src/shared/util.h
index 93fe000a2..11ab9f6c0 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -990,9 +990,9 @@ int bind_remount_recursive(const char *prefix, bool ro);
 
 int fflush_and_check(FILE *f);
 
-int tempfn_xxxxxx(const char *p, char **ret);
-int tempfn_random(const char *p, char **ret);
-int tempfn_random_child(const char *p, char **ret);
+int tempfn_xxxxxx(const char *p, const char *extra, char **ret);
+int tempfn_random(const char *p, const char *extra, char **ret);
+int tempfn_random_child(const char *p, const char *extra, char **ret);
 
 bool is_localhost(const char *hostname);
 
-- 
2.30.2