[PATCH 1 of 2] imported patch replacelist
# HG changeset patch
# User David Champion <dgc@xxxxxxxxxxxx>
# Date 1227038081 21600
# Branch HEAD
# Node ID bd0ea10f5757dc9776c6c661a9fbc8d21903bdac
# Parent 05825d70f90e3184c2ae81b564deae955ad5ca28
imported patch replacelist
diff -r 05825d70f90e -r bd0ea10f5757 globals.h
--- a/globals.h Mon Nov 17 20:33:48 2008 -0800
+++ b/globals.h Tue Nov 18 13:54:41 2008 -0600
@@ -170,7 +170,7 @@
WHERE RX_LIST *UnMailLists INITVAL(0);
WHERE RX_LIST *SubscribedLists INITVAL(0);
WHERE RX_LIST *UnSubscribedLists INITVAL(0);
-WHERE SPAM_LIST *SpamList INITVAL(0);
+WHERE REPLACE_LIST *SpamList INITVAL(0);
WHERE RX_LIST *NoSpamList INITVAL(0);
diff -r 05825d70f90e -r bd0ea10f5757 init.c
--- a/init.c Mon Nov 17 20:33:48 2008 -0800
+++ b/init.c Tue Nov 18 13:54:41 2008 -0600
@@ -448,11 +448,11 @@
return 0;
}
-static int remove_from_spam_list (SPAM_LIST **list, const char *pat);
+static int remove_from_replace_list (REPLACE_LIST **list, const char *pat);
-static int add_to_spam_list (SPAM_LIST **list, const char *pat, const char
*templ, BUFFER *err)
+static int add_to_replace_list (REPLACE_LIST **list, const char *pat, const
char *templ, BUFFER *err)
{
- SPAM_LIST *t = NULL, *last = NULL;
+ REPLACE_LIST *t = NULL, *last = NULL;
REGEXP *rx;
int n;
const char *p;
@@ -485,12 +485,12 @@
break;
}
- /* If t is set, it's pointing into an extant SPAM_LIST* that we want to
+ /* If t is set, it's pointing into an extant REPLACE_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 = mutt_new_replace_list();
t->rx = rx;
if (last)
last->next = t;
@@ -498,7 +498,7 @@
*list = t;
}
- /* Now t is the SPAM_LIST* that we want to modify. It is prepared. */
+ /* Now t is the REPLACE_LIST* that we want to modify. It is prepared. */
t->template = safe_strdup(templ);
/* Find highest match number in template string */
@@ -519,9 +519,9 @@
if (t->nmatch > t->rx->rx->re_nsub)
{
- snprintf (err->data, err->dsize, _("Not enough subexpressions for spam "
+ snprintf (err->data, err->dsize, _("Not enough subexpressions for "
"template"));
- remove_from_spam_list(list, pat);
+ remove_from_replace_list(list, pat);
return -1;
}
@@ -530,38 +530,38 @@
return 0;
}
-static int remove_from_spam_list (SPAM_LIST **list, const char *pat)
+static int remove_from_replace_list (REPLACE_LIST **list, const char *pat)
{
- SPAM_LIST *spam, *prev;
+ REPLACE_LIST *cur, *prev;
int nremoved = 0;
/* Being first is a special case. */
- spam = *list;
- if (!spam)
+ cur = *list;
+ if (!cur)
return 0;
- if (spam->rx && !mutt_strcmp(spam->rx->pattern, pat))
+ if (cur->rx && !mutt_strcmp(cur->rx->pattern, pat))
{
- *list = spam->next;
- mutt_free_regexp(&spam->rx);
- FREE(&spam->template);
- FREE(&spam);
+ *list = cur->next;
+ mutt_free_regexp(&cur->rx);
+ FREE(&cur->template);
+ FREE(&cur);
return 1;
}
- prev = spam;
- for (spam = prev->next; spam;)
+ prev = cur;
+ for (cur = prev->next; cur;)
{
- if (!mutt_strcmp(spam->rx->pattern, pat))
+ if (!mutt_strcmp(cur->rx->pattern, pat))
{
- prev->next = spam->next;
- mutt_free_regexp(&spam->rx);
- FREE(&spam->template);
- FREE(&spam);
- spam = prev->next;
+ prev->next = cur->next;
+ mutt_free_regexp(&cur->rx);
+ FREE(&cur->template);
+ FREE(&cur);
+ cur = prev->next;
++nremoved;
}
else
- spam = spam->next;
+ cur = cur->next;
}
return nremoved;
@@ -763,7 +763,7 @@
mutt_extract_token (&templ, s, 0);
/* Add to the spam list. */
- if (add_to_spam_list (&SpamList, buf->data, templ.data, err) != 0) {
+ if (add_to_replace_list (&SpamList, buf->data, templ.data, err) != 0) {
FREE(&templ.data);
return -1;
}
@@ -787,13 +787,13 @@
/* "*" is a special case. */
if (!mutt_strcmp(buf->data, "*"))
{
- mutt_free_spam_list (&SpamList);
+ mutt_free_replace_list (&SpamList);
mutt_free_rx_list (&NoSpamList);
return 0;
}
/* If it's on the spam list, just remove it. */
- if (remove_from_spam_list(&SpamList, buf->data) != 0)
+ if (remove_from_replace_list(&SpamList, buf->data) != 0)
return 0;
/* Otherwise, add it to the nospam list. */
diff -r 05825d70f90e -r bd0ea10f5757 mutt.h
--- a/mutt.h Mon Nov 17 20:33:48 2008 -0800
+++ b/mutt.h Tue Nov 18 13:54:41 2008 -0600
@@ -524,20 +524,20 @@
struct rx_list_t *next;
} RX_LIST;
-typedef struct spam_list_t
+typedef struct replace_list_t
{
REGEXP *rx;
int nmatch;
char *template;
- struct spam_list_t *next;
-} SPAM_LIST;
+ struct replace_list_t *next;
+} REPLACE_LIST;
#define mutt_new_list() safe_calloc (1, sizeof (LIST))
#define mutt_new_rx_list() safe_calloc (1, sizeof (RX_LIST))
-#define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
+#define mutt_new_replace_list() safe_calloc (1, sizeof (REPLACE_LIST))
void mutt_free_list (LIST **);
void mutt_free_rx_list (RX_LIST **);
-void mutt_free_spam_list (SPAM_LIST **);
+void mutt_free_replace_list (REPLACE_LIST **);
LIST *mutt_copy_list (LIST *);
int mutt_matches_ignore (const char *, LIST *);
diff -r 05825d70f90e -r bd0ea10f5757 muttlib.c
--- a/muttlib.c Mon Nov 17 20:33:48 2008 -0800
+++ b/muttlib.c Tue Nov 18 13:54:41 2008 -0600
@@ -1755,9 +1755,9 @@
}
}
-void mutt_free_spam_list (SPAM_LIST **list)
+void mutt_free_replace_list (REPLACE_LIST **list)
{
- SPAM_LIST *p;
+ REPLACE_LIST *p;
if (!list) return;
while (*list)
@@ -1786,7 +1786,7 @@
return 0;
}
-int mutt_match_spam_list (const char *s, SPAM_LIST *l, char *text, int x)
+int mutt_match_spam_list (const char *s, REPLACE_LIST *l, char *text, int x)
{
static regmatch_t *pmatch = NULL;
static int nmatch = 0;
diff -r 05825d70f90e -r bd0ea10f5757 protos.h
--- a/protos.h Mon Nov 17 20:33:48 2008 -0800
+++ b/protos.h Tue Nov 18 13:54:41 2008 -0600
@@ -325,7 +325,7 @@
int mutt_link_threads (HEADER *, HEADER *, CONTEXT *);
int mutt_lookup_mime_type (BODY *, const char *);
int mutt_match_rx_list (const char *, RX_LIST *);
-int mutt_match_spam_list (const char *, SPAM_LIST *, char *, int);
+int mutt_match_spam_list (const char *, REPLACE_LIST *, char *, int);
int mutt_messages_in_thread (CONTEXT *, HEADER *, int);
int mutt_multi_choice (char *prompt, char *letters);
int mutt_needs_mailcap (BODY *);