static int found_override(const char *top, const char *bottom) {
_cleanup_free_ char *dest = NULL;
static int found_override(const char *top, const char *bottom) {
_cleanup_free_ char *dest = NULL;
execlp("diff", "diff", "-us", "--", bottom, top, NULL);
execlp("diff", "diff", "-us", "--", bottom, top, NULL);
- r = wait_for_terminate(pid, NULL);
- if (r < 0)
- log_warning("Failed to wait for diff: %s", strerror(-r));
-
+ wait_for_terminate_and_warn("diff", pid, false);
- 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))
if (strneq("masked", word, l))
flags |= SHOW_MASKED;
else if (strneq ("equivalent", word, l))