From 7e1a84f55244ca78093b1dabc58683bc0e7f4304 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Sat, 3 Nov 2012 21:52:02 +0200 Subject: core: interpret \; token in ExecStart as escaped ; Some commands (like 'find') take a semicolon as separate arg. With current parser implementation there is no way to pass one. Patch adds token \; --- src/core/load-fragment.c | 2 ++ src/test/test-unit-file.c | 10 ++++++++++ 2 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 5803044178..4dc5c529a2 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -483,6 +483,8 @@ int config_parse_exec( FOREACH_WORD_QUOTED(w, l, rvalue, state) { if (strncmp(w, ";", MAX(l, 1U)) == 0) break; + else if (strncmp(w, "\\;", MAX(l, 1U)) == 0) + w ++; if (honour_argv0 && w == rvalue) { assert(!path); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index bb5cbdf9d7..bca8a69b78 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -138,6 +138,16 @@ static void test_config_parse_exec(void) { assert_se(c1->command_next == NULL); + /* escaped semicolon */ + r = config_parse_exec("fake", 5, "section", + "LValue", 0, + "/usr/bin/find \\;", + &c, NULL); + assert_se(r >= 0); + c1 = c1->command_next; + check_execcommand(c1, + "/usr/bin/find", "/usr/bin/find", ";", false); + exec_command_free_list(c); } -- cgit v1.2.3-54-g00ecf