]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
execute: use path_join() where appropriate
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Mar 2019 18:20:08 +0000 (19:20 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Mar 2019 16:38:43 +0000 (17:38 +0100)
src/core/execute.c

index 49478305e2c4887696f72786123a6fa9a4eebce5..cf137fcd3a4ab8581ab419d9288a31659829429e 100644 (file)
@@ -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);
         }