summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-03-06 19:20:08 +0100
committerLennart Poettering <lennart@poettering.net>2019-03-13 17:38:43 +0100
commit7bc4bf4a69f0f7b102085dc0aa51997305d898c8 (patch)
tree62245978027aee90fd31b19481406a9c90e2a024
parentdb7091dca2f3bf348b0c8cb7197a4da2461f7e19 (diff)
downloadsystemd-7bc4bf4a69f0f7b102085dc0aa51997305d898c8.tar.gz
execute: use path_join() where appropriate
-rw-r--r--src/core/execute.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 49478305e2..cf137fcd3a 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);
}