execute: use path_join() where appropriate
This commit is contained in:
parent
30ff18d8a2
commit
edbfeb1204
|
@ -2074,7 +2074,7 @@ static int setup_exec_directory(
|
||||||
STRV_FOREACH(rt, context->directories[type].paths) {
|
STRV_FOREACH(rt, context->directories[type].paths) {
|
||||||
_cleanup_free_ char *p = NULL, *pp = NULL;
|
_cleanup_free_ char *p = NULL, *pp = NULL;
|
||||||
|
|
||||||
p = strjoin(params->prefix[type], "/", *rt);
|
p = path_join(params->prefix[type], *rt);
|
||||||
if (!p) {
|
if (!p) {
|
||||||
r = -ENOMEM;
|
r = -ENOMEM;
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -2110,7 +2110,7 @@ static int setup_exec_directory(
|
||||||
* Also, note that we don't do this for EXEC_DIRECTORY_RUNTIME as that's often used for sharing
|
* Also, note that we don't do this for EXEC_DIRECTORY_RUNTIME as that's often used for sharing
|
||||||
* files or sockets with other services. */
|
* files or sockets with other services. */
|
||||||
|
|
||||||
private_root = strjoin(params->prefix[type], "/private");
|
private_root = path_join(params->prefix[type], "private");
|
||||||
if (!private_root) {
|
if (!private_root) {
|
||||||
r = -ENOMEM;
|
r = -ENOMEM;
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -2121,7 +2121,7 @@ static int setup_exec_directory(
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
pp = strjoin(private_root, "/", *rt);
|
pp = path_join(private_root, *rt);
|
||||||
if (!pp) {
|
if (!pp) {
|
||||||
r = -ENOMEM;
|
r = -ENOMEM;
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
Loading…
Reference in a new issue