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

core: lift restriction on order of - and @ in ExecStart

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-11-15 15:25:05 +01:00
parent 7e1a84f552
commit 0f67f1efae
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.service.xml
View File

@ -326,9 +326,8 @@
abnormal exit due to signal) is ignored
and considered success. If both
<literal>-</literal> and
<literal>@</literal> are used for the
same command the former must precede
the latter. Unless
<literal>@</literal> are used they
can appear in either order. Unless
<varname>Type=forking</varname> is
set, the process started via this
command line will be considered the

20
src/core/load-fragment.c
View File

@ -438,6 +438,7 @@ int config_parse_exec(
e += ltype;
for (;;) {
int i;
char *w;
size_t l;
char *state;
@ -452,18 +453,21 @@ int config_parse_exec(
if (rvalue[0] == 0)
break;
if (rvalue[0] == '-') {
ignore = true;
rvalue ++;
}
for (i = 0; i < 2; i++) {
if (rvalue[0] == '-' && !ignore) {
ignore = true;
rvalue ++;
}
if (rvalue[0] == '@') {
honour_argv0 = true;
rvalue ++;
if (rvalue[0] == '@' && !honour_argv0) {
honour_argv0 = true;
rvalue ++;
}
}
if (*rvalue != '/') {
log_error("[%s:%u] Invalid executable path in command line, ignoring: %s", filename, line, rvalue);
log_error("[%s:%u] Executable path is not absolute, ignoring: %s",
filename, line, rvalue);
return 0;
}

23
src/test/test-unit-file.c
View File

@ -111,6 +111,29 @@ static void test_config_parse_exec(void) {
check_execcommand(c1,
"/RValue/slashes3", "argv0a", "r1", true);
/* ignore && honour_argv0 */
r = config_parse_exec("fake", 4, "section",
"LValue", 0, "@-/RValue///slashes4/// argv0b r1",
&c, NULL);
assert_se(r >= 0);
c1 = c1->command_next;
check_execcommand(c1,
"/RValue/slashes4", "argv0b", "r1", true);
/* ignore && ignore */
r = config_parse_exec("fake", 4, "section",
"LValue", 0, "--/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* ignore && ignore */
r = config_parse_exec("fake", 4, "section",
"LValue", 0, "-@-/RValue argv0 r1",
&c, NULL);
assert_se(r == 0);
assert_se(c1->command_next == NULL);
/* semicolon */
r = config_parse_exec("fake", 5, "section",
"LValue", 0,