From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Mar 2019 18:20:08 +0000 (+0100)
Subject: execute: use path_join() where appropriate
X-Git-Tag: v242-rc1~131^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bc4bf4a69f0f7b102085dc0aa51997305d898c8;p=thirdparty%2Fsystemd.git

execute: use path_join() where appropriate
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 49478305e2c..cf137fcd3a4 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3904,12 +3904,12 @@ int exec_context_destroy_runtime_directory(const ExecContext *c, const char *run
         STRV_FOREACH(i, c->directories[EXEC_DIRECTORY_RUNTIME].paths) {
                 _cleanup_free_ char *p;
 
-                p = strjoin(runtime_prefix, "/", *i);
+                p = path_join(runtime_prefix, *i);
                 if (!p)
                         return -ENOMEM;
 
-                /* We execute this synchronously, since we need to be sure this is gone when we start the service
-                 * next. */
+                /* We execute this synchronously, since we need to be sure this is gone when we start the
+                 * service next. */
                 (void) rm_rf(p, REMOVE_ROOT);
         }