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

Merge pull request #12870 from yuwata/tree-wide-further-path-join-cleanups

Browse Source 
tree-wide: further path_join() and path_joina() cleanups
This commit is contained in:
Lennart Poettering
2019-06-25 09:27:01 +02:00
committed by GitHub
parent 01a619a6ac 270384b2d4
commit 05b2ace147
20 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/generator.c
+4 -4
View File
@@ -31,7 +31,7 @@ int generator_open_unit_file(
FILE *f;
int r;
unit = strjoina(dest, "/", name);
unit = prefix_roota(dest, name);
r = fopen_unlocked(unit, "wxe", &f);
if (r < 0) {
@@ -319,7 +319,7 @@ int generator_hook_up_mkswap(
return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m",
node);
unit_file = strjoina(dir, "/", unit);
unit_file = prefix_roota(dir, unit);
log_debug("Creating %s", unit_file);
escaped = cescape(node);
@@ -394,7 +394,7 @@ int generator_hook_up_mkfs(
return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m",
node);
unit_file = strjoina(dir, "/", unit);
unit_file = prefix_roota(dir, unit);
log_debug("Creating %s", unit_file);
escaped = cescape(node);
@@ -466,7 +466,7 @@ int generator_hook_up_growfs(
return log_error_errno(r, "Failed to make unit name from path \"%s\": %m",
where);
unit_file = strjoina(dir, "/", unit);
unit_file = prefix_roota(dir, unit);
log_debug("Creating %s", unit_file);
f = fopen(unit_file, "wxe");