Add extended wildcard matching

[repo_shell.git] / git_acl.c

diff --git a/git_acl.c b/git_acl.c
index ea171feedf2ba521cf9cf9995961e3b4769cacdf..4bb75ee46fe715788da76b44ae6415db956ffbf7 100644 (file)
--- a/git_acl.c
+++ b/git_acl.c
@@ -28,10 +28,9 @@
 #include "utility.h"
 #include "mystrtok.h"
 #include "stra.h"
+#include "match.h"
 #include "git_acl.h"
 
-#define ANYID   "*"
-
 enum {
   DFLT_IDS_SZ = 32
 };
@@ -123,7 +122,7 @@ static bool str_has_word(const char* string, const char* word)
   char *p = my_strtok(&s, " \t\n");
 
   while (p) {
-    if (!strcmp(p, word) || !strcmp(p, ANYID)) {
+    if (match(p, word)) {
       free(_s);
       return true;
     }
@@ -161,8 +160,8 @@ static int acl_handler(void* user, const char* section, const char* name,
     if (!repo || my_strtok(&p, " \t\n"))
       die("acl_handler: badly formatted section '%s'", section);
     /* repo is repo name, name is userid, value is permission */
-    if ((!strcmp(repo, ANYID) || stra_find(&acl->repoids, repo) >= 0) &&
-        (!strcmp(name, ANYID) || stra_find(&acl->userids, name) >= 0)) {
+    if (stra_match(&acl->repoids, repo) >= 0 &&
+        stra_match(&acl->userids, name) >= 0) {
       acl->perms = perms_from_str(value);
       set_lm_repoid(repo);
       set_lm_userid(name);