X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Frx.c;h=d89d23468f5ed697e779ba30ee6edda329b5bfab;hp=521376fdb20e5e11b788075179c00ff25848ab8b;hb=717c9f150ded0fed572d27f68db07f94a9fe70e8;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/lib-lib/rx.c b/lib-lib/rx.c
index 521376f..d89d234 100644
--- a/lib-lib/rx.c
+++ b/lib-lib/rx.c
@@ -38,42 +38,150 @@ rx_t *rx_compile(const char *s, int flags)
     return pp;
 }
 
-void rx_delete(rx_t **p)
+int rx_validate(const char *s, char *errbuf, ssize_t errlen)
 {
-    p_delete(&(*p)->pattern);
-    regfree((*p)->rx);
-    p_delete(&(*p)->rx);
-    p_delete(p);
+    regex_t re;
+    int res;
+
+    p_clear(&re, 1);
+    res = REGCOMP(&re, NONULL(s), 0);
+    if (res) {
+        regerror(res, &re, errbuf, errlen);
+    }
+    regfree(&re);
+
+    return res;
 }
 
-int rx_list_match(list2_t *l, const char *pat)
+void rx_set_template(rx_t *rx, const char *tpl)
 {
-    int i;
+    const char *p = tpl;
+
+    m_strreplace(&rx->tpl, tpl);
+    rx->nmatch = 0;
+
+    while ((p = strchr(p, '%'))) {
+        if (isdigit(*++p)) {
+            int n = strtol(p, (char **)&p, 10);
+            rx->nmatch = MAX(n, rx->nmatch);
+        } else {
+            if (*p == '%')
+                p++;
+        }
+    }
 
-    if (!pat || !*pat || list_empty(l))
+    rx->nmatch++;     /* match 0 is always the whole expr */
+}
+
+void rx_wipe(rx_t *rx)
+{
+    p_delete(&rx->pattern);
+    regfree(rx->rx);
+    p_delete(&rx->rx);
+    p_delete(&rx->tpl);
+}
+
+int rx_list_match(rx_t *l, const char *s)
+{
+    if (m_strisempty(s))
         return 0;
 
-    for (i = 0; i < l->length; i++) {
-        if (!REGEXEC(((rx_t*)l->data[i])->rx, pat))
+    while (l) {
+        if (!REGEXEC(l->rx, s))
             return 1;
+        l = l->next;
     }
 
     return 0;
 }
 
-int rx_lookup (list2_t *l, const char *pat)
+int rx_list_match2(rx_t *l, const char *s, char *dst, int dlen)
 {
-    int i;
+    static regmatch_t *pmatch = NULL;
+    static int nmatch = 0;
+    int pos = 0;
 
-    if (!pat || !*pat || list_empty(l))
-        return -1;
+    if (m_strisempty(s))
+        return 0;
+
+    for (; l; l = l->next) {
+        if (l->nmatch > nmatch) {
+            p_realloc(&pmatch, l->nmatch);
+            nmatch = l->nmatch;
+        }
+
+        if (regexec(l->rx, s, l->nmatch, pmatch, 0) == 0) {
+            /* Copy template into dst, with substitutions. */
+            const char *p = l->tpl, *q;
+
+            for (q = strchr(p, '%'); q; q = strchr(p + 1, '%')) {
+                int n;
 
-    for (i = 0; i < l->length; i++) {
-        if (!strcmp(((rx_t*)l->data[i])->pattern, pat))
-            return i;
+                pos += m_strncpy(dst + pos, dlen - pos, p, q - p);
+
+                if (!isdigit((unsigned char)q[1])) {
+                    p = q + (q[1] == '%');
+                    continue;
+                }
+
+                n = strtol(q + 1, (char **)&p, 10); /* find pmatch index */
+                pos += m_strncpy(dst + pos, dlen - pos, s + pmatch[n].rm_so,
+                                 pmatch[n].rm_eo - pmatch[n].rm_so);
+            }
+
+            pos += m_strcpy(dst + pos, dlen - pos, p);
+            return 1;
+        }
     }
 
-    return -1;
+    return 0;
+}
+
+rx_t **rx_lookup(rx_t **l, const char *pat)
+{
+    if (m_strisempty(pat))
+        return NULL;
+
+    while (*l) {
+        if (!m_strcmp((*l)->pattern, pat))
+            return l;
+        l = &(*l)->next;
+    }
+
+    return l;
+}
+
+void rx_list_add(rx_t **l, rx_t *rxp)
+{
+    l = rx_lookup(l, rxp->pattern);
+    if (*l) {
+        rx_t *r = rx_list_pop(l);
+        rx_delete(&r);
+    }
+    rx_list_push(l, rxp);
+}
+
+void rx_list_add2(rx_t **l, rx_t **rxp)
+{
+    l = rx_lookup(l, (*rxp)->pattern);
+    if (*l) {
+        rx_t *r = rx_list_pop(l);
+        rx_delete(&r);
+    }
+    if (m_strisempty((*rxp)->tpl)) {
+        rx_delete(rxp);
+    } else {
+        rx_list_push(l, *rxp);
+    }
+}
+
+void rx_list_remove(rx_t **l, const rx_t *r)
+{
+    l = rx_lookup(l, r->pattern);
+    if (*l) {
+        rx_t *tmp = rx_list_pop(l);
+        rx_delete(&tmp);
+    }
 }
 
 int rx_sanitize_string(char *dst, ssize_t n, const char *src)