From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Aug 2019 15:32:34 +0000 (+0200)
Subject: load-fragment: use path_join() where appropriate
X-Git-Tag: v243-rc2~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a8daee72f8b1e86cbd28c1f5345db3788dee28b;p=thirdparty%2Fsystemd.git

load-fragment: use path_join() where appropriate
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 20079e1fb12..c7827df95d2 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -98,14 +98,12 @@ int parse_confirm_spawn(const char *value, char **console) {
         if (r == 0) {
                 *console = NULL;
                 return 0;
-        }
-
-        if (r > 0) /* on with default tty */
+        } else if (r > 0) /* on with default tty */
                 s = strdup("/dev/console");
         else if (is_path(value)) /* on with fully qualified path */
                 s = strdup(value);
         else /* on with only a tty file name, not a fully qualified path */
-                s = strjoin("/dev/", value);
+                s = path_join("/dev/", value);
         if (!s)
                 return -ENOMEM;