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

core: extract exec_context_apply_environment() helper

Browse Source 
Extract a small helper exec_context_apply_environment() from the
dbus-execute.c file so that it can be re-used in the coming varlink
version.
This commit is contained in:
Michael Vogt
2026-05-13 19:28:35 +02:00
parent a2aa3a7450
commit ed6b2b9c30
3 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-execute.c
+5 -23
View File
@@ -3456,32 +3456,14 @@ int bus_exec_context_set_transient_property(
if (r < 0)
return r;
if (strv_length(l) > ENVIRONMENT_ASSIGNMENTS_MAX)
r = exec_context_apply_environment(u, c, l, flags);
if (r == -E2BIG)
return sd_bus_error_set(reterr_error, SD_BUS_ERROR_LIMITS_EXCEEDED,
"Too many environment assignments.");
if (!strv_env_is_valid(l))
if (r == -EINVAL)
return sd_bus_error_set(reterr_error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment block.");
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
if (strv_isempty(l)) {
c->environment = strv_free(c->environment);
unit_write_setting(u, flags, name, "Environment=");
} else {
_cleanup_free_ char *joined = NULL;
char **e;
joined = unit_concat_strv(l, UNIT_ESCAPE_SPECIFIERS|UNIT_ESCAPE_C);
if (!joined)
return -ENOMEM;
e = strv_env_merge(c->environment, l);
if (!e)
return -ENOMEM;
strv_free_and_replace(c->environment, e);
unit_write_settingf(u, flags, name, "Environment=%s", joined);
}
}
if (r < 0)
return r;
return 1;