Merge pull request #14562 from yuwata/table-strv

[thirdparty/systemd.git] / src / basic / strv.c

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 5588cd7c413fbb7969ffa2d6c55f4810f6e344db..74d20a9a95a6b5477bb2097f1dd764e0006814f9 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -807,12 +807,13 @@ char **strv_shell_escape(char **l, const char *bad) {
         return l;
 }
 
-bool strv_fnmatch(char* const* patterns, const char *s, int flags) {
-        char* const* p;
-
-        STRV_FOREACH(p, patterns)
-                if (fnmatch(*p, s, flags) == 0)
+bool strv_fnmatch_full(char* const* patterns, const char *s, int flags, size_t *matched_pos) {
+        for (size_t i = 0; patterns && patterns[i]; i++)
+                if (fnmatch(patterns[i], s, flags) == 0) {
+                        if (matched_pos)
+                                *matched_pos = i;
                         return true;
+                }
 
         return false;
 }