X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Frx.c;h=58e943c22f75b7b13bc4885f0c1c533e5a37fa26;hp=21cbd332e882fdb4c005f3ebbdad2bc296e9d0a0;hb=2b9f5916b3aebd8d34903d420ce8160121171534;hpb=6c292f6b369f019cc9a72a0ee65d60e172ee3370

diff --git a/lib-lib/rx.c b/lib-lib/rx.c
index 21cbd33..58e943c 100644
--- a/lib-lib/rx.c
+++ b/lib-lib/rx.c
@@ -29,7 +29,8 @@ rx_t *rx_compile(const char *s, int flags)
     rx_t *pp = p_new(rx_t, 1);
 
     pp->pattern = m_strdup(s);
-    pp->rx = p_new(regex_t, 1);
+    pp->rx      = p_new(regex_t, 1);
+    pp->flags   = flags;
 
     if (REGCOMP(pp->rx, NONULL(s), flags) != 0) {
         rx_delete(&pp);
@@ -38,12 +39,37 @@ rx_t *rx_compile(const char *s, int flags)
     return pp;
 }
 
+rx_t *rx_dup(rx_t *r)
+{
+    rx_t *res = rx_compile(r->pattern, r->flags);
+    res->neg  = r->neg;
+    rx_set_template(res, r->tpl);
+    return res;
+}
+
+int rx_validate(const char *s, char *errbuf, ssize_t errlen)
+{
+    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;
+}
+
 void rx_set_template(rx_t *rx, const char *tpl)
 {
     const char *p = tpl;
 
-    m_strreplace(&rx->template, tpl);
+    m_strreplace(&rx->tpl, tpl);
     rx->nmatch = 0;
+    if (m_strisempty(rx->tpl))
+        return;
 
     while ((p = strchr(p, '%'))) {
         if (isdigit(*++p)) {
@@ -58,13 +84,12 @@ void rx_set_template(rx_t *rx, const char *tpl)
     rx->nmatch++;     /* match 0 is always the whole expr */
 }
 
-void rx_delete(rx_t **p)
+void rx_wipe(rx_t *rx)
 {
-    p_delete(&(*p)->pattern);
-    regfree((*p)->rx);
-    p_delete(&(*p)->rx);
-    p_delete(&(*p)->template);
-    p_delete(p);
+    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)
@@ -98,7 +123,7 @@ int rx_list_match2(rx_t *l, const char *s, char *dst, int dlen)
 
         if (regexec(l->rx, s, l->nmatch, pmatch, 0) == 0) {
             /* Copy template into dst, with substitutions. */
-            const char *p = l->template, *q;
+            const char *p = l->tpl, *q;
 
             for (q = strchr(p, '%'); q; q = strchr(p + 1, '%')) {
                 int n;
@@ -125,16 +150,49 @@ int rx_list_match2(rx_t *l, const char *s, char *dst, int dlen)
 
 rx_t **rx_lookup(rx_t **l, const char *pat)
 {
-    if (!pat || !*pat)
+    if (m_strisempty(pat))
         return NULL;
 
     while (*l) {
-        if (!strcmp((*l)->pattern, pat))
+        if (!m_strcmp((*l)->pattern, pat))
             return l;
         l = &(*l)->next;
     }
 
-    return NULL;
+    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)