From 9266f31e61b6b6bda7929911e8e3d2fc87587911 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Jun 2019 16:23:18 +0200 Subject: [PATCH] core: skip whitespace after "|" and "!" in the condition parser We'd skip any whitespace immediately after "=", but then we'd treat whitespace that is between "|" or "!" and the value as significant. This is rather confusing, let's ignore it too. --- src/core/load-fragment.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 8e8f26b6367..d88b9317e91 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2587,13 +2587,13 @@ int config_parse_unit_condition_string( return 0; } - trigger = rvalue[0] == '|'; + trigger = *rvalue == '|'; if (trigger) - rvalue++; + rvalue += 1 + strspn(rvalue + 1, WHITESPACE); - negate = rvalue[0] == '!'; + negate = *rvalue == '!'; if (negate) - rvalue++; + rvalue += 1 + strspn(rvalue + 1, WHITESPACE); r = unit_full_printf(u, rvalue, &s); if (r < 0) { -- 2.47.3