X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Frx.c;h=0edce593907000c360bea7f048adc1350d3fea7f;hp=f2b672070143adac3b230a6b4da101b3da5f1507;hb=4dbc0e4a9d573611d4f521400a2e16f47c176639;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/lib-lib/rx.c b/lib-lib/rx.c
index f2b6720..0edce59 100644
--- a/lib-lib/rx.c
+++ b/lib-lib/rx.c
@@ -22,11 +22,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <lib-lib/lib-lib.h>
+#include "lib-lib.h"
 
 rx_t *rx_compile(const char *s, int flags)
 {
@@ -42,42 +38,103 @@ rx_t *rx_compile(const char *s, int flags)
     return pp;
 }
 
+void rx_set_template(rx_t *rx, const char *tpl)
+{
+    const char *p = tpl;
+
+    m_strreplace(&rx->template, 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++;
+        }
+    }
+
+    rx->nmatch++;     /* match 0 is always the whole expr */
+}
+
 void rx_delete(rx_t **p)
 {
     p_delete(&(*p)->pattern);
     regfree((*p)->rx);
     p_delete(&(*p)->rx);
+    p_delete(&(*p)->template);
     p_delete(p);
 }
 
-int rx_list_match(list2_t *l, const char *pat)
+int rx_list_match(rx_t *l, const char *s)
 {
-    int i;
-
-    if (!pat || !*pat || list_empty(l))
+    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 (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->template, *q;
 
-    if (!pat || !*pat || list_empty(l))
-        return -1;
+            for (q = strchr(p, '%'); q; q = strchr(p + 1, '%')) {
+                int n;
+
+                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 0;
+}
+
+rx_t **rx_lookup(rx_t **l, const char *pat)
+{
+    if (m_strisempty(pat))
+        return NULL;
 
-    for (i = 0; i < l->length; i++) {
-        if (!strcmp(((rx_t*)l->data[i])->pattern, pat))
-            return i;
+    while (*l) {
+        if (!m_strcmp((*l)->pattern, pat))
+            return l;
+        l = &(*l)->next;
     }
 
-    return -1;
+    return NULL;
 }
 
 int rx_sanitize_string(char *dst, ssize_t n, const char *src)