From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 5 Apr 2015 14:07:28 +0000 (+0000)
Subject: action_if_pattern_matches(): Always count matching rows.
X-Git-Tag: v0.5.5~22
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=3d986bb96e80823bccb013b6d72abe22c4911d51;hp=95fa2283a02218120c784834cca98dc9fb1982b9;p=paraslash.git

action_if_pattern_matches(): Always count matching rows.

We missed to do this if PM_NO_PATTERN_MATCHES_EVERYTHING is set.
---

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);