chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: simplify proc_cmdline() to reuse get_process_cmdline()
[elogind.git]
/
src
/
shared
/
path-lookup.c
diff --git
a/src/shared/path-lookup.c
b/src/shared/path-lookup.c
index d7ed6e9e3c2cdaeadd407ab679090dc95a53ab60..8f75a8e83290db85540d544d82af45c4343e2852 100644
(file)
--- a/
src/shared/path-lookup.c
+++ b/
src/shared/path-lookup.c
@@
-162,18
+162,18
@@
static char** user_dirs(
if (strv_extend(&r, config_home) < 0)
goto fail;
if (strv_extend(&r, config_home) < 0)
goto fail;
- if (
runtime_dir
)
- if (strv_extend
(&r, runtime_dir
) < 0)
+ if (
!strv_isempty(config_dirs)
)
+ if (strv_extend
_strv_concat(&r, config_dirs, "/systemd/user"
) < 0)
goto fail;
goto fail;
- if (strv_extend
(&r, runtime_unit_path
) < 0)
+ if (strv_extend
_strv(&r, (char**) config_unit_paths
) < 0)
goto fail;
goto fail;
- if (
!strv_isempty(config_dirs)
)
- if (strv_extend
_strv_concat(&r, config_dirs, "/systemd/user"
) < 0)
+ if (
runtime_dir
)
+ if (strv_extend
(&r, runtime_dir
) < 0)
goto fail;
goto fail;
- if (strv_extend
_strv(&r, (char**) config_unit_paths
) < 0)
+ if (strv_extend
(&r, runtime_unit_path
) < 0)
goto fail;
if (generator)
goto fail;
if (generator)