diff options
| author | Daniel Mack <github@zonque.org> | 2015-08-07 07:32:19 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-08-07 07:32:19 +0200 |
| commit | 28ba1d6723a5cd2ca6340f9bae3c2517a4439ff2 (patch) | |
| tree | 39947a8f26580997d6c022b5929042884efe7be6 | |
| parent | b32545ff19364fe75240dc99bcc0ec6861d1bc61 (diff) | |
| parent | 388a91b06473b13a59ba217d23b26ca3dc0f2555 (diff) | |
Merge pull request #904 from keszybz/load-fragment-fix
Load fragment fix
| -rw-r--r-- | man/systemd.service.xml | 7 | ||||
| -rw-r--r-- | src/core/load-fragment.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 4368ca8a19..7e96989583 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -922,7 +922,10 @@ the arguments. Double quotes ("...") and single quotes ('...') may be used, in which case everything until the next matching quote becomes part of the same argument. C-style escapes are also - supported, see table below. Quotes themselves are removed after + supported. The table below contains the list of allowed escape + patterns. Only patterns which match the syntax in the table are + allowed; others will result in an error, and must be escaped by + doubling the backslash. Quotes themselves are removed after parsing and escape sequences substituted. In addition, a trailing backslash (<literal>\</literal>) may be used to merge lines. </para> @@ -939,7 +942,7 @@ <literal>&</literal>, and <emphasis>other elements of shell syntax are not supported</emphasis>.</para> - <para>The command to execute must an absolute path name. It may + <para>The command to execute must be an absolute path name. It may contain spaces, but control characters are not allowed.</para> <para>The command line accepts <literal>%</literal> specifiers as diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index ba73cc410e..299172123e 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1986,7 +1986,7 @@ int config_parse_environ(const char *unit, return log_oom(); FOREACH_WORD_QUOTED(word, l, k, state) { - _cleanup_free_ char *n; + _cleanup_free_ char *n = NULL; char **x; r = cunescape_length(word, l, 0, &n); |