SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11002 from keszybz/path_join-merging

Browse Source 
Path join merging
This commit is contained in:
Lennart Poettering
2018-12-01 00:44:58 +01:00
committed by GitHub
parent f8ee4eaa48 652ef29887
commit ac20048fc0
21 changed files with 90 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/install.c
+2 -2
View File
@@ -1464,7 +1464,7 @@ static int unit_file_search(
STRV_FOREACH(p, paths->search_path) {
char *path;
path = path_join(NULL, *p, dropin_dir_name);
path = path_join(*p, dropin_dir_name);
if (!path)
return -ENOMEM;
@@ -1478,7 +1478,7 @@ static int unit_file_search(
STRV_FOREACH(p, paths->search_path) {
char *path;
path = path_join(NULL, *p, dropin_template_dir_name);
path = path_join(*p, dropin_template_dir_name);
if (!path)
return -ENOMEM;
src/shared/tests.c
+1 -1
View File
@@ -46,7 +46,7 @@ static void load_testdata_env(void) {
assert_se(readlink_and_make_absolute("/proc/self/exe", &s) >= 0);
dirname(s);
envpath = path_join(NULL, s, "systemd-runtest.env");
envpath = path_join(s, "systemd-runtest.env");
if (load_env_file_pairs(NULL, envpath, &pairs) < 0)
return;