diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-04-16 01:36:51 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-16 01:36:51 +0900 |
commit | 7be87278a36710e634096277752c6c8f3ddf96a0 (patch) | |
tree | 4ec0eeed21a5944476007ca4584b5bc49bee384a /src/tmpfiles | |
parent | 6e961aeb262521742a4cd92e4620de193f159f7c (diff) | |
parent | a6aafd6ab6211a4142ebd72bd8c42ddbe2841eaa (diff) | |
download | systemd-7be87278a36710e634096277752c6c8f3ddf96a0.tar.gz |
Merge pull request #23021 from fbuihuu/tmpfiles-fix-precedence-with-plus-sign
Tmpfiles fix precedence with plus sign
Diffstat (limited to 'src/tmpfiles')
-rw-r--r-- | src/tmpfiles/tmpfiles.c | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 0842d67d85..94973c2aa5 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -2657,7 +2657,7 @@ static int item_compare(const Item *a, const Item *b) { return CMP(a->type, b->type); } -static bool item_compatible(Item *a, Item *b) { +static bool item_compatible(const Item *a, const Item *b) { assert(a); assert(b); assert(streq(a->path, b->path)); @@ -2896,6 +2896,26 @@ static int parse_age_by_from_arg(const char *age_by_str, Item *item) { return 0; } +static bool is_duplicated_item(ItemArray *existing, const Item *i) { + + assert(existing); + assert(i); + + for (size_t n = 0; n < existing->n_items; n++) { + const Item *e = existing->items + n; + + if (item_compatible(e, i)) + continue; + + /* Only multiple 'w+' lines for the same path are allowed. */ + if (e->type != WRITE_FILE || !e->append_or_force || + i->type != WRITE_FILE || !i->append_or_force) + return true; + } + + return false; +} + static int parse_line( const char *fname, unsigned line, @@ -3247,13 +3267,10 @@ static int parse_line( existing = ordered_hashmap_get(h, i.path); if (existing) { - size_t n; - - for (n = 0; n < existing->n_items; n++) { - if (!item_compatible(existing->items + n, &i) && !i.append_or_force) { - log_syntax(NULL, LOG_NOTICE, fname, line, 0, "Duplicate line for path \"%s\", ignoring.", i.path); - return 0; - } + if (is_duplicated_item(existing, &i)) { + log_syntax(NULL, LOG_NOTICE, fname, line, 0, + "Duplicate line for path \"%s\", ignoring.", i.path); + return 0; } } else { existing = new0(ItemArray, 1); |