diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 18:07:03 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 18:15:57 +0100 |
| commit | 2567f558da3eb9911678227d4aeb15162e707d89 (patch) | |
| tree | 13c80b0e091c8ba585b14b966cda998f95f1936d /shared/systemd/src/basic/env-util.c | |
| parent | 02d99ffd62ede29cffcb45fcbe33d044b7406d3a (diff) | |
| parent | f54032b30e1ddd84f10a339e0caf493772e049a7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'shared/systemd/src/basic/env-util.c')
| -rw-r--r-- | shared/systemd/src/basic/env-util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/shared/systemd/src/basic/env-util.c b/shared/systemd/src/basic/env-util.c index d16890d9..11f4b29b 100644 --- a/shared/systemd/src/basic/env-util.c +++ b/shared/systemd/src/basic/env-util.c @@ -690,7 +690,7 @@ char **replace_env_argv(char **argv, char **env) { if (e) { int r; - r = strv_split_extract(&m, e, WHITESPACE, EXTRACT_RELAX|EXTRACT_UNQUOTE); + r = strv_split_full(&m, e, WHITESPACE, EXTRACT_RELAX|EXTRACT_UNQUOTE); if (r < 0) { ret[k] = NULL; strv_free(ret); @@ -744,7 +744,6 @@ int getenv_bool(const char *p) { return parse_boolean(e); } -#if 0 /* NM_IGNORED */ int getenv_bool_secure(const char *p) { const char *e; @@ -754,4 +753,3 @@ int getenv_bool_secure(const char *p) { return parse_boolean(e); } -#endif /* NM_IGNORED */ |