From 3d986bb96e80823bccb013b6d72abe22c4911d51 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 5 Apr 2015 14:07:28 +0000 Subject: [PATCH] action_if_pattern_matches(): Always count matching rows. We missed to do this if PM_NO_PATTERN_MATCHES_EVERYTHING is set. --- afs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/afs.c b/afs.c index ea0a9f9f..299d65eb 100644 --- a/afs.c +++ b/afs.c @@ -365,8 +365,11 @@ static int action_if_pattern_matches(struct osl_row *row, void *data) name = (char *)name_obj.data; if ((!name || !*name) && (pmd->pm_flags & PM_SKIP_EMPTY_NAME)) return 1; - if (!pmd->patterns.size && (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING)) + if (pmd->patterns.size == 0 && + (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING)) { + pmd->num_matches++; return pmd->action(pmd->table, row, name, pmd->data); + } for (p = pattern_txt; p < pattern_txt + pmd->patterns.size; p += strlen(p) + 1) { ret = fnmatch(p, name, pmd->fnmatch_flags); -- 2.39.2