/*
+ * Copyright notice from original mutt:
* Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
- */
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
+
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "sort.h"
-#include <string.h>
-#include <stdlib.h>
+#include "pattern.h"
-typedef struct score_t
-{
+typedef struct score_t {
char *str;
pattern_t *pat;
int val;
- int exact; /* if this rule matches, don't evaluate any more */
+ int exact; /* if this rule matches, don't evaluate any more */
struct score_t *next;
} SCORE;
SCORE *Score = NULL;
-void mutt_check_rescore (CONTEXT *ctx)
+void mutt_check_rescore (CONTEXT * ctx)
{
int i;
- if (option (OPTNEEDRESCORE) && option (OPTSCORE))
- {
+ if (option (OPTNEEDRESCORE) && option (OPTSCORE)) {
if ((Sort & SORT_MASK) == SORT_SCORE ||
- (SortAux & SORT_MASK) == SORT_SCORE)
- {
+ (SortAux & SORT_MASK) == SORT_SCORE) {
set_option (OPTNEEDRESORT);
if ((Sort & SORT_MASK) == SORT_THREADS)
- set_option (OPTSORTSUBTHREADS);
+ set_option (OPTSORTSUBTHREADS);
}
/* must redraw the index since the user might have %N in it */
set_option (OPTFORCEREDRAWINDEX);
set_option (OPTFORCEREDRAWPAGER);
- for (i = 0; ctx && i < ctx->msgcount; i++)
- {
+ for (i = 0; ctx && i < ctx->msgcount; i++) {
mutt_score_message (ctx, ctx->hdrs[i], 1);
ctx->hdrs[i]->pair = 0;
}
unset_option (OPTNEEDRESCORE);
}
-int mutt_parse_score (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+int mutt_parse_score (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err)
{
SCORE *ptr, *last;
char *pattern, *pc;
struct pattern_t *pat;
mutt_extract_token (buf, s, 0);
- if (!MoreArgs (s))
- {
- strfcpy (err->data, _("score: too few arguments"), err->dsize);
+ if (!MoreArgs (s)) {
+ m_strcpy(err->data, err->dsize, _("score: too few arguments"));
return (-1);
}
pattern = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ p_clear(buf, 1);
mutt_extract_token (buf, s, 0);
- if (MoreArgs (s))
- {
- FREE (&pattern);
- strfcpy (err->data, _("score: too many arguments"), err->dsize);
+ if (MoreArgs (s)) {
+ p_delete(&pattern);
+ m_strcpy(err->data, err->dsize, _("score: too many arguments"));
return (-1);
}
/* look for an existing entry and update the value, else add it to the end
of the list */
for (ptr = Score, last = NULL; ptr; last = ptr, ptr = ptr->next)
- if (mutt_strcmp (pattern, ptr->str) == 0)
+ if (m_strcmp(pattern, ptr->str) == 0)
break;
- if (!ptr)
- {
- if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL)
- {
- FREE (&pattern);
+ if (!ptr) {
+ if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL) {
+ p_delete(&pattern);
return (-1);
}
- ptr = safe_calloc (1, sizeof (SCORE));
+ ptr = p_new(SCORE, 1);
if (last)
last->next = ptr;
else
ptr->str = pattern;
}
pc = buf->data;
- if (*pc == '=')
- {
+ if (*pc == '=') {
ptr->exact = 1;
pc++;
}
return 0;
}
-void mutt_score_message (CONTEXT *ctx, HEADER *hdr, int upd_ctx)
+void mutt_score_message (CONTEXT * ctx, HEADER * hdr, int upd_ctx)
{
SCORE *tmp;
- hdr->score = 0; /* in case of re-scoring */
- for (tmp = Score; tmp; tmp = tmp->next)
- {
- if (mutt_pattern_exec (tmp->pat, 0, NULL, hdr) > 0)
- {
- if (tmp->exact || tmp->val == 9999 || tmp->val == -9999)
- {
- hdr->score = tmp->val;
- break;
+ hdr->score = 0; /* in case of re-scoring */
+ for (tmp = Score; tmp; tmp = tmp->next) {
+ if (mutt_pattern_exec (tmp->pat, M_MATCH_FULL_ADDRESS, NULL, hdr) > 0) {
+ if (tmp->exact || tmp->val == 9999 || tmp->val == -9999) {
+ hdr->score = tmp->val;
+ break;
}
hdr->score += tmp->val;
}
}
if (hdr->score < 0)
hdr->score = 0;
-
+
if (hdr->score <= ScoreThresholdDelete)
_mutt_set_flag (ctx, hdr, M_DELETE, 1, upd_ctx);
if (hdr->score <= ScoreThresholdRead)
_mutt_set_flag (ctx, hdr, M_FLAG, 1, upd_ctx);
}
-int mutt_parse_unscore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+int mutt_parse_unscore (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
SCORE *tmp, *last = NULL;
- while (MoreArgs (s))
- {
+ while (MoreArgs (s)) {
mutt_extract_token (buf, s, 0);
- if (!mutt_strcmp ("*", buf->data))
- {
- for (tmp = Score; tmp; )
- {
- last = tmp;
- tmp = tmp->next;
- mutt_pattern_free (&last->pat);
- FREE (&last);
+ if (!m_strcmp("*", buf->data)) {
+ for (tmp = Score; tmp;) {
+ last = tmp;
+ tmp = tmp->next;
+ pattern_list_wipe(&last->pat);
+ p_delete(&last);
}
Score = NULL;
}
- else
- {
- for (tmp = Score; tmp; last = tmp, tmp = tmp->next)
- {
- if (!mutt_strcmp (buf->data, tmp->str))
- {
- if (last)
- last->next = tmp->next;
- else
- Score = tmp->next;
- mutt_pattern_free (&tmp->pat);
- FREE (&tmp);
- /* there should only be one score per pattern, so we can stop here */
- break;
- }
+ else {
+ for (tmp = Score; tmp; last = tmp, tmp = tmp->next) {
+ if (!m_strcmp(buf->data, tmp->str)) {
+ if (last)
+ last->next = tmp->next;
+ else
+ Score = tmp->next;
+ pattern_list_wipe(&tmp->pat);
+ p_delete(&tmp);
+ /* there should only be one score per pattern, so we can stop here */
+ break;
+ }
}
}
}
projects / apps / madmutt.git / blobdiff