picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #904 from keszybz/load-fragment-fix

Browse source 
Load fragment fix
This commit is contained in:
Daniel Mack 2015-08-07 07:32:19 +02:00
parent b32545ff19 388a91b064
commit 28ba1d6723
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
man/systemd.service.xml
View file

@ -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>&amp;</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

2
src/core/load-fragment.c
View file

@ -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);