chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix %h, %s, %p handling in templates in user session
[elogind.git]
/
src
/
core
/
load-dropin.c
diff --git
a/src/core/load-dropin.c
b/src/core/load-dropin.c
index 4323147a01ce62517de1018ee22b5195894c2272..86f81c7484ea6674c4661f2252130800fe5c0d26 100644
(file)
--- a/
src/core/load-dropin.c
+++ b/
src/core/load-dropin.c
@@
-51,7
+51,7
@@
static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
if (ignore_file(de->d_name))
continue;
if (ignore_file(de->d_name))
continue;
- f = join(path, "/", de->d_name, NULL);
+ f =
str
join(path, "/", de->d_name, NULL);
if (!f) {
r = -ENOMEM;
goto finish;
if (!f) {
r = -ENOMEM;
goto finish;
@@
-80,7
+80,7
@@
static int process_dir(Unit *u, const char *unit_path, const char *name, const c
assert(name);
assert(suffix);
assert(name);
assert(suffix);
- path = join(unit_path, "/", name, suffix, NULL);
+ path =
str
join(unit_path, "/", name, suffix, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-102,7
+102,7
@@
static int process_dir(Unit *u, const char *unit_path, const char *name, const c
if (!template)
return -ENOMEM;
if (!template)
return -ENOMEM;
- path = join(unit_path, "/", template, suffix, NULL);
+ path =
str
join(unit_path, "/", template, suffix, NULL);
free(template);
if (!path)
free(template);
if (!path)