shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

core/unit: rename UNIT_ESCAPE_EXEC_SYNTAX → *_ENV

Browse Source 
In preparation for future changes.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-04-03 14:50:12 +02:00
parent e7416db183
commit f3af629050
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1606,7 +1606,7 @@ int bus_set_transient_exec_command(
if (!exec_chars)
return -ENOMEM;
a = unit_concat_strv(c->argv, UNIT_ESCAPE_SPECIFIERS|UNIT_ESCAPE_EXEC_SYNTAX);
a = unit_concat_strv(c->argv, UNIT_ESCAPE_SPECIFIERS|UNIT_ESCAPE_EXEC_SYNTAX_ENV);
if (!a)
return -ENOMEM;
@ -1617,7 +1617,7 @@ int bus_set_transient_exec_command(
const char *p;
p = unit_escape_setting(c->path,
UNIT_ESCAPE_SPECIFIERS|UNIT_ESCAPE_EXEC_SYNTAX, &t);
UNIT_ESCAPE_SPECIFIERS|UNIT_ESCAPE_EXEC_SYNTAX_ENV, &t);
if (!p)
return -ENOMEM;

4
src/core/unit.c
View File

@ -4312,7 +4312,7 @@ static const char* unit_drop_in_dir(Unit *u, UnitWriteFlags flags) {
const char* unit_escape_setting(const char *s, UnitWriteFlags flags, char **buf) {
assert(s);
assert(!FLAGS_SET(flags, UNIT_ESCAPE_EXEC_SYNTAX | UNIT_ESCAPE_C));
assert(!FLAGS_SET(flags, UNIT_ESCAPE_EXEC_SYNTAX_ENV | UNIT_ESCAPE_C));
assert(buf);
_cleanup_free_ char *t = NULL;
@ -4334,7 +4334,7 @@ const char* unit_escape_setting(const char *s, UnitWriteFlags flags, char **buf)
/* We either do C-escaping or shell-escaping, to additionally escape characters that we parse for
* ExecStart= and friends, i.e. '$' and quotes. */
if (flags & UNIT_ESCAPE_EXEC_SYNTAX) {
if (flags & UNIT_ESCAPE_EXEC_SYNTAX_ENV) {
char *t2;
t2 = strreplace(s, "$", "$$");

16
src/core/unit.h
View File

@ -528,22 +528,22 @@ typedef struct UnitStatusMessageFormats {
/* Flags used when writing drop-in files or transient unit files */
typedef enum UnitWriteFlags {
/* Write a runtime unit file or drop-in (i.e. one below /run) */
UNIT_RUNTIME = 1 << 0,
UNIT_RUNTIME = 1 << 0,
/* Write a persistent drop-in (i.e. one below /etc) */
UNIT_PERSISTENT = 1 << 1,
UNIT_PERSISTENT = 1 << 1,
/* Place this item in the per-unit-type private section, instead of [Unit] */
UNIT_PRIVATE = 1 << 2,
UNIT_PRIVATE = 1 << 2,
/* Apply specifier escaping before writing */
UNIT_ESCAPE_SPECIFIERS = 1 << 3,
/* Apply specifier escaping */
UNIT_ESCAPE_SPECIFIERS = 1 << 3,
/* Escape elements of ExecStart= syntax before writing */
UNIT_ESCAPE_EXEC_SYNTAX = 1 << 4,
/* Escape elements of ExecStart= syntax, incl. prevention of variable expansion */
UNIT_ESCAPE_EXEC_SYNTAX_ENV = 1 << 4,
/* Apply C escaping before writing */
UNIT_ESCAPE_C = 1 << 5,
UNIT_ESCAPE_C = 1 << 5,
} UnitWriteFlags;
/* Returns true if neither persistent, nor runtime storage is requested, i.e. this is a check invocation only */

4
src/test/test-core-unit.c
View File

@ -26,7 +26,7 @@ static void test_unit_escape_setting_one(
assert_se(a == NULL);
assert_se(t == s);
assert_se(t = unit_escape_setting(s, UNIT_ESCAPE_EXEC_SYNTAX, &b));
assert_se(t = unit_escape_setting(s, UNIT_ESCAPE_EXEC_SYNTAX_ENV, &b));
assert_se(b_esc = cescape(t));
log_debug("%s: [%s] → [%s]", __func__, s_esc, b_esc);
assert_se(b == NULL || streq(b, t));
@ -71,7 +71,7 @@ static void test_unit_concat_strv_one(
log_debug("%s: [%s] → [%s]", __func__, s_esc, a_esc);
assert_se(streq(a, expected_none));
assert_se(b = unit_concat_strv(s, UNIT_ESCAPE_EXEC_SYNTAX));
assert_se(b = unit_concat_strv(s, UNIT_ESCAPE_EXEC_SYNTAX_ENV));
assert_se(b_esc = cescape(b));
log_debug("%s: [%s] → [%s]", __func__, s_esc, b_esc);
assert_se(streq(b, expected_exec));