systemd: merge branch systemd into master

2019-07-26 14:47:35 +02:00
parent ad50a445ce 6a325673cf
commit f6d7af9ca6
58 changed files with 491 additions and 197 deletions
--- a/shared/systemd/src/basic/extract-word.c
+++ b/shared/systemd/src/basic/extract-word.c
@@ -30,6 +30,8 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra

        assert(p);
        assert(ret);
+        /* Those two don't make sense together. */
+        assert(!FLAGS_SET(flags, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE));

        /* Bail early if called after last value or with no input */
        if (!*p)