dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-24 16:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: prefer non-@ syntax for ExecStart=

Browse Source 
If the zeroth and first argv[] element on the same we don't need to
generate the "@" syntax for ExecStart= and friends.
This commit is contained in:
Lennart Poettering
2019-11-27 12:05:57 +01:00
parent f14bf01312
commit 540ac9338e
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/dbus-execute.c
View File

@@ -1098,22 +1098,28 @@ int bus_set_transient_exec_command(
fprintf(f, "%s=\n", name);
LIST_FOREACH(command, c, *exec_command) {
_cleanup_free_ char *a = NULL, *t = NULL, *exec_chars = NULL;
const char *p;
_cleanup_free_ char *a = NULL, *exec_chars = NULL;
p = unit_escape_setting(c->path, UNIT_ESCAPE_C|UNIT_ESCAPE_SPECIFIERS, &t);
if (!p)
exec_chars = exec_command_flags_to_exec_chars(c->flags);
if (!exec_chars)
return -ENOMEM;
a = unit_concat_strv(c->argv, UNIT_ESCAPE_C|UNIT_ESCAPE_SPECIFIERS);
if (!a)
return -ENOMEM;
exec_chars = exec_command_flags_to_exec_chars(c->flags);
if (!exec_chars)
return -ENOMEM;
if (streq_ptr(c->path, c->argv ? c->argv[0] : NULL))
fprintf(f, "%s=%s%s\n", name, exec_chars, a);
else {
_cleanup_free_ char *t = NULL;
const char *p;
fprintf(f, "%s=%s@%s %s\n", name, exec_chars, p, a);
p = unit_escape_setting(c->path, UNIT_ESCAPE_C|UNIT_ESCAPE_SPECIFIERS, &t);
if (!p)
return -ENOMEM;
fprintf(f, "%s=%s@%s %s\n", name, exec_chars, p, a);
}
}
r = fflush_and_check(f);