wildcard_cmp: Allow case-insensitive searches

The new search feature will require them.

3 files changed, 29 insertions, 14 deletions

diff --git a/handler.c b/handler.c
index 9103db0..1d7e922 100644
--- a/handler.c
+++ b/handler.c
@@ -58,7 +58,7 @@ static int on_payload(const struct http_payload *const p,
     {
         const struct elem *const e = &h->elem[i];
 
-        if (e->op == p->op && !wildcard_cmp(p->resource, e->url))
+        if (e->op == p->op && !wildcard_cmp(p->resource, e->url, true))
             return e->f(p, r, e->user);
     }
 
diff --git a/wildcard_cmp.c b/wildcard_cmp.c
index 8f7c7c1..c4743d3 100644
--- a/wildcard_cmp.c
+++ b/wildcard_cmp.c
@@ -1,20 +1,28 @@
 #include "wildcard_cmp.h"
+#include <stdbool.h>
+#include <stddef.h>
 #include <string.h>
+#include <strings.h>
 
-static int wildcard_cmp(const char *s, const char *p)
+int wildcard_cmp(const char *s, const char *p, const bool casecmp)
 {
+    int (*const cmp)(const char *, const char *) =
+        casecmp ? strcmp : strcasecmp;
+    int (*const ncmp)(const char *, const char *, size_t) =
+        casecmp ? strncmp : strncasecmp;
+
     while (*p && *s)
     {
         const char *const wc = strchr(p, '*');
 
         if (!wc)
-            return strcmp(s, p);
+            return cmp(s, p);
 
         const size_t n = wc - p;
 
         if (n)
         {
-            const int r = strncmp(s, p, n);
+            const int r = ncmp(s, p, n);
 
             if (r)
                 return r;
@@ -22,17 +30,22 @@ static int wildcard_cmp(const char *s, const char *p)
             p += n;
             s += n;
         }
-        else if (*(wc + 1) == *s)
-        {
-            p = wc + 1;
-            s += n;
-        }
-        else if (*(wc + 1) == '*')
-            p++;
         else
         {
-            s++;
-            p += n;
+            const char next = *(wc + 1), wca[2] = {next}, sa[sizeof wca] = {*s};
+
+            if (!cmp(wca, sa))
+            {
+                p = wc + 1;
+                s += n;
+            }
+            else if (next == '*')
+                p++;
+            else
+            {
+                s++;
+                p += n;
+            }
         }
     }
 
diff --git a/wildcard_cmp.h b/wildcard_cmp.h
index 9024dbc..fa09913 100644
--- a/wildcard_cmp.h
+++ b/wildcard_cmp.h
@@ -1,6 +1,8 @@
 #ifndef WILDCARD_CMP_H
 #define WILDCARD_CMP_H
 
-int wildcard_cmp(const char *s, const char *p);
+#include <stdbool.h>
+
+int wildcard_cmp(const char *s, const char *p, bool casecmp);
 
 #endif /* WILDCARD_CMP_H */