plug another memleak reported by Martin Kluge
[claws.git] / src / matcher.c
index 6becce60d0e09d22cb604f73a70320f90443ef40..f68eb5b1b1de822a973062ab203971faad16751c 100644 (file)
@@ -1,11 +1,33 @@
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2002 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ *
+ * 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-1307, USA.
+ */
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "utils.h"
 #include "defs.h"
+#include "utils.h"
 #include "procheader.h"
 #include "matcher.h"
+#include "intl.h"
+#include "matcher_parser.h"
+#include "prefs.h"
 
 struct _MatchParser {
        gint id;
@@ -14,368 +36,218 @@ struct _MatchParser {
 
 typedef struct _MatchParser MatchParser;
 
-MatchParser matchparser_tab[] = {
-       /* msginfo */
-       {SCORING_ALL, "all"},
-       {SCORING_SUBJECT, "subject"},
-       {SCORING_NOT_SUBJECT, "~subject"},
-       {SCORING_FROM, "from"},
-       {SCORING_NOT_FROM, "~from"},
-       {SCORING_TO, "to"},
-       {SCORING_NOT_TO, "~to"},
-       {SCORING_CC, "cc"},
-       {SCORING_NOT_CC, "~cc"},
-       {SCORING_TO_OR_CC, "to_or_cc"},
-       {SCORING_NOT_TO_AND_NOT_CC, "~to_or_cc"},
-       {SCORING_AGE_SUP, "age_sup"},
-       {SCORING_AGE_INF, "age_inf"},
-       {SCORING_NEWSGROUPS, "newsgroups"},
-       {SCORING_NOT_NEWSGROUPS, "~newsgroups"},
+static MatchParser matchparser_tab[] = {
+       /* msginfo flags */
+       {MATCHCRITERIA_ALL, "all"},
+       {MATCHCRITERIA_UNREAD, "unread"},
+       {MATCHCRITERIA_NOT_UNREAD, "~unread"},
+       {MATCHCRITERIA_NEW, "new"},
+       {MATCHCRITERIA_NOT_NEW, "~new"},
+       {MATCHCRITERIA_MARKED, "marked"},
+       {MATCHCRITERIA_NOT_MARKED, "~marked"},
+       {MATCHCRITERIA_DELETED, "deleted"},
+       {MATCHCRITERIA_NOT_DELETED, "~deleted"},
+       {MATCHCRITERIA_REPLIED, "replied"},
+       {MATCHCRITERIA_NOT_REPLIED, "~replied"},
+       {MATCHCRITERIA_FORWARDED, "forwarded"},
+       {MATCHCRITERIA_NOT_FORWARDED, "~forwarded"},
+
+       /* msginfo headers */
+       {MATCHCRITERIA_SUBJECT, "subject"},
+       {MATCHCRITERIA_NOT_SUBJECT, "~subject"},
+       {MATCHCRITERIA_FROM, "from"},
+       {MATCHCRITERIA_NOT_FROM, "~from"},
+       {MATCHCRITERIA_TO, "to"},
+       {MATCHCRITERIA_NOT_TO, "~to"},
+       {MATCHCRITERIA_CC, "cc"},
+       {MATCHCRITERIA_NOT_CC, "~cc"},
+       {MATCHCRITERIA_TO_OR_CC, "to_or_cc"},
+       {MATCHCRITERIA_NOT_TO_AND_NOT_CC, "~to_or_cc"},
+       {MATCHCRITERIA_AGE_GREATER, "age_greater"},
+       {MATCHCRITERIA_AGE_LOWER, "age_lower"},
+       {MATCHCRITERIA_NEWSGROUPS, "newsgroups"},
+       {MATCHCRITERIA_NOT_NEWSGROUPS, "~newsgroups"},
+       {MATCHCRITERIA_INREPLYTO, "inreplyto"},
+       {MATCHCRITERIA_NOT_INREPLYTO, "~inreplyto"},
+       {MATCHCRITERIA_REFERENCES, "references"},
+       {MATCHCRITERIA_NOT_REFERENCES, "~references"},
+       {MATCHCRITERIA_SCORE_GREATER, "score_greater"},
+       {MATCHCRITERIA_SCORE_LOWER, "score_lower"},
+       {MATCHCRITERIA_SCORE_EQUAL, "score_equal"},
+
+       {MATCHCRITERIA_SIZE_GREATER, "size_greater"},
+       {MATCHCRITERIA_SIZE_SMALLER, "size_smaller"},
+       {MATCHCRITERIA_SIZE_EQUAL,   "size_equal"},
 
        /* content have to be read */
-       {SCORING_HEADER, "header"},
-       {SCORING_NOT_HEADER, "~header"},
-       {SCORING_MESSAGEHEADERS, "messageheaders"},
-       {SCORING_NOT_MESSAGEHEADERS, "~messageheaders"},
-       {SCORING_MESSAGE, "message"},
-       {SCORING_NOT_MESSAGE, "~message"},
-       {SCORING_BODY, "body"},
-       {SCORING_NOT_BODY, "~body"},
+       {MATCHCRITERIA_HEADER, "header"},
+       {MATCHCRITERIA_NOT_HEADER, "~header"},
+       {MATCHCRITERIA_HEADERS_PART, "headers_part"},
+       {MATCHCRITERIA_NOT_HEADERS_PART, "~headers_part"},
+       {MATCHCRITERIA_MESSAGE, "message"},
+       {MATCHCRITERIA_NOT_MESSAGE, "~message"},
+       {MATCHCRITERIA_BODY_PART, "body_part"},
+       {MATCHCRITERIA_NOT_BODY_PART, "~body_part"},
+       {MATCHCRITERIA_EXECUTE, "execute"},
+       {MATCHCRITERIA_NOT_EXECUTE, "~execute"},
 
        /* match type */
-       {SCORING_MATCHCASE, "matchcase"},
-       {SCORING_MATCH, "match"},
-       {SCORING_REGEXPCASE, "regexpcase"},
-       {SCORING_REGEXP, "regexp"},
+       {MATCHTYPE_MATCHCASE, "matchcase"},
+       {MATCHTYPE_MATCH, "match"},
+       {MATCHTYPE_REGEXPCASE, "regexpcase"},
+       {MATCHTYPE_REGEXP, "regexp"},
 
        /* actions */
-       {SCORING_SCORE, "score"},
+       {MATCHACTION_SCORE, "score"},
+       {MATCHACTION_MOVE, "move"},
+       {MATCHACTION_COPY, "copy"},
+       {MATCHACTION_DELETE, "delete"},
+       {MATCHACTION_MARK, "mark"},
+       {MATCHACTION_UNMARK, "unmark"},
+       {MATCHACTION_MARK_AS_READ, "mark_as_read"},
+       {MATCHACTION_MARK_AS_UNREAD, "mark_as_unread"},
+       {MATCHACTION_FORWARD, "forward"},
+       {MATCHACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},
+       {MATCHACTION_EXECUTE, "execute"},
+       {MATCHACTION_COLOR, "color"},
+       {MATCHACTION_REDIRECT, "redirect"},
+       {MATCHACTION_DELETE_ON_SERVER, "delete_on_server"}
 };
 
-/*
-  syntax for matcher
-
-  header "x-mailing" match "toto"
-  subject match "regexp" & to regexp "regexp"
-  subject match "regexp" | to regexpcase "regexp" | age_sup 5
- */
-
-static gboolean matcher_is_blank(gchar ch);
-
-/* ******************* parser *********************** */
-
-static gboolean matcher_is_blank(gchar ch)
-{
-       return (ch == ' ') || (ch == '\t');
-}
-
-/* parse for one condition */
-
-MatcherProp * matcherprop_parse(gchar ** str)
+/* get_matchparser_tab_str() - used by filtering.c to translate 
+ * actions to debug strings */
+gchar * get_matchparser_tab_str(gint id)
 {
-       MatcherProp * prop;
-       gchar * tmp;
-       gint key;
-       gint age;
-       gchar * expr;
-       gint match;
-       gchar * header = NULL;
-       
-       tmp = * str;
-       key = matcher_parse_keyword(&tmp);
-       if (tmp == NULL) {
-               * str = NULL;
-               return NULL;
-       }
-
-       switch (key) {
-       case SCORING_AGE_INF:
-       case SCORING_AGE_SUP:
-               age = matcher_parse_number(&tmp);
-               if (tmp == NULL) {
-                       * str = NULL;
-                       return NULL;
-               }
-               *str = tmp;
-
-               prop = matcherprop_new(key, NULL, 0, NULL, age);
-
-               return prop;
-
-       case SCORING_ALL:
-               prop = matcherprop_new(key, NULL, 0, NULL, 0);
-               *str = tmp;
-
-               return prop;
-
-       case SCORING_SUBJECT:
-       case SCORING_NOT_SUBJECT:
-       case SCORING_FROM:
-       case SCORING_NOT_FROM:
-       case SCORING_TO:
-       case SCORING_NOT_TO:
-       case SCORING_CC:
-       case SCORING_NOT_CC:
-       case SCORING_TO_OR_CC:
-       case SCORING_NOT_TO_AND_NOT_CC:
-       case SCORING_NEWSGROUPS:
-       case SCORING_NOT_NEWSGROUPS:
-       case SCORING_MESSAGE:
-       case SCORING_NOT_MESSAGE:
-       case SCORING_MESSAGEHEADERS:
-       case SCORING_NOT_MESSAGEHEADERS:
-       case SCORING_BODY:
-       case SCORING_NOT_BODY:
-       case SCORING_HEADER:
-       case SCORING_NOT_HEADER:
-               if ((key == SCORING_HEADER) || (key == SCORING_NOT_HEADER)) {
-                       header = matcher_parse_str(&tmp);
-                       if (tmp == NULL) {
-                               * str = NULL;
-                               return NULL;
-                       }
-               }
-
-               match = matcher_parse_keyword(&tmp);
-               if (tmp == NULL) {
-                       if (header)
-                               g_free(header);
-                       * str = NULL;
-                       return NULL;
-               }
-
-               switch(match) {
-               case SCORING_REGEXP:
-               case SCORING_REGEXPCASE:
-                       expr = matcher_parse_regexp(&tmp);
-                       if (tmp == NULL) {
-                               if (header)
-                                       g_free(header);
-                               * str = NULL;
-                               return NULL;
-                       }
-                       *str = tmp;
-                       prop = matcherprop_new(key, header, match, expr, 0);
-                       g_free(expr);
-
-                       return prop;
-               case SCORING_MATCH:
-               case SCORING_MATCHCASE:
-                       expr = matcher_parse_str(&tmp);
-                       if (tmp == NULL) {
-                               if (header)
-                                       g_free(header);
-                               * str = NULL;
-                               return NULL;
-                       }
-                       *str = tmp;
-                       prop = matcherprop_new(key, header, match, expr, 0);
-                       g_free(expr);
-
-                       return prop;
-               default:
-                       if (header)
-                               g_free(header);
-                       * str = NULL;
-                       return NULL;
-               }
-       default:
-               * str = NULL;
-               return NULL;
-       }
-}
-
-gint matcher_parse_keyword(gchar ** str)
-{
-       gchar * p;
-       gchar * dup;
-       gchar * start;
        gint i;
-       gint match;
 
-       dup = alloca(strlen(* str) + 1);
-       p = dup;
-       strcpy(dup, * str);
-
-       while (matcher_is_blank(*p))
-               p++;
-
-       start = p;
-       
-       match = -1;
        for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
            i++) {
-               if (strncasecmp(matchparser_tab[i].str, p,
-                               strlen(matchparser_tab[i].str)) == 0) {
-                       p += strlen(matchparser_tab[i].str);
-                       match = i;
-                       break;
-               }
+               if (matchparser_tab[i].id == id)
+                       return matchparser_tab[i].str;
        }
-
-       if (match == -1) {
-               * str = NULL;
-               return 0;
-       }
-
-       *p = '\0';
-
-       *str += p - dup + 1;
-       return matchparser_tab[match].id;
+       return NULL;
 }
 
-gint matcher_parse_number(gchar ** str)
+/* matcher_escape_str() - escapes a string returns newly allocated escaped string */
+gchar *matcher_escape_str(const gchar *str)
 {
-       gchar * p;
-       gchar * dup;
-       gchar * start;
+       register const gchar *walk;
+       register int escape;
+       gchar *res;
+       register char *reswalk;
 
-       dup = alloca(strlen(* str) + 1);
-       p = dup;
-       strcpy(dup, * str);
-
-       while (matcher_is_blank(*p))
-               p++;
-
-       start = p;
-
-       if (!isdigit(*p) && *p != '-' && *p != '+') {
-               *str = NULL;
-               return 0;
-       }
-       if (*p == '-' || *p == '+')
-               p++;
-       while (isdigit(*p))
-               p++;
-
-       *p = '\0';
-
-       *str += p - dup + 1;
-       return atoi(start);
-}
-
-gboolean matcher_parse_boolean_op(gchar ** str)
-{
-       gchar * p;
-
-       p = * str;
-
-       while (matcher_is_blank(*p))
-               p++;
-
-       if (*p == '|') {
-               *str += p - * str + 1;
-               return FALSE;
-       }
-       else if (*p == '&') {
-               *str += p - * str + 1;
-               return TRUE;
-       }
-       else {
-               *str = NULL;
-               return FALSE;
-       }
-}
-
-gchar * matcher_parse_regexp(gchar ** str)
-{
-       gchar * p;
-       gchar * dup;
-       gchar * start;
-
-       dup = alloca(strlen(* str) + 1);
-       p = dup;
-       strcpy(dup, * str);
-
-       while (matcher_is_blank(*p))
-               p++;
-
-       if (*p != '/') {
-               * str = NULL;
+       if (str == NULL)
                return NULL;
-       }
 
-       p ++;
-       start = p;
-       while (*p != '/') {
-               if (*p == '\\')
-                       p++;
-               p++;
+       for (escape = 0, walk = str; *walk; walk++)
+               if (*walk == '\'' || *walk == '\"')
+                       escape++;
+
+       if (!escape)
+               return g_strdup(str);
+       
+       reswalk = res = g_new0(gchar, (walk - str) + escape + 1);
+       for (walk = str; *walk; walk++, reswalk++) {
+               if (*walk == '\'' || *walk == '\"')
+                       *reswalk++ = '\\';
+               *reswalk = *walk;
        }
-       *p = '\0';
 
-       *str += p - dup + 2;
-       return g_strdup(start);
+       *reswalk = 0;
+       return res;
 }
 
-gchar * matcher_parse_str(gchar ** str)
+/* matcher_unescape_str() - assumes that unescaping frees up room
+ * in the string, so it returns the unescaped string in the 
+ * source */
+gchar *matcher_unescape_str(gchar *str)
 {
-       gchar * p;
-       gchar * dup;
-       gchar * start;
-       gchar * dest;
-
-       dup = alloca(strlen(* str) + 1);
-       p = dup;
-       strcpy(dup, * str);
-
-       while (matcher_is_blank(*p))
-               p++;
-
-       if (*p != '"') {
-               * str = NULL;
-               return NULL;
-       }
+       gchar *tmp = alloca(strlen(str) + 1);
+       register gchar *src = tmp;
+       register gchar *dst = str;
        
-       p ++;
-       start = p;
-       dest = p;
-       while (*p != '"') {
-               if (*p == '\\') {
-                       p++;
-                       *dest = *p;
+       strcpy(tmp, str);
+
+       for ( ; *src; src++) {
+               if (*src != '\\') 
+                       *dst++ = *src;
+               else {
+                       src++;
+                       if (*src == '\\')
+                               *dst++ = '\\';                          /* insert backslash */
+                       else if (*src == 'n')                           /* insert control characters */
+                               *dst++ = '\n';
+                       else if (*src == 'r') 
+                               *dst++ = '\r';
+                       else if (*src == 't') 
+                               *dst++ = '\t';
+                       else if (*src == 'r') 
+                               *dst++ = '\r';
+                       else if (*src == 'b')
+                               *dst++ = '\b';
+                       else if (*src == 'f')
+                               *dst++ = '\f';
+                       else if (*src == '\'' || *src == '\"')          /* insert \' or \" */
+                               *dst++ = *src;
+                       else {
+                               /* FIXME: should perhaps escape character... */
+                               src--;
+                               *dst++ = *src;
+                       }                               
                }
-               else
-                       *dest = *p;
-               dest++;
-               p++;
        }
-       *dest = '\0';
-
-       *str += dest - dup + 2;
-       return g_strdup(start);
+       *dst = 0;
+       return str;
 }
 
 /* **************** data structure allocation **************** */
 
-
+/* matcherprop_new() - allocates a structure for one condition
+ */
 MatcherProp * matcherprop_new(gint criteria, gchar * header,
                              gint matchtype, gchar * expr,
-                             int age)
+                             int value)
 {
        MatcherProp * prop;
 
        prop = g_new0(MatcherProp, 1);
        prop->criteria = criteria;
-       if (header != NULL)
-               prop->header = g_strdup(header);
-       else
-               prop->header = NULL;
-       if (expr != NULL)
-               prop->expr = g_strdup(expr);
-       else
-               prop->expr = NULL;
+       if (header != NULL) {
+               prop->header       = g_strdup(header);
+               prop->unesc_header = matcher_unescape_str(g_strdup(header)); 
+       }       
+       else {
+               prop->header       = NULL;
+               prop->unesc_header = NULL;
+       }       
+       if (expr != NULL) {
+               prop->expr       = g_strdup(expr);
+               prop->unesc_expr = matcher_unescape_str(g_strdup(expr));
+       }       
+       else {
+               prop->expr       = NULL;
+               prop->unesc_expr = NULL;
+       }       
        prop->matchtype = matchtype;
        prop->preg = NULL;
-       prop->age = age;
+       prop->value = value;
        prop->error = 0;
 
        return prop;
 }
 
+/* matcherprop_free()
+ */
 void matcherprop_free(MatcherProp * prop)
 {
-       g_free(prop->expr);
+       if (prop->expr) 
+               g_free(prop->expr);
+       if (prop->unesc_expr) 
+               g_free(prop->unesc_expr);
+       if (prop->header)
+               g_free(prop->header);
+       if (prop->unesc_header) 
+               g_free(prop->unesc_header);
        if (prop->preg != NULL) {
                regfree(prop->preg);
                g_free(prop->preg);
@@ -387,51 +259,77 @@ void matcherprop_free(MatcherProp * prop)
 /* ************** match ******************************/
 
 
-/* match the given string */
-
+/* matcherprop_string_match() - finds out if a string matches
+ * with a criterium */
 static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
 {
        gchar * str1;
+       gchar * str2;
 
        if (str == NULL)
-               str = "";
+               return FALSE;
 
        switch(prop->matchtype) {
-       case SCORING_REGEXP:
-       case SCORING_REGEXPCASE:
+       case MATCHTYPE_REGEXPCASE:
+       case MATCHTYPE_REGEXP:
                if (!prop->preg && (prop->error == 0)) {
                        prop->preg = g_new0(regex_t, 1);
+                       /* if regexp then don't use the escaped string */
                        if (regcomp(prop->preg, prop->expr,
                                    REG_NOSUB | REG_EXTENDED
-                                   | ((prop->matchtype == SCORING_REGEXPCASE)
+                                   | ((prop->matchtype == MATCHTYPE_REGEXPCASE)
                                    ? REG_ICASE : 0)) != 0) {
                                prop->error = 1;
                                g_free(prop->preg);
+                               prop->preg = NULL;
                        }
                }
                if (prop->preg == NULL)
-                       return 0;
+                       return FALSE;
                
                if (regexec(prop->preg, str, 0, NULL, 0) == 0)
-                       return 1;
+                       return TRUE;
                else
-                       return 0;
+                       return FALSE;
 
-       case SCORING_MATCH:
-               return (strstr(str, prop->expr) != NULL);
+       case MATCHTYPE_MATCH:
+               return (strstr(str, prop->unesc_expr) != NULL);
 
-       case SCORING_MATCHCASE:
-               g_strup(prop->expr);
+       /* FIXME: put upper in unesc_str */
+       case MATCHTYPE_MATCHCASE:
+               str2 = alloca(strlen(prop->unesc_expr) + 1);
+               strcpy(str2, prop->unesc_expr);
+               g_strup(str2);
                str1 = alloca(strlen(str) + 1);
                strcpy(str1, str);
                g_strup(str1);
-               return (strstr(str1, prop->expr) != NULL);
+               return (strstr(str1, str2) != NULL);
                
        default:
-               return 0;
+               return FALSE;
        }
 }
 
+gboolean matcherprop_match_execute(MatcherProp * prop, MsgInfo * info)
+{
+       gchar * file;
+       gchar * cmd;
+       gint retval;
+
+       file = procmsg_get_message_file(info);
+       if (file == NULL)
+               return FALSE;
+
+       cmd = matching_build_command(prop->unesc_expr, info);
+       if (cmd == NULL)
+               return FALSE;
+
+       retval = system(cmd);
+       debug_print("Command exit code: %d\n", retval);
+
+       return (retval == 0);
+}
+
 /* match a message and his headers, hlist can be NULL if you don't
    want to use headers */
 
@@ -440,41 +338,91 @@ gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info)
        time_t t;
 
        switch(prop->criteria) {
-       case SCORING_ALL:
+       case MATCHCRITERIA_ALL:
                return 1;
-       case SCORING_SUBJECT:
+       case MATCHCRITERIA_UNREAD:
+               return MSG_IS_UNREAD(info->flags);
+       case MATCHCRITERIA_NOT_UNREAD:
+               return !MSG_IS_UNREAD(info->flags);
+       case MATCHCRITERIA_NEW:
+               return MSG_IS_NEW(info->flags);
+       case MATCHCRITERIA_NOT_NEW:
+               return !MSG_IS_NEW(info->flags);
+       case MATCHCRITERIA_MARKED:
+               return MSG_IS_MARKED(info->flags);
+       case MATCHCRITERIA_NOT_MARKED:
+               return !MSG_IS_MARKED(info->flags);
+       case MATCHCRITERIA_DELETED:
+               return MSG_IS_DELETED(info->flags);
+       case MATCHCRITERIA_NOT_DELETED:
+               return !MSG_IS_DELETED(info->flags);
+       case MATCHCRITERIA_REPLIED:
+               return MSG_IS_REPLIED(info->flags);
+       case MATCHCRITERIA_NOT_REPLIED:
+               return !MSG_IS_REPLIED(info->flags);
+       case MATCHCRITERIA_FORWARDED:
+               return MSG_IS_FORWARDED(info->flags);
+       case MATCHCRITERIA_NOT_FORWARDED:
+               return !MSG_IS_FORWARDED(info->flags);
+       case MATCHCRITERIA_SUBJECT:
                return matcherprop_string_match(prop, info->subject);
-       case SCORING_NOT_SUBJECT:
+       case MATCHCRITERIA_NOT_SUBJECT:
                return !matcherprop_string_match(prop, info->subject);
-       case SCORING_FROM:
+       case MATCHCRITERIA_FROM:
                return matcherprop_string_match(prop, info->from);
-       case SCORING_NOT_FROM:
+       case MATCHCRITERIA_NOT_FROM:
                return !matcherprop_string_match(prop, info->from);
-       case SCORING_TO:
+       case MATCHCRITERIA_TO:
                return matcherprop_string_match(prop, info->to);
-       case SCORING_NOT_TO:
+       case MATCHCRITERIA_NOT_TO:
                return !matcherprop_string_match(prop, info->to);
-       case SCORING_CC:
+       case MATCHCRITERIA_CC:
                return matcherprop_string_match(prop, info->cc);
-       case SCORING_NOT_CC:
+       case MATCHCRITERIA_NOT_CC:
                return !matcherprop_string_match(prop, info->cc);
-       case SCORING_TO_OR_CC:
+       case MATCHCRITERIA_TO_OR_CC:
                return matcherprop_string_match(prop, info->to)
                        || matcherprop_string_match(prop, info->cc);
-       case SCORING_NOT_TO_AND_NOT_CC:
+       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
                return !(matcherprop_string_match(prop, info->to)
                || matcherprop_string_match(prop, info->cc));
-       case SCORING_AGE_SUP:
+       case MATCHCRITERIA_AGE_GREATER:
                t = time(NULL);
-               return ((t - info->date_t) / (60 * 60 * 24)) >= prop->age;
-       case SCORING_AGE_INF:
+               return ((t - info->date_t) / (60 * 60 * 24)) >= prop->value;
+       case MATCHCRITERIA_AGE_LOWER:
                t = time(NULL);
-               return ((t - info->date_t) / (60 * 60 * 24)) <= prop->age;
-       case SCORING_NEWSGROUPS:
+               return ((t - info->date_t) / (60 * 60 * 24)) <= prop->value;
+       case MATCHCRITERIA_SCORE_GREATER:
+               return info->score >= prop->value;
+       case MATCHCRITERIA_SCORE_LOWER:
+               return info->score <= prop->value;
+       case MATCHCRITERIA_SCORE_EQUAL:
+               return info->score == prop->value;
+       case MATCHCRITERIA_SIZE_GREATER:
+               /* FIXME: info->size is an off_t */
+               return info->size > (off_t) prop->value;
+       case MATCHCRITERIA_SIZE_EQUAL:
+               /* FIXME: info->size is an off_t */
+               return info->size == (off_t) prop->value;
+       case MATCHCRITERIA_SIZE_SMALLER:
+               /* FIXME: info->size is an off_t */
+               return info->size <  (off_t) prop->value;
+       case MATCHCRITERIA_NEWSGROUPS:
                return matcherprop_string_match(prop, info->newsgroups);
-       case SCORING_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
                return !matcherprop_string_match(prop, info->newsgroups);
-       case SCORING_HEADER:
+       case MATCHCRITERIA_INREPLYTO:
+               return matcherprop_string_match(prop, info->inreplyto);
+       case MATCHCRITERIA_NOT_INREPLYTO:
+               return !matcherprop_string_match(prop, info->inreplyto);
+       case MATCHCRITERIA_REFERENCES:
+               return matcherprop_string_match(prop, info->references);
+       case MATCHCRITERIA_NOT_REFERENCES:
+               return !matcherprop_string_match(prop, info->references);
+       case MATCHCRITERIA_EXECUTE:
+               return matcherprop_match_execute(prop, info);
+       case MATCHCRITERIA_NOT_EXECUTE:
+               return !matcherprop_match_execute(prop, info);
        default:
                return 0;
        }
@@ -483,54 +431,6 @@ gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info)
 /* ********************* MatcherList *************************** */
 
 
-/* parse for a list of conditions */
-
-MatcherList * matcherlist_parse(gchar ** str)
-{
-       gchar * tmp;
-       MatcherProp * matcher;
-       GSList * matchers_list = NULL;
-       gboolean bool_and = TRUE;
-       gchar * save;
-       MatcherList * cond;
-       gboolean main_bool_and;
-
-       tmp = * str;
-
-       matcher = matcherprop_parse(&tmp);
-       if (tmp == NULL) {
-               * str = NULL;
-               return NULL;
-       }
-       matchers_list = g_slist_append(matchers_list, matcher);
-       while (matcher) {
-               save = tmp;
-               bool_and = matcher_parse_boolean_op(&tmp);
-               if (tmp == NULL) {
-                       tmp = save;
-                       matcher = NULL;
-               }
-               else {
-                       main_bool_and = bool_and;
-                       matcher = matcherprop_parse(&tmp);
-                       if (tmp != NULL) {
-                               matchers_list =
-                                       g_slist_append(matchers_list, matcher);
-                       }
-                       else {
-                               * str = NULL;
-                               return NULL;
-                       }
-               }
-       }
-
-       cond = matcherlist_new(matchers_list, main_bool_and);
-
-       * str = tmp;
-
-       return cond;
-}
-
 MatcherList * matcherlist_new(GSList * matchers, gboolean bool_and)
 {
        MatcherList * cond;
@@ -546,6 +446,7 @@ MatcherList * matcherlist_new(GSList * matchers, gboolean bool_and)
 void matcherlist_free(MatcherList * cond)
 {
        GSList * l;
+
        for(l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
                matcherprop_free((MatcherProp *) l->data);
        }
@@ -556,7 +457,7 @@ void matcherlist_free(MatcherList * cond)
   skip the headers
  */
 
-static void matcherprop_skip_headers(FILE *fp)
+static void matcherlist_skip_headers(FILE *fp)
 {
        gchar buf[BUFFSIZE];
 
@@ -576,24 +477,29 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
        Header *header;
 
        switch(matcher->criteria) {
-       case SCORING_HEADER:
-       case SCORING_NOT_HEADER:
+       case MATCHCRITERIA_HEADER:
+       case MATCHCRITERIA_NOT_HEADER:
                header = procheader_parse_header(buf);
+               if (!header)
+                       return FALSE;
                if (procheader_headername_equal(header->name,
                                                matcher->header)) {
-                       if (matcher->criteria == SCORING_HEADER)
+                       if (matcher->criteria == MATCHCRITERIA_HEADER)
                                result = matcherprop_string_match(matcher, header->body);
                        else
                                result = !matcherprop_string_match(matcher, header->body);
                        procheader_header_free(header);
                        return result;
                }
+               else {
+                       procheader_header_free(header);
+               }
                break;
-       case SCORING_MESSAGEHEADERS:
-       case SCORING_MESSAGE:
+       case MATCHCRITERIA_HEADERS_PART:
+       case MATCHCRITERIA_MESSAGE:
                return matcherprop_string_match(matcher, buf);
-       case SCORING_NOT_MESSAGE:
-       case SCORING_NOT_MESSAGEHEADERS:
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
                return !matcherprop_string_match(matcher, buf);
        }
        return FALSE;
@@ -607,12 +513,21 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
 static gboolean matcherprop_criteria_headers(MatcherProp * matcher)
 {
        switch(matcher->criteria) {
-       case SCORING_HEADER:
-       case SCORING_NOT_HEADER:
-       case SCORING_MESSAGEHEADERS:
-       case SCORING_NOT_MESSAGEHEADERS:
-       case SCORING_MESSAGE:
-       case SCORING_NOT_MESSAGE:
+       case MATCHCRITERIA_HEADER:
+       case MATCHCRITERIA_NOT_HEADER:
+       case MATCHCRITERIA_HEADERS_PART:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
+               return TRUE;
+       default:
+               return FALSE;
+       }
+}
+
+static gboolean matcherprop_criteria_message(MatcherProp * matcher)
+{
+       switch(matcher->criteria) {
+       case MATCHCRITERIA_MESSAGE:
+       case MATCHCRITERIA_NOT_MESSAGE:
                return TRUE;
        default:
                return FALSE;
@@ -621,32 +536,33 @@ static gboolean matcherprop_criteria_headers(MatcherProp * matcher)
 
 /*
   matcherlist_match_one_header
-  returns TRUE if buf matchs the MatchersList criteria
+  returns TRUE if match should stop
  */
 
 static gboolean matcherlist_match_one_header(MatcherList * matchers,
-                                            gchar * buf, gboolean result)
+                                        gchar * buf)
 {
        GSList * l;
-       
+
        for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
                MatcherProp * matcher = (MatcherProp *) l->data;
-               gboolean matched = FALSE;
-               gboolean partial_result;
 
-               if (matcherprop_criteria_headers(matcher)) {
+               if (matcherprop_criteria_headers(matcher) ||
+                   matcherprop_criteria_message(matcher)) {
                        if (matcherprop_match_one_header(matcher, buf)) {
+                               matcher->result = TRUE;
+                       }
+               }
+
+               if (matcherprop_criteria_headers(matcher)) {
+                       if (matcher->result) {
                                if (!matchers->bool_and)
                                        return TRUE;
                        }
-                       else {
-                               if (matchers->bool_and)
-                                       return FALSE;
-                       }
                }
        }
 
-       return result;
+       return FALSE;
 }
 
 /*
@@ -654,22 +570,15 @@ static gboolean matcherlist_match_one_header(MatcherList * matchers,
   returns TRUE if one of the headers matchs the MatcherList criteria
  */
 
-static gboolean matcherlist_match_headers(MatcherList * matchers, FILE * fp,
-                                         gboolean result)
+static gboolean matcherlist_match_headers(MatcherList * matchers, FILE * fp)
 {
        gchar buf[BUFFSIZE];
 
-       while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
-               if (matcherlist_match_one_header(matchers, buf, result)) {
-                       if (!matchers->bool_and)
-                               return TRUE;
-               }
-               else {
-                       if (matchers->bool_and)
-                               return FALSE;
-               }
-       }
-       return result;
+       while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1)
+               if (matcherlist_match_one_header(matchers, buf))
+                       return TRUE;
+
+       return FALSE;
 }
 
 /*
@@ -680,10 +589,8 @@ static gboolean matcherlist_match_headers(MatcherList * matchers, FILE * fp,
 static gboolean matcherprop_criteria_body(MatcherProp * matcher)
 {
        switch(matcher->criteria) {
-       case SCORING_BODY:
-       case SCORING_NOT_BODY:
-       case SCORING_MESSAGE:
-       case SCORING_NOT_MESSAGE:
+       case MATCHCRITERIA_BODY_PART:
+       case MATCHCRITERIA_NOT_BODY_PART:
                return TRUE;
        default:
                return FALSE;
@@ -698,13 +605,14 @@ static gboolean matcherprop_criteria_body(MatcherProp * matcher)
 static gboolean matcherprop_match_line(MatcherProp * matcher, gchar * line)
 {
        switch(matcher->criteria) {
-       case SCORING_BODY:
-       case SCORING_MESSAGE:
+       case MATCHCRITERIA_BODY_PART:
+       case MATCHCRITERIA_MESSAGE:
                return matcherprop_string_match(matcher, line);
-       case SCORING_NOT_BODY:
-       case SCORING_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
                return !matcherprop_string_match(matcher, line);
        }
+       return FALSE;
 }
 
 /*
@@ -712,26 +620,26 @@ static gboolean matcherprop_match_line(MatcherProp * matcher, gchar * line)
   returns TRUE if the string matchs the MatcherList criteria
  */
 
-static gboolean matcherlist_match_line(MatcherList * matchers, gchar * line,
-                                      gboolean result)
+static gboolean matcherlist_match_line(MatcherList * matchers, gchar * line)
 {
        GSList * l;
 
        for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
                MatcherProp * matcher = (MatcherProp *) l->data;
 
-               if (matcherprop_criteria_body(matcher)) {
+               if (matcherprop_criteria_body(matcher) ||
+                   matcherprop_criteria_message(matcher)) {
                        if (matcherprop_match_line(matcher, line)) {
-                               if (!matchers->bool_and)
-                                       return TRUE;
-                       }
-                       else {
-                               if (matchers->bool_and)
-                                       return FALSE;
+                               matcher->result = TRUE;
                        }
                }
+                       
+               if (matcher->result) {
+                       if (!matchers->bool_and)
+                               return TRUE;
+               }
        }
-       return result;
+       return FALSE;
 }
 
 /*
@@ -739,22 +647,15 @@ static gboolean matcherlist_match_line(MatcherList * matchers, gchar * line,
   returns TRUE if one line of the body matchs the MatcherList criteria
  */
 
-static gboolean matcherlist_match_body(MatcherList * matchers, FILE * fp,
-                                      gboolean result)
+static gboolean matcherlist_match_body(MatcherList * matchers, FILE * fp)
 {
        gchar buf[BUFFSIZE];
 
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               if (matcherlist_match_line(matchers, buf, result)) {
-                       if (!matchers->bool_and)
-                               return TRUE;
-               }
-               else {
-                       if (matchers->bool_and)
-                               return FALSE;
-               }
-       }
-       return result;
+       while (fgets(buf, sizeof(buf), fp) != NULL)
+               if (matcherlist_match_line(matchers, buf))
+                       return TRUE;
+
+       return FALSE;
 }
 
 gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
@@ -777,43 +678,60 @@ gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
                        read_headers = TRUE;
                if (matcherprop_criteria_body(matcher))
                        read_body = TRUE;
+               if (matcherprop_criteria_message(matcher)) {
+                       read_headers = TRUE;
+                       read_body = TRUE;
+               }
+               matcher->result = FALSE;
        }
 
        if (!read_headers && !read_body)
                return result;
 
        file = procmsg_get_message_file(info);
-       g_return_if_fail(file != NULL);
+       if (file == NULL)
+               return FALSE;
 
-       if ((fp = fopen(file, "r")) == NULL) {
+       if ((fp = fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                g_free(file);
                return result;
        }
-       
+
        /* read the headers */
 
        if (read_headers) {
-               if (matcherlist_match_headers(matchers, fp, result)) {
-                       if (!matchers->bool_and)
-                               result = TRUE;
-               }
-               else {
-                       if (matchers->bool_and)
-                               result = FALSE;
-               }
+               if (matcherlist_match_headers(matchers, fp))
+                       read_body = FALSE;
        }
-       
+       else {
+               matcherlist_skip_headers(fp);
+       }
+
        /* read the body */
        if (read_body) {
-               if (matcherlist_match_body(matchers, fp, result)) {
-                       if (!matchers->bool_and)
-                               result = TRUE;
-               }
-               else {
-                       if (matchers->bool_and)
-                               result = FALSE;
-               }
+               matcherlist_match_body(matchers, fp);
+       }
+       
+       for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+               MatcherProp * matcher = (MatcherProp *) l->data;
+
+               if (matcherprop_criteria_headers(matcher) ||
+                   matcherprop_criteria_body(matcher)    ||
+                   matcherprop_criteria_message(matcher)) {
+                       if (matcher->result) {
+                               if (!matchers->bool_and) {
+                                       result = TRUE;
+                                       break;
+                               }
+                       }
+                       else {
+                               if (matchers->bool_and) {
+                                       result = FALSE;
+                                       break;
+                               }
+                       }
+               }                       
        }
 
        g_free(file);
@@ -835,6 +753,64 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
        else
                result = FALSE;
 
+       /* test the cached elements */
+
+       for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+               MatcherProp * matcher = (MatcherProp *) l->data;
+
+               switch(matcher->criteria) {
+               case MATCHCRITERIA_ALL:
+               case MATCHCRITERIA_UNREAD:
+               case MATCHCRITERIA_NOT_UNREAD:
+               case MATCHCRITERIA_NEW:
+               case MATCHCRITERIA_NOT_NEW:
+               case MATCHCRITERIA_MARKED:
+               case MATCHCRITERIA_NOT_MARKED:
+               case MATCHCRITERIA_DELETED:
+               case MATCHCRITERIA_NOT_DELETED:
+               case MATCHCRITERIA_REPLIED:
+               case MATCHCRITERIA_NOT_REPLIED:
+               case MATCHCRITERIA_FORWARDED:
+               case MATCHCRITERIA_NOT_FORWARDED:
+               case MATCHCRITERIA_SUBJECT:
+               case MATCHCRITERIA_NOT_SUBJECT:
+               case MATCHCRITERIA_FROM:
+               case MATCHCRITERIA_NOT_FROM:
+               case MATCHCRITERIA_TO:
+               case MATCHCRITERIA_NOT_TO:
+               case MATCHCRITERIA_CC:
+               case MATCHCRITERIA_NOT_CC:
+               case MATCHCRITERIA_TO_OR_CC:
+               case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+               case MATCHCRITERIA_AGE_GREATER:
+               case MATCHCRITERIA_AGE_LOWER:
+               case MATCHCRITERIA_NEWSGROUPS:
+               case MATCHCRITERIA_NOT_NEWSGROUPS:
+               case MATCHCRITERIA_INREPLYTO:
+               case MATCHCRITERIA_NOT_INREPLYTO:
+               case MATCHCRITERIA_REFERENCES:
+               case MATCHCRITERIA_NOT_REFERENCES:
+               case MATCHCRITERIA_SCORE_GREATER:
+               case MATCHCRITERIA_SCORE_LOWER:
+               case MATCHCRITERIA_SCORE_EQUAL:
+               case MATCHCRITERIA_SIZE_GREATER:
+               case MATCHCRITERIA_SIZE_SMALLER:
+               case MATCHCRITERIA_SIZE_EQUAL:
+               case MATCHCRITERIA_EXECUTE:
+               case MATCHCRITERIA_NOT_EXECUTE:
+                       if (matcherprop_match(matcher, info)) {
+                               if (!matchers->bool_and) {
+                                       return TRUE;
+                               }
+                       }
+                       else {
+                               if (matchers->bool_and) {
+                                       return FALSE;
+                               }
+                       }
+               }
+       }
+
        /* test the condition on the file */
 
        if (matcherlist_match_file(matchers, info, result)) {
@@ -846,65 +822,456 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
                        return FALSE;
        }
 
-       /* test the cached elements */
+       return result;
+}
 
-       for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
-               MatcherProp * matcher = (MatcherProp *) l->data;
 
-               if (matcherprop_match(matcher, info)) {
-                       if (!matchers->bool_and) {
-                               result = TRUE;
+gchar * matcherprop_to_string(MatcherProp * matcher)
+{
+       gchar * matcher_str = NULL;
+       gchar * criteria_str;
+       gchar * matchtype_str;
+       int i;
+       gchar * p;
+       gint count;
+       gchar * expr_str;
+       gchar * out;
+
+       criteria_str = NULL;
+       for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
+           i++) {
+               if (matchparser_tab[i].id == matcher->criteria)
+                       criteria_str = matchparser_tab[i].str;
+       }
+       if (criteria_str == NULL)
+               return NULL;
+
+       switch(matcher->criteria) {
+       case MATCHCRITERIA_AGE_GREATER:
+       case MATCHCRITERIA_AGE_LOWER:
+       case MATCHCRITERIA_SCORE_GREATER:
+       case MATCHCRITERIA_SCORE_LOWER:
+       case MATCHCRITERIA_SCORE_EQUAL:
+       case MATCHCRITERIA_SIZE_GREATER:
+       case MATCHCRITERIA_SIZE_SMALLER:
+       case MATCHCRITERIA_SIZE_EQUAL:
+               return g_strdup_printf("%s %i", criteria_str, matcher->value);
+       case MATCHCRITERIA_ALL:
+       case MATCHCRITERIA_UNREAD:
+       case MATCHCRITERIA_NOT_UNREAD:
+       case MATCHCRITERIA_NEW:
+       case MATCHCRITERIA_NOT_NEW:
+       case MATCHCRITERIA_MARKED:
+       case MATCHCRITERIA_NOT_MARKED:
+       case MATCHCRITERIA_DELETED:
+       case MATCHCRITERIA_NOT_DELETED:
+       case MATCHCRITERIA_REPLIED:
+       case MATCHCRITERIA_NOT_REPLIED:
+       case MATCHCRITERIA_FORWARDED:
+       case MATCHCRITERIA_NOT_FORWARDED:
+               return g_strdup(criteria_str);
+       case MATCHCRITERIA_EXECUTE:
+       case MATCHCRITERIA_NOT_EXECUTE:
+               return g_strdup_printf("%s \"%s\"", criteria_str, matcher->expr);
+       }
+
+       matchtype_str = NULL;
+       for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
+           i++) {
+               if (matchparser_tab[i].id == matcher->matchtype)
+                       matchtype_str = matchparser_tab[i].str;
+       }
+
+       if (matchtype_str == NULL)
+               return NULL;
+
+       switch (matcher->matchtype) {
+       case MATCHTYPE_MATCH:
+       case MATCHTYPE_MATCHCASE:
+       case MATCHTYPE_REGEXP:
+       case MATCHTYPE_REGEXPCASE:
+               if (matcher->header)
+                       matcher_str =
+                               g_strdup_printf("%s \"%s\" %s \"%s\"",
+                                          criteria_str, matcher->header,
+                                          matchtype_str, matcher->expr);
+               else
+                       matcher_str =
+                               g_strdup_printf("%s %s \"%s\"", criteria_str,
+                                               matchtype_str, matcher->expr);
+               break;
+       }
+
+       return matcher_str;
+}
+
+gchar * matcherlist_to_string(MatcherList * matchers)
+{
+       gint count;
+       gchar ** vstr;
+       GSList * l;
+       gchar ** cur_str;
+       gchar * result;
+
+       count = g_slist_length(matchers->matchers);
+       vstr = g_new(gchar *, count + 1);
+
+       for (l = matchers->matchers, cur_str = vstr ; l != NULL ;
+            l = g_slist_next(l), cur_str ++) {
+               *cur_str = matcherprop_to_string((MatcherProp *) l->data);
+               if (*cur_str == NULL)
+                       break;
+       }
+       *cur_str = NULL;
+       
+       if (matchers->bool_and)
+               result = g_strjoinv(" & ", vstr);
+       else
+               result = g_strjoinv(" | ", vstr);
+
+       for(cur_str = vstr ; *cur_str != NULL ; cur_str ++)
+               g_free(*cur_str);
+       g_free(vstr);
+
+       return result;
+}
+
+#define STRLEN_ZERO(s) ((s) ? strlen(s) : 0)
+#define STRLEN_DEFAULT(s,d) ((s) ? strlen(s) : STRLEN_ZERO(d))
+/* matching_build_command() - preferably cmd should be unescaped */
+gchar * matching_build_command(gchar * cmd, MsgInfo * info)
+{
+       gchar * s = cmd;
+       gchar * filename = NULL;
+       gchar * processed_cmd;
+       gchar * p;
+       gint size;
+
+       const gchar *const no_subject    = _("(none)") ;
+       const gchar *const no_from       = _("(none)") ;
+       const gchar *const no_to         = _("(none)") ;
+       const gchar *const no_cc         = _("(none)") ;
+       const gchar *const no_date       = _("(none)") ;
+       const gchar *const no_msgid      = _("(none)") ;
+       const gchar *const no_newsgroups = _("(none)") ;
+       const gchar *const no_references = _("(none)") ;
+
+       size = STRLEN_ZERO(cmd) + 1;
+       while (*s != '\0') {
+               if (*s == '%') {
+                       s++;
+                       switch (*s) {
+                       case '%':
+                               size -= 1;
+                               break;
+                       case 's': /* subject */
+                               size += STRLEN_DEFAULT(info->subject, no_subject) - 2;
+                               break;
+                       case 'f': /* from */
+                               size += STRLEN_DEFAULT(info->from, no_from) - 2;
+                               break;
+                       case 't': /* to */
+                               size += STRLEN_DEFAULT(info->to, no_to) - 2;
+                               break;
+                       case 'c': /* cc */
+                               size += STRLEN_DEFAULT(info->cc, no_cc) - 2;
+                               break;
+                       case 'd': /* date */
+                               size += STRLEN_DEFAULT(info->date, no_date) - 2;
+                               break;
+                       case 'i': /* message-id */
+                               size += STRLEN_DEFAULT(info->msgid, no_msgid) - 2;
+                               break;
+                       case 'n': /* newsgroups */
+                               size += STRLEN_DEFAULT(info->newsgroups, no_newsgroups) - 2;
+                               break;
+                       case 'r': /* references */
+                               size += STRLEN_DEFAULT(info->references, no_references) - 2;
+                               break;
+                       case 'F': /* file */
+                               filename = folder_item_fetch_msg(info->folder,
+                                                                info->msgnum);
+                               
+                               if (filename == NULL) {
+                                       g_warning(_("filename is not set"));
+                                       return NULL;
+                               }
+                               else
+                                       size += strlen(filename) - 2;
                                break;
                        }
+                       s++;
                }
-               else {
-                       if (matchers->bool_and) {
-                               result = FALSE;
+               else s++;
+       }
+
+
+       processed_cmd = g_new0(gchar, size);
+       s = cmd;
+       p = processed_cmd;
+
+       while (*s != '\0') {
+               if (*s == '%') {
+                       s++;
+                       switch (*s) {
+                       case '%':
+                               *p = '%';
+                               p++;
+                               break;
+                       case 's': /* subject */
+                               if (info->subject != NULL)
+                                       strcpy(p, info->subject);
+                               else
+                                       strcpy(p, no_subject);
+                               p += strlen(p);
+                               break;
+                       case 'f': /* from */
+                               if (info->from != NULL)
+                                       strcpy(p, info->from);
+                               else
+                                       strcpy(p, no_from);
+                               p += strlen(p);
+                               break;
+                       case 't': /* to */
+                               if (info->to != NULL)
+                                       strcpy(p, info->to);
+                               else
+                                       strcpy(p, no_to);
+                               p += strlen(p);
+                               break;
+                       case 'c': /* cc */
+                               if (info->cc != NULL)
+                                       strcpy(p, info->cc);
+                               else
+                                       strcpy(p, no_cc);
+                               p += strlen(p);
+                               break;
+                       case 'd': /* date */
+                               if (info->date != NULL)
+                                       strcpy(p, info->date);
+                               else
+                                       strcpy(p, no_date);
+                               p += strlen(p);
+                               break;
+                       case 'i': /* message-id */
+                               if (info->msgid != NULL)
+                                       strcpy(p, info->msgid);
+                               else
+                                       strcpy(p, no_msgid);
+                               p += strlen(p);
+                               break;
+                       case 'n': /* newsgroups */
+                               if (info->newsgroups != NULL)
+                                       strcpy(p, info->newsgroups);
+                               else
+                                       strcpy(p, no_newsgroups);
+                               p += strlen(p);
+                               break;
+                       case 'r': /* references */
+                               if (info->references != NULL)
+                                       strcpy(p, info->references);
+                               else
+                                       strcpy(p, no_references);
+                               p += strlen(p);
+                               break;
+                       case 'F': /* file */
+                               strcpy(p, filename);
+                               p += strlen(p);
+                               g_free(filename);
+                               break;
+                       default:
+                               *p = '%';
+                               p++;
+                               *p = *s;
+                               p++;
                                break;
                        }
+                       s++;
+               }
+               else {
+                       *p = *s;
+                       p++;
+                       s++;
                }
        }
 
-       return result;
+       debug_print("*** exec string \"%s\"\n", processed_cmd);
+       return processed_cmd;
+}
+#undef STRLEN_DEFAULT
+#undef STRLEN_ZERO
+
+/* ************************************************************ */
+
+static void prefs_scoring_write(FILE * fp, GSList * prefs_scoring)
+{
+       GSList * cur;
+
+       for (cur = prefs_scoring; cur != NULL; cur = cur->next) {
+               gchar *scoring_str;
+               ScoringProp * prop;
+
+               prop = (ScoringProp *) cur->data;
+               scoring_str = scoringprop_to_string(prop);
+               if (fputs(scoring_str, fp) == EOF ||
+                   fputc('\n', fp) == EOF) {
+                       FILE_OP_ERROR("scoring config", "fputs || fputc");
+                       g_free(scoring_str);
+                       return;
+               }
+               g_free(scoring_str);
+       }
 }
 
-#ifdef 0
-static void matcherprop_print(MatcherProp * matcher)
+static void prefs_filtering_write(FILE * fp, GSList * prefs_scoring)
 {
-  int i;
+       GSList * cur;
 
-       if (matcher == NULL) {
-               printf("no matcher\n");
-               return;
+       for (cur = prefs_scoring; cur != NULL; cur = cur->next) {
+               gchar *filtering_str;
+               FilteringProp * prop;
+
+               if (NULL == (prop = (FilteringProp *) cur->data))
+                       continue;
+               
+               if (NULL == (filtering_str = filteringprop_to_string(prop)))
+                       continue;
+               
+               if (fputs(filtering_str, fp) == EOF ||
+                   fputc('\n', fp) == EOF) {
+                       FILE_OP_ERROR("filtering config", "fputs || fputc");
+                       g_free(filtering_str);
+                       return;
+               }
+               g_free(filtering_str);
        }
+}
 
-       switch (matcher->matchtype) {
-       case SCORING_MATCH:
-               printf("match\n");
-               break;
-       case SCORING_REGEXP:
-               printf("regexp\n");
-               break;
-       case SCORING_MATCHCASE:
-               printf("matchcase\n");
-               break;
-       case SCORING_REGEXPCASE:
-               printf("regexpcase\n");
-               break;
+static gboolean prefs_matcher_write_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       FILE * fp = data;
+       gchar * id;
+       GSList * prefs_scoring;
+       GSList * prefs_filtering;
+
+       if (node != NULL) {
+               item = node->data;
+               /* prevent from the warning */
+               if (item->path == NULL)
+                       return FALSE;
+               id = folder_item_get_identifier(item);
+               if (id == NULL)
+                       return FALSE;
+               prefs_scoring = item->prefs->scoring;
+               prefs_filtering = item->prefs->processing;
+       }
+       else {
+               item = NULL;
+               id = g_strdup("global"); /* because it is g_freed */
+               prefs_scoring = global_scoring;
+               prefs_filtering = global_processing;
        }
 
-       for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
-           i++) {
-               if (matchparser_tab[i].id == matcher->criteria)
-                       printf("%s\n", matchparser_tab[i].str);
+       if (prefs_filtering != NULL || prefs_scoring != NULL) {
+               fprintf(fp, "[%s]\n", id);
+
+               prefs_filtering_write(fp, prefs_filtering);
+               prefs_scoring_write(fp, prefs_scoring);
+
+               fputc('\n', fp);
+       }
+
+       g_free(id);
+
+       return FALSE;
+}
+
+static void prefs_matcher_save(FILE * fp)
+{
+       GList * cur;
+
+       for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+               Folder *folder;
+
+               folder = (Folder *) cur->data;
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                               prefs_matcher_write_func, fp);
+       }
+       prefs_matcher_write_func(NULL, fp);
+}
+
+
+void prefs_matcher_write_config(void)
+{
+       gchar *rcpath;
+       PrefFile *pfile;
+       GSList *cur;
+       ScoringProp * prop;
+
+       debug_print("Writing matcher configuration...\n");
+
+       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                            MATCHER_RC, NULL);
+
+       if ((pfile = prefs_write_open(rcpath)) == NULL) {
+               g_warning(_("failed to write configuration to file\n"));
+               g_free(rcpath);
+               return;
+       }
+
+
+       prefs_matcher_save(pfile->fp);
+
+       g_free(rcpath);
+
+       if (prefs_write_close(pfile) < 0) {
+               g_warning(_("failed to write configuration to file\n"));
+               return;
        }
+}
 
-       if (matcher->expr)
-               printf("expr : %s\n", matcher->expr);
+/* ******************************************************************* */
 
-       printf("age: %i\n", matcher->age);
+void prefs_matcher_read_config(void)
+{
+       gchar * rcpath;
+       FILE * f;
 
-       printf("compiled : %s\n", matcher->preg != NULL ? "yes" : "no");
-       printf("error: %i\n",  matcher->error);
+       prefs_scoring_clear();
+       prefs_filtering_clear();
+
+       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MATCHER_RC, NULL);
+       f = fopen(rcpath, "rb");
+       g_free(rcpath);
+
+       if (f != NULL) {
+               matcher_parser_start_parsing(f);
+               fclose(f);
+       }
+       else {
+               /* previous version compatibily */
+
+               /* printf("reading filtering\n"); */
+               rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                    FILTERING_RC, NULL);
+               f = fopen(rcpath, "rb");
+               g_free(rcpath);
+               
+               if (f != NULL) {
+                       matcher_parser_start_parsing(f);
+                       fclose(matcher_parserin);
+               }
+               
+               /* printf("reading scoring\n"); */
+               rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                    SCORING_RC, NULL);
+               f = fopen(rcpath, "rb");
+               g_free(rcpath);
+               
+               if (f != NULL) {
+                       matcher_parser_start_parsing(f);
+                       fclose(matcher_parserin);
+               }
+       }
 }
-#endif