www-cgi/ucgicommon.c: Split matching out from `filter_environment'.

Makes the code a bit easier to follow, and prepares the ground for the
next change.

diff --git a/www-cgi/ucgicommon.c b/www-cgi/ucgicommon.c
index db8c75d65858932034adae2f5d6ccb0d1f55b8cd..4bba1867d46a794117c94787493da90b19b5dc6b 100644 (file)
--- a/www-cgi/ucgicommon.c
+++ b/www-cgi/ucgicommon.c
@@ -124,6 +124,54 @@ opened:
   return v;
 }
 
+static int envvar_match(unsigned flags, const char *en,
+                       const char *const *patv,
+                       const char **ev)
+{
+  const char *const *patp;
+  const char *q, *pat;
+  int acceptp;
+
+  for (patp= patv; (pat= *patp); patp++) {
+    q= en;
+    acceptp= 1;
+    if (*pat == '!' && (flags & FILTF_WILDCARD)) { acceptp= 0; pat++; }
+
+    for (;;) {
+      if (!*pat) {
+       if (*q != '=') {
+         D( if (debugmode)
+              printf(";;     mismatch `%s' (prefix)\n", *patp); )
+         break;
+       }
+       D( if (debugmode) printf(";;     matched pattern `%s'\n", *patp); )
+       goto match;
+      } else if (*pat == '*' && (flags & FILTF_WILDCARD)) {
+       q = strchr(q, '=');
+       if (!q) {
+         D( if (debugmode)
+              printf(";;     mismatch `%s' (discard: no `=')\n", *patp); )
+         return -1;
+       }
+       D( if (debugmode)
+            printf(";;     wildcard match for `%s'\n", *patp); )
+       goto match;
+      } else {
+       if (*pat++ != *q++) {
+         D( if (debugmode) printf(";;     mismatch `%s'\n", *patp); )
+         break;
+       }
+      }
+    }
+  }
+  return 0;
+
+match:
+  if (!acceptp) return -1;
+  *ev= q + 1;
+  return +1;
+}
+
 void filter_environment(unsigned flags, const char *prefix_in,
                        const char *const *patv,
                        void (*foundone)(const char *fulln,
@@ -132,67 +180,27 @@ void filter_environment(unsigned flags, const char *prefix_in,
                        void *p)
 {
   char *const *ep;
-  const char *const *patp;
-  const char *en, *ev, *pat, *q;
+  const char *en, *ev;
   char enbuf[MAX_ENVVAR_NAME];
   size_t n, pn = strlen(prefix_in);
-  int acceptp;
 
   D( if (debugmode) printf(";; filter_environment...\n"); )
   for (ep= environ; (en= *ep); ep++) {
     D( if (debugmode) printf(";;   consider env-var `%s'\n", en); )
     if (strncmp(en, prefix_in, pn) != 0 || !en[pn]) {
       D( if (debugmode) printf(";;     doesn't match prefix\n"); )
-      goto next_ev;
+      continue;
     }
-    for (patp= patv; (pat= *patp); patp++) {
-      q= en + pn;
-      acceptp= 1;
-      if (*pat == '!' && (flags & FILTF_WILDCARD)) {
-       acceptp= 0; pat++;
-      }
-      for (;;) {
-       if (!*pat) {
-         if (*q != '=') {
-           D( if (debugmode)
-                printf(";;     mismatch `%s' (prefix)\n", *patp); )
-           goto next_pat;
-         }
-         D( if (debugmode) printf(";;     matched `%s'\n", *patp); )
-         ev = q + 1;
-         break;
-       } else if (*pat == '*' && (flags & FILTF_WILDCARD)) {
-         q = strchr(q, '=');
-         if (!q) {
-           D( if (debugmode)
-                printf(";;     mismatch `%s' (discard: no `=')\n", *patp); )
-           goto next_ev;
-         }
-         D( if (debugmode)
-              printf(";;     wildcard match for `%s'\n", *patp); )
-         ev = q + 1;
-         break;
-       } else
-         if (*pat++ != *q++) {
-           D( if (debugmode) printf(";;     mismatch `%s'\n", *patp); )
-           goto next_pat;
-         }
-      }
-      if (acceptp) {
-       n= q - en;
-       if (n >= sizeof(enbuf))
-         error("environment variable name too long");
-       memcpy(enbuf, en, n);
-       enbuf[n]= 0;
-       D( if (debugmode)
-            printf(";;     full = `%s'; tail = `%s'; value = `%s'\n",
-                   enbuf, enbuf + pn, ev); )
-       foundone(enbuf, enbuf + pn, ev, p);
-      } D( else if (debugmode)
-            printf(";;     matched negated pattern\n"); )
-      goto next_ev;
-    next_pat:;
+    if (envvar_match(flags, en + pn, patv, &ev) > 0) {
+      n= strcspn(en, "=");
+      if (n >= sizeof(enbuf))
+       error("environment variable name too long");
+      memcpy(enbuf, en, n);
+      enbuf[n]= 0;
+      D( if (debugmode)
+          printf(";;     full = `%s'; tail = `%s'; value = `%s'\n",
+                 enbuf, enbuf + pn, ev); )
+      foundone(enbuf, enbuf + pn, ev, p);
     }
-  next_ev:;
   }
 }