projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5a1c99
)
load-fragment: use path_join() where appropriate
author
Lennart Poettering
<lennart@poettering.net>
Tue, 20 Aug 2019 15:32:34 +0000
(17:32 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 20 Aug 2019 15:32:34 +0000
(17:32 +0200)
src/core/load-fragment.c
patch
|
blob
|
history
diff --git
a/src/core/load-fragment.c
b/src/core/load-fragment.c
index
20079e1
..
c7827df
100644
(file)
--- 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 =
str
join("/dev/", value);
+ s =
path_
join("/dev/", value);
if (!s)
return -ENOMEM;