diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-25 14:22:43 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-25 14:22:43 +0100 |
| commit | 7c8871d31510865e40c8628ef765996202a3cc00 (patch) | |
| tree | 622b7aa085999fe3d2908772ff0d0c6ec5bf4400 /src/core/load-fragment.c | |
| parent | 7c257428969aaba2acc4e26753c86d6f4774354a (diff) | |
| parent | f00022dd121c73b543ae667ddce9814bd67a1b73 (diff) | |
Merge pull request #1654 from poettering/util-lib
Various changes to src/basic/
Diffstat (limited to 'src/core/load-fragment.c')
| -rw-r--r-- | src/core/load-fragment.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index a361de2a4a..31fdc48823 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -42,7 +42,10 @@ #include "cpu-set-util.h" #include "env-util.h" #include "errno-list.h" +#include "escape.h" +#include "fd-util.h" #include "ioprio.h" +#include "load-fragment.h" #include "log.h" #include "missing.h" #include "path-util.h" @@ -51,12 +54,12 @@ #endif #include "securebits.h" #include "signal-util.h" +#include "string-util.h" #include "strv.h" #include "unit-name.h" #include "unit-printf.h" #include "unit.h" #include "utf8.h" -#include "load-fragment.h" int config_parse_warn_compat( const char *unit, @@ -522,9 +525,7 @@ int config_parse_exec( assert(e); e += ltype; - rvalue += strspn(rvalue, WHITESPACE); - p = rvalue; if (isempty(rvalue)) { /* An empty assignment resets the list */ @@ -532,14 +533,15 @@ int config_parse_exec( return 0; } + p = rvalue; do { - int i; + _cleanup_free_ char *path = NULL, *firstword = NULL; + bool separate_argv0 = false, ignore = false; + _cleanup_free_ ExecCommand *nce = NULL; _cleanup_strv_free_ char **n = NULL; size_t nlen = 0, nbufsize = 0; - _cleanup_free_ ExecCommand *nce = NULL; - _cleanup_free_ char *path = NULL, *firstword = NULL; char *f; - bool separate_argv0 = false, ignore = false; + int i; semicolon = false; |