From: Alison Chaiken <alison_chaiken@mentor.com>
Date: Sun, 30 Nov 2014 11:14:48 +0000 (+0100)
Subject: delta: Fix broken separator support
X-Git-Tag: v218~187
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d0a2e1c364320b862a6aae099afa106ea59bb84c;p=elogind.git

delta: Fix broken separator support

systemd-delta man page promises that multiple types of deltas will be
concatenated if they are listed with a comma as separator.  Replace
FOREACH_WORD() with FOREACH_WORD_SEPARATOR() to restore the functionality.
---

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 99305716e..a3a121fb0 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -484,7 +484,7 @@ static int parse_flags(const char *flag_str, int flags) {
         const char *word, *state;
         size_t l;
 
-        FOREACH_WORD(word, l, flag_str, state) {
+        FOREACH_WORD_SEPARATOR(word, l, flag_str, ",", state) {
                 if (strneq("masked", word, l))
                         flags |= SHOW_MASKED;
                 else if (strneq ("equivalent", word, l))