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

Merge pull request #17188 from keszybz/envvars-posix

Browse Source 
Follow (mostly) POSIX rules for environment variables
This commit is contained in:
Lennart Poettering
2020-10-14 18:32:22 +02:00
committed by GitHub
parent fc8bc57f6b a4ccce22d9
commit b0eb40cda4
4 changed files with 99 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl-set-environment.c
+18 -3
View File
@@ -61,6 +61,12 @@ int show_environment(int argc, char *argv[], void *userdata) {
return 0;
}
static void invalid_callback(const char *p, void *userdata) {
_cleanup_free_ char *t = cescape(p);
log_debug("Ignoring invalid environment assignment \"%s\".", strnull(t));
}
int set_environment(int argc, char *argv[], void *userdata) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
@@ -112,9 +118,18 @@ int import_environment(int argc, char *argv[], void *userdata) {
if (r < 0)
return bus_log_create_error(r);
if (argc < 2)
r = sd_bus_message_append_strv(m, environ);
else {
if (argc < 2) {
_cleanup_strv_free_ char **copy = NULL;
copy = strv_copy(environ);
if (!copy)
return log_oom();
strv_env_clean_with_callback(copy, invalid_callback, NULL);
r = sd_bus_message_append_strv(m, copy);
} else {
char **a, **b;
r = sd_bus_message_open_container(m, 'a', "s");