X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=5bc6d04db9ae2c20f20a82406bf48ebb6ea66a45;hp=c3db611ad1165dd681f8fdd5c4489ddbf90667e5;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=8476307969a605bea67f6b702b0c1e7a52038bed

diff --git a/init.c b/init.c
index c3db611..5bc6d04 100644
--- a/init.c
+++ b/init.c
@@ -637,101 +637,46 @@ add_to_rx_list(rx_t **list, const char *s, int flags, BUFFER *err)
     return 0;
 }
 
-static int add_to_spam_list (SPAM_LIST ** list, const char *pat,
+static int add_to_spam_list(rx_t **list, const char *pat,
                              const char *templ, BUFFER * err)
 {
-  SPAM_LIST *t = NULL, *last = NULL;
-  rx_t* rx;
-  int n;
-  const char *p;
-
-  if (!pat || !*pat || !templ)
-    return 0;
+    rx_t **last, *rx;
 
-  if (!(rx = rx_compile (pat, REG_ICASE))) {
-    snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
-    return -1;
-  }
+    if (!pat || !*pat || !templ)
+        return 0;
 
-  /* check to make sure the item is not already on this list */
-  for (last = *list; last; last = last->next) {
-    if (ascii_strcasecmp (rx->pattern, last->rx->pattern) == 0) {
-      /* Already on the list. Formerly we just skipped this case, but
-       * now we're supporting removals, which means we're supporting
-       * re-adds conceptually. So we probably want this to imply a
-       * removal, then do an add. We can achieve the removal by freeing
-       * the template, and leaving t pointed at the current item.
-       */
-      t = last;
-      p_delete(&t->template);
-      break;
+    if (!(rx = rx_compile (pat, REG_ICASE))) {
+        snprintf (err->data, err->dsize, _("Bad regexp: %s"), pat);
+        return -1;
     }
-    if (!last->next)
-      break;
-  }
-
-  /* If t is set, it's pointing into an extant SPAM_LIST* that we want to
-   * update. Otherwise we want to make a new one to link at the list's end.
-   */
-  if (!t) {
-    t = mutt_new_spam_list ();
-    t->rx = rx;
-    if (last)
-      last->next = t;
-    else
-      *list = t;
-  }
-
-  /* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
-  t->template = m_strdup(templ);
 
-  /* Find highest match number in template string */
-  t->nmatch = 0;
-  for (p = templ; *p;) {
-    if (*p == '%') {
-      n = atoi (++p);
-      if (n > t->nmatch)
-        t->nmatch = n;
-      while (*p && isdigit ((int) *p))
-        ++p;
+    /* check to make sure the item is not already on this list */
+    for (last = list; *last; last = &(*last)->next) {
+        if (!ascii_strcasecmp(rx->pattern, (*last)->pattern) == 0) {
+            rx_t *tmp = rx_list_pop(last);
+            rx_delete(&tmp);
+            last = rx_list_last(last);
+            break;
+        }
     }
-    else
-      ++p;
-  }
-  t->nmatch++;                  /* match 0 is always the whole expr */
 
-  return 0;
+    *last = rx;
+    rx_set_template(rx, templ);
+    return 0;
 }
 
-static int remove_from_spam_list (SPAM_LIST ** list, const char *pat)
+static int remove_from_spam_list (rx_t ** list, const char *pat)
 {
-  SPAM_LIST *spam, *prev;
   int nremoved = 0;
 
-  /* Being first is a special case. */
-  spam = *list;
-  if (!spam)
-    return 0;
-  if (spam->rx && !m_strcmp(spam->rx->pattern, pat)) {
-    *list = spam->next;
-    rx_delete(&spam->rx);
-    p_delete(&spam->template);
-    p_delete(&spam);
-    return 1;
-  }
-
-  prev = spam;
-  for (spam = prev->next; spam;) {
-    if (!m_strcmp(spam->rx->pattern, pat)) {
-      prev->next = spam->next;
-      rx_delete(&spam->rx);
-      p_delete(&spam->template);
-      p_delete(&spam);
-      spam = prev->next;
-      ++nremoved;
-    }
-    else
-      spam = spam->next;
+  while (*list) {
+      if (!m_strcmp((*list)->pattern, pat)) {
+          rx_t *spam = rx_list_pop(list);
+          rx_delete(&spam);
+          nremoved++;
+      } else {
+          list = &(*list)->next;
+      }
   }
 
   return nremoved;
@@ -983,7 +928,7 @@ static int parse_spam_list (BUFFER * buf, BUFFER * s, unsigned long data,
 
     /* "*" is a special case. */
     if (!m_strcmp(buf->data, "*")) {
-      mutt_free_spam_list (&SpamList);
+      rx_list_wipe(&SpamList);
       rx_list_wipe(&NoSpamList);
       return 0;
     }
@@ -1792,12 +1737,12 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         DTYPE (option->type == DT_SYN))
     {
       struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
-      syn_t* tmp = syn_new();
-      tmp->f = m_strdup(CurRCFile);
-      tmp->l = CurRCLine;
-      tmp->n = newopt;
-      tmp->o = option;
-      syn_list_push(&Synonyms, tmp);
+      syn_t* syn = syn_new();
+      syn->f = m_strdup(CurRCFile);
+      syn->l = CurRCLine;
+      syn->n = newopt;
+      syn->o = option;
+      syn_list_push(&Synonyms, syn);
       option = newopt;
     }
 
@@ -2050,7 +1995,7 @@ static int source_rc (const char *rcfile, BUFFER * err)
   }
   p_delete(&token.data);
   p_delete(&linebuf);
-  fclose (f);
+  m_fclose(&f);
   if (pid != -1)
     mutt_wait_filter (pid);
   if (rc) {
@@ -2579,7 +2524,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
         q++;
       *q = '\0';
       NewsServer = m_strdup(p);
-      fclose (f);
+      m_fclose(&f);
     }
   }
   if ((p = getenv ("NNTPSERVER")))