revert matcher.c and matcher_parse_lex.l to previous revision
[claws.git] / src / matcher.c
index ccd394da63edc4a0d90e170b0cee8e932065dcde..46605fe3085addc0afb900c816844bc9633d563c 100644 (file)
@@ -1,30 +1,3 @@
-/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto & The Sylpheed Claws Team
- *
- * 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.
- */
-
-/* 
- * initial     Hoa             initial
- *
- * 07/18/01    Alfons          when we want a file name from a MsgInfo, get that
- *                             from MsgInfo->folder if the message is being filtered
- *                             from incorporation. also some more safe string checking.
- */
-
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -34,6 +7,8 @@
 #include "procheader.h"
 #include "matcher.h"
 #include "intl.h"
+#include "matcher_parser.h"
+#include "prefs.h"
 
 struct _MatchParser {
        gint id;
@@ -44,405 +19,129 @@ typedef struct _MatchParser MatchParser;
 
 static MatchParser matchparser_tab[] = {
        /* msginfo flags */
-       {MATCHING_ALL, "all"},
-       {MATCHING_UNREAD, "unread"},
-       {MATCHING_NOT_UNREAD, "~unread"},
-       {MATCHING_NEW, "new"},
-       {MATCHING_NOT_NEW, "~new"},
-       {MATCHING_MARKED, "marked"},
-       {MATCHING_NOT_MARKED, "~marked"},
-       {MATCHING_DELETED, "deleted"},
-       {MATCHING_NOT_DELETED, "~deleted"},
-       {MATCHING_REPLIED, "replied"},
-       {MATCHING_NOT_REPLIED, "~replied"},
-       {MATCHING_FORWARDED, "forwarded"},
-       {MATCHING_NOT_FORWARDED, "~forwarded"},
+       {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 */
-       {MATCHING_SUBJECT, "subject"},
-       {MATCHING_NOT_SUBJECT, "~subject"},
-       {MATCHING_FROM, "from"},
-       {MATCHING_NOT_FROM, "~from"},
-       {MATCHING_TO, "to"},
-       {MATCHING_NOT_TO, "~to"},
-       {MATCHING_CC, "cc"},
-       {MATCHING_NOT_CC, "~cc"},
-       {MATCHING_TO_OR_CC, "to_or_cc"},
-       {MATCHING_NOT_TO_AND_NOT_CC, "~to_or_cc"},
-       {MATCHING_AGE_GREATER, "age_greater"},
-       {MATCHING_AGE_LOWER, "age_lower"},
-       {MATCHING_NEWSGROUPS, "newsgroups"},
-       {MATCHING_NOT_NEWSGROUPS, "~newsgroups"},
-       {MATCHING_INREPLYTO, "inreplyto"},
-       {MATCHING_NOT_INREPLYTO, "~inreplyto"},
-       {MATCHING_REFERENCES, "references"},
-       {MATCHING_NOT_REFERENCES, "~references"},
-       {MATCHING_SCORE_GREATER, "score_greater"},
-       {MATCHING_SCORE_LOWER, "score_lower"},
+       {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"},
 
        /* content have to be read */
-       {MATCHING_HEADER, "header"},
-       {MATCHING_NOT_HEADER, "~header"},
-       {MATCHING_HEADERS_PART, "headers_part"},
-       {MATCHING_NOT_HEADERS_PART, "~headers_part"},
-       {MATCHING_MESSAGE, "message"},
-       {MATCHING_NOT_MESSAGE, "~message"},
-       {MATCHING_BODY_PART, "body_part"},
-       {MATCHING_NOT_BODY_PART, "~body_part"},
-       {MATCHING_EXECUTE, "execute"},
-       {MATCHING_NOT_EXECUTE, "~execute"},
+       {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 */
-       {MATCHING_MATCHCASE, "matchcase"},
-       {MATCHING_MATCH, "match"},
-       {MATCHING_REGEXPCASE, "regexpcase"},
-       {MATCHING_REGEXP, "regexp"},
-
-       /* actions */
-       {MATCHING_SCORE, "score"},
+       {MATCHTYPE_MATCHCASE, "matchcase"},
+       {MATCHTYPE_MATCH, "match"},
+       {MATCHTYPE_REGEXPCASE, "regexpcase"},
+       {MATCHTYPE_REGEXP, "regexp"},
 
        /* actions */
-       {MATCHING_ACTION_MOVE, "move"},
-       {MATCHING_ACTION_COPY, "copy"},
-       {MATCHING_ACTION_DELETE, "delete"},
-       {MATCHING_ACTION_MARK, "mark"},
-       {MATCHING_ACTION_UNMARK, "unmark"},
-       {MATCHING_ACTION_MARK_AS_READ, "mark_as_read"},
-       {MATCHING_ACTION_MARK_AS_UNREAD, "mark_as_unread"},
-       {MATCHING_ACTION_FORWARD, "forward"},
-       {MATCHING_ACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},
-       /*      {MATCHING_EXECUTE, "execute"}, */
+       {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_BOUNCE, "bounce"}
 };
 
-gchar * get_matchparser_tab_str(gint id)
-{
-       gint i;
-
-       for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
-           i++) {
-               if (matchparser_tab[i].id == id)
-                       return matchparser_tab[i].str;
-       }
-       return NULL;
-}
-
-
-
 /*
   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)
-{
-       MatcherProp * prop;
-       gchar * tmp;
-       gint key;
-       gint value;
-       gchar * expr;
-       gint match;
-       gchar * header = NULL;
-       
-       tmp = * str;
-       key = matcher_parse_keyword(&tmp);
-       if (tmp == NULL) {
-               * str = NULL;
-               return NULL;
-       }
-
-       switch (key) {
-       case MATCHING_AGE_LOWER:
-       case MATCHING_AGE_GREATER:
-       case MATCHING_SCORE_LOWER:
-       case MATCHING_SCORE_GREATER:
-               value = matcher_parse_number(&tmp);
-               if (tmp == NULL) {
-                       * str = NULL;
-                       return NULL;
-               }
-               *str = tmp;
-
-               prop = matcherprop_new(key, NULL, 0, NULL, value);
-
-               return prop;
-
-       case MATCHING_ALL:
-       case MATCHING_UNREAD:
-       case MATCHING_NOT_UNREAD:
-       case MATCHING_NEW:
-       case MATCHING_NOT_NEW:
-       case MATCHING_MARKED:
-       case MATCHING_NOT_MARKED:
-       case MATCHING_DELETED:
-       case MATCHING_NOT_DELETED:
-       case MATCHING_REPLIED:
-       case MATCHING_NOT_REPLIED:
-       case MATCHING_FORWARDED:
-       case MATCHING_NOT_FORWARDED:
-               prop = matcherprop_new(key, NULL, 0, NULL, 0);
-               *str = tmp;
-
-               return prop;
-
-       case MATCHING_SUBJECT:
-       case MATCHING_NOT_SUBJECT:
-       case MATCHING_FROM:
-       case MATCHING_NOT_FROM:
-       case MATCHING_TO:
-       case MATCHING_NOT_TO:
-       case MATCHING_CC:
-       case MATCHING_NOT_CC:
-       case MATCHING_TO_OR_CC:
-       case MATCHING_NOT_TO_AND_NOT_CC:
-       case MATCHING_NEWSGROUPS:
-       case MATCHING_NOT_NEWSGROUPS:
-       case MATCHING_INREPLYTO:
-       case MATCHING_NOT_REFERENCES:
-       case MATCHING_REFERENCES:
-       case MATCHING_NOT_INREPLYTO:
-       case MATCHING_MESSAGE:
-       case MATCHING_NOT_MESSAGE:
-       case MATCHING_EXECUTE:
-       case MATCHING_NOT_EXECUTE:
-       case MATCHING_HEADERS_PART:
-       case MATCHING_NOT_HEADERS_PART:
-       case MATCHING_BODY_PART:
-       case MATCHING_NOT_BODY_PART:
-       case MATCHING_HEADER:
-       case MATCHING_NOT_HEADER:
-               if ((key == MATCHING_HEADER) || (key == MATCHING_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;
-               }
+  header "x-mailing" match "toto" score -10
+  subject match "regexp" & to regexp "regexp" score 50
+  subject match "regexp" | to regexpcase "regexp" | age_sup 5 score 30
 
-               switch(match) {
-               case MATCHING_REGEXP:
-               case MATCHING_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 MATCHING_MATCH:
-               case MATCHING_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 * get_matchparser_tab_str(gint id)
 {
-       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;
-
-       while (!matcher_is_blank(*p) && (*p != '\0'))
-               p++;
-       
-       match = -1;
        for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
            i++) {
-               if ((strlen(matchparser_tab[i].str) == p - start) &&
-                   (strncasecmp(matchparser_tab[i].str, start,
-                                p - start) == 0)) {
-                               match = i;
-                               break;
-                       }
-       }
-
-       if (match == -1) {
-               * str = NULL;
-               return 0;
-       }
-
-       *p = '\0';
-
-       *str += p - dup + 1;
-       return matchparser_tab[match].id;
-}
-
-gint matcher_parse_number(gchar ** str)
-{
-       gchar * p;
-       gchar * dup;
-       gchar * start;
-
-       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 (matchparser_tab[i].id == id)
+                       return matchparser_tab[i].str;
        }
-       if (*p == '-' || *p == '+')
-               p++;
-       while (isdigit(*p))
-               p++;
-
-       *p = '\0';
-
-       *str += p - dup + 1;
-       return atoi(start);
+       return NULL;
 }
 
-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 *matcher_unescape_str(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;
-               return NULL;
-       }
-
-       p ++;
-       start = p;
-       while (*p != '/') {
-               if (*p == '\\')
-                       p++;
-               p++;
-       }
-       *p = '\0';
-
-       *str += p - dup + 2;
-       return g_strdup(start);
-}
-
-gchar * matcher_parse_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++ = '\\';
+                       else if (*src == 'n')
+                               *dst++ = '\n';
+                       else if (*src == 'r') 
+                               *dst++ = '\r';
+                       else if (*src == '\'' || *src == '\"')
+                               *dst++ = *src;
+                       else {
+                               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 **************** */
@@ -497,13 +196,13 @@ static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
                return FALSE;
 
        switch(prop->matchtype) {
-       case MATCHING_REGEXPCASE:
-       case MATCHING_REGEXP:
+       case MATCHTYPE_REGEXPCASE:
+       case MATCHTYPE_REGEXP:
                if (!prop->preg && (prop->error == 0)) {
                        prop->preg = g_new0(regex_t, 1);
                        if (regcomp(prop->preg, prop->expr,
                                    REG_NOSUB | REG_EXTENDED
-                                   | ((prop->matchtype == MATCHING_REGEXPCASE)
+                                   | ((prop->matchtype == MATCHTYPE_REGEXPCASE)
                                    ? REG_ICASE : 0)) != 0) {
                                prop->error = 1;
                                g_free(prop->preg);
@@ -517,10 +216,10 @@ static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
                else
                        return FALSE;
 
-       case MATCHING_MATCH:
+       case MATCHTYPE_MATCH:
                return (strstr(str, prop->expr) != NULL);
 
-       case MATCHING_MATCHCASE:
+       case MATCHTYPE_MATCHCASE:
                str2 = alloca(strlen(prop->expr) + 1);
                strcpy(str2, prop->expr);
                g_strup(str2);
@@ -536,8 +235,13 @@ static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
 
 gboolean matcherprop_match_execute(MatcherProp * prop, MsgInfo * info)
 {
+       gchar * file;
        gchar * cmd;
 
+       file = procmsg_get_message_file(info);
+       if (file == NULL)
+               return FALSE;
+
        cmd = matching_build_command(prop->expr, info);
        if (cmd == NULL)
                return FALSE;
@@ -553,79 +257,81 @@ gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info)
        time_t t;
 
        switch(prop->criteria) {
-       case MATCHING_ALL:
+       case MATCHCRITERIA_ALL:
                return 1;
-       case MATCHING_UNREAD:
+       case MATCHCRITERIA_UNREAD:
                return MSG_IS_UNREAD(info->flags);
-       case MATCHING_NOT_UNREAD:
+       case MATCHCRITERIA_NOT_UNREAD:
                return !MSG_IS_UNREAD(info->flags);
-       case MATCHING_NEW:
+       case MATCHCRITERIA_NEW:
                return MSG_IS_NEW(info->flags);
-       case MATCHING_NOT_NEW:
+       case MATCHCRITERIA_NOT_NEW:
                return !MSG_IS_NEW(info->flags);
-       case MATCHING_MARKED:
+       case MATCHCRITERIA_MARKED:
                return MSG_IS_MARKED(info->flags);
-       case MATCHING_NOT_MARKED:
+       case MATCHCRITERIA_NOT_MARKED:
                return !MSG_IS_MARKED(info->flags);
-       case MATCHING_DELETED:
+       case MATCHCRITERIA_DELETED:
                return MSG_IS_DELETED(info->flags);
-       case MATCHING_NOT_DELETED:
+       case MATCHCRITERIA_NOT_DELETED:
                return !MSG_IS_DELETED(info->flags);
-       case MATCHING_REPLIED:
+       case MATCHCRITERIA_REPLIED:
                return MSG_IS_REPLIED(info->flags);
-       case MATCHING_NOT_REPLIED:
+       case MATCHCRITERIA_NOT_REPLIED:
                return !MSG_IS_REPLIED(info->flags);
-       case MATCHING_FORWARDED:
+       case MATCHCRITERIA_FORWARDED:
                return MSG_IS_FORWARDED(info->flags);
-       case MATCHING_NOT_FORWARDED:
+       case MATCHCRITERIA_NOT_FORWARDED:
                return !MSG_IS_FORWARDED(info->flags);
-       case MATCHING_SUBJECT:
+       case MATCHCRITERIA_SUBJECT:
                return matcherprop_string_match(prop, info->subject);
-       case MATCHING_NOT_SUBJECT:
+       case MATCHCRITERIA_NOT_SUBJECT:
                return !matcherprop_string_match(prop, info->subject);
-       case MATCHING_FROM:
+       case MATCHCRITERIA_FROM:
                return matcherprop_string_match(prop, info->from);
-       case MATCHING_NOT_FROM:
+       case MATCHCRITERIA_NOT_FROM:
                return !matcherprop_string_match(prop, info->from);
-       case MATCHING_TO:
+       case MATCHCRITERIA_TO:
                return matcherprop_string_match(prop, info->to);
-       case MATCHING_NOT_TO:
+       case MATCHCRITERIA_NOT_TO:
                return !matcherprop_string_match(prop, info->to);
-       case MATCHING_CC:
+       case MATCHCRITERIA_CC:
                return matcherprop_string_match(prop, info->cc);
-       case MATCHING_NOT_CC:
+       case MATCHCRITERIA_NOT_CC:
                return !matcherprop_string_match(prop, info->cc);
-       case MATCHING_TO_OR_CC:
+       case MATCHCRITERIA_TO_OR_CC:
                return matcherprop_string_match(prop, info->to)
                        || matcherprop_string_match(prop, info->cc);
-       case MATCHING_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 MATCHING_AGE_GREATER:
+       case MATCHCRITERIA_AGE_GREATER:
                t = time(NULL);
                return ((t - info->date_t) / (60 * 60 * 24)) >= prop->value;
-       case MATCHING_AGE_LOWER:
+       case MATCHCRITERIA_AGE_LOWER:
                t = time(NULL);
                return ((t - info->date_t) / (60 * 60 * 24)) <= prop->value;
-       case MATCHING_SCORE_GREATER:
+       case MATCHCRITERIA_SCORE_GREATER:
                return info->score >= prop->value;
-       case MATCHING_SCORE_LOWER:
+       case MATCHCRITERIA_SCORE_LOWER:
                return info->score <= prop->value;
-       case MATCHING_NEWSGROUPS:
+       case MATCHCRITERIA_SCORE_EQUAL:
+               return info->score == prop->value;
+       case MATCHCRITERIA_NEWSGROUPS:
                return matcherprop_string_match(prop, info->newsgroups);
-       case MATCHING_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
                return !matcherprop_string_match(prop, info->newsgroups);
-       case MATCHING_INREPLYTO:
+       case MATCHCRITERIA_INREPLYTO:
                return matcherprop_string_match(prop, info->inreplyto);
-       case MATCHING_NOT_INREPLYTO:
+       case MATCHCRITERIA_NOT_INREPLYTO:
                return !matcherprop_string_match(prop, info->inreplyto);
-       case MATCHING_REFERENCES:
+       case MATCHCRITERIA_REFERENCES:
                return matcherprop_string_match(prop, info->references);
-       case MATCHING_NOT_REFERENCES:
+       case MATCHCRITERIA_NOT_REFERENCES:
                return !matcherprop_string_match(prop, info->references);
-       case MATCHING_EXECUTE:
+       case MATCHCRITERIA_EXECUTE:
                return matcherprop_match_execute(prop, info);
-       case MATCHING_NOT_EXECUTE:
+       case MATCHCRITERIA_NOT_EXECUTE:
                return !matcherprop_match_execute(prop, info);
        default:
                return 0;
@@ -635,61 +341,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 = TRUE;
-       GSList * l;
-
-       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 {
-                               for(l = matchers_list ; l != NULL ;
-                                   l = g_slist_next(l))
-                                       matcherprop_free((MatcherProp *)
-                                                        l->data);
-                               g_slist_free(matchers_list);
-                               * 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;
@@ -736,14 +387,14 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
        Header *header;
 
        switch(matcher->criteria) {
-       case MATCHING_HEADER:
-       case MATCHING_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 == MATCHING_HEADER)
+                       if (matcher->criteria == MATCHCRITERIA_HEADER)
                                result = matcherprop_string_match(matcher, header->body);
                        else
                                result = !matcherprop_string_match(matcher, header->body);
@@ -754,11 +405,11 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
                        procheader_header_free(header);
                }
                break;
-       case MATCHING_HEADERS_PART:
-       case MATCHING_MESSAGE:
+       case MATCHCRITERIA_HEADERS_PART:
+       case MATCHCRITERIA_MESSAGE:
                return matcherprop_string_match(matcher, buf);
-       case MATCHING_NOT_MESSAGE:
-       case MATCHING_NOT_HEADERS_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
                return !matcherprop_string_match(matcher, buf);
        }
        return FALSE;
@@ -772,10 +423,10 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
 static gboolean matcherprop_criteria_headers(MatcherProp * matcher)
 {
        switch(matcher->criteria) {
-       case MATCHING_HEADER:
-       case MATCHING_NOT_HEADER:
-       case MATCHING_HEADERS_PART:
-       case MATCHING_NOT_HEADERS_PART:
+       case MATCHCRITERIA_HEADER:
+       case MATCHCRITERIA_NOT_HEADER:
+       case MATCHCRITERIA_HEADERS_PART:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
                return TRUE;
        default:
                return FALSE;
@@ -785,8 +436,8 @@ static gboolean matcherprop_criteria_headers(MatcherProp * matcher)
 static gboolean matcherprop_criteria_message(MatcherProp * matcher)
 {
        switch(matcher->criteria) {
-       case MATCHING_MESSAGE:
-       case MATCHING_NOT_MESSAGE:
+       case MATCHCRITERIA_MESSAGE:
+       case MATCHCRITERIA_NOT_MESSAGE:
                return TRUE;
        default:
                return FALSE;
@@ -848,8 +499,8 @@ static gboolean matcherlist_match_headers(MatcherList * matchers, FILE * fp)
 static gboolean matcherprop_criteria_body(MatcherProp * matcher)
 {
        switch(matcher->criteria) {
-       case MATCHING_BODY_PART:
-       case MATCHING_NOT_BODY_PART:
+       case MATCHCRITERIA_BODY_PART:
+       case MATCHCRITERIA_NOT_BODY_PART:
                return TRUE;
        default:
                return FALSE;
@@ -864,11 +515,11 @@ static gboolean matcherprop_criteria_body(MatcherProp * matcher)
 static gboolean matcherprop_match_line(MatcherProp * matcher, gchar * line)
 {
        switch(matcher->criteria) {
-       case MATCHING_BODY_PART:
-       case MATCHING_MESSAGE:
+       case MATCHCRITERIA_BODY_PART:
+       case MATCHCRITERIA_MESSAGE:
                return matcherprop_string_match(matcher, line);
-       case MATCHING_NOT_BODY_PART:
-       case MATCHING_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
                return !matcherprop_string_match(matcher, line);
        }
        return FALSE;
@@ -925,12 +576,11 @@ gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
        GSList * l;
        FILE * fp;
        gchar * file;
-       gboolean is_incorporating = MSG_IS_FILTERING(info->flags);
-       
-       /* check which things we need to do */
+
+       /* file need to be read ? */
+
        read_headers = FALSE;
-       read_body    = FALSE;
-       
+       read_body = FALSE;
        for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
                MatcherProp * matcher = (MatcherProp *) l->data;
 
@@ -948,9 +598,7 @@ gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
        if (!read_headers && !read_body)
                return result;
 
-       file = is_incorporating ? g_strdup(info->folder) 
-               : procmsg_get_message_file(info);
-               
+       file = procmsg_get_message_file(info);
        if (file == NULL)
                return FALSE;
 
@@ -1020,41 +668,42 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
                MatcherProp * matcher = (MatcherProp *) l->data;
 
                switch(matcher->criteria) {
-               case MATCHING_ALL:
-               case MATCHING_UNREAD:
-               case MATCHING_NOT_UNREAD:
-               case MATCHING_NEW:
-               case MATCHING_NOT_NEW:
-               case MATCHING_MARKED:
-               case MATCHING_NOT_MARKED:
-               case MATCHING_DELETED:
-               case MATCHING_NOT_DELETED:
-               case MATCHING_REPLIED:
-               case MATCHING_NOT_REPLIED:
-               case MATCHING_FORWARDED:
-               case MATCHING_NOT_FORWARDED:
-               case MATCHING_SUBJECT:
-               case MATCHING_NOT_SUBJECT:
-               case MATCHING_FROM:
-               case MATCHING_NOT_FROM:
-               case MATCHING_TO:
-               case MATCHING_NOT_TO:
-               case MATCHING_CC:
-               case MATCHING_NOT_CC:
-               case MATCHING_TO_OR_CC:
-               case MATCHING_NOT_TO_AND_NOT_CC:
-               case MATCHING_AGE_GREATER:
-               case MATCHING_AGE_LOWER:
-               case MATCHING_NEWSGROUPS:
-               case MATCHING_NOT_NEWSGROUPS:
-               case MATCHING_INREPLYTO:
-               case MATCHING_NOT_INREPLYTO:
-               case MATCHING_REFERENCES:
-               case MATCHING_NOT_REFERENCES:
-               case MATCHING_SCORE_GREATER:
-               case MATCHING_SCORE_LOWER:
-               case MATCHING_EXECUTE:
-               case MATCHING_NOT_EXECUTE:
+               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_EXECUTE:
+               case MATCHCRITERIA_NOT_EXECUTE:
                        if (matcherprop_match(matcher, info)) {
                                if (!matchers->bool_and) {
                                        return TRUE;
@@ -1082,46 +731,6 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
        return result;
 }
 
-#if 0
-static void matcherprop_print(MatcherProp * matcher)
-{
-  int i;
-
-       if (matcher == NULL) {
-               printf("no matcher\n");
-               return;
-       }
-
-       switch (matcher->matchtype) {
-       case MATCHING_MATCH:
-               printf("match\n");
-               break;
-       case MATCHING_REGEXP:
-               printf("regexp\n");
-               break;
-       case MATCHING_MATCHCASE:
-               printf("matchcase\n");
-               break;
-       case MATCHING_REGEXPCASE:
-               printf("regexpcase\n");
-               break;
-       }
-
-       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 (matcher->expr)
-               printf("expr : %s\n", matcher->expr);
-
-       printf("age: %i\n", matcher->value;
-
-       printf("compiled : %s\n", matcher->preg != NULL ? "yes" : "no");
-       printf("error: %i\n",  matcher->error);
-}
-#endif
 
 gchar * matcherprop_to_string(MatcherProp * matcher)
 {
@@ -1144,25 +753,26 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
                return NULL;
 
        switch(matcher->criteria) {
-       case MATCHING_AGE_GREATER:
-       case MATCHING_AGE_LOWER:
-       case MATCHING_SCORE_GREATER:
-       case MATCHING_SCORE_LOWER:
+       case MATCHCRITERIA_AGE_GREATER:
+       case MATCHCRITERIA_AGE_LOWER:
+       case MATCHCRITERIA_SCORE_GREATER:
+       case MATCHCRITERIA_SCORE_LOWER:
+       case MATCHCRITERIA_SCORE_EQUAL:
                return g_strdup_printf("%s %i", criteria_str, matcher->value);
                break;
-       case MATCHING_ALL:
-       case MATCHING_UNREAD:
-       case MATCHING_NOT_UNREAD:
-       case MATCHING_NEW:
-       case MATCHING_NOT_NEW:
-       case MATCHING_MARKED:
-       case MATCHING_NOT_MARKED:
-       case MATCHING_DELETED:
-       case MATCHING_NOT_DELETED:
-       case MATCHING_REPLIED:
-       case MATCHING_NOT_REPLIED:
-       case MATCHING_FORWARDED:
-       case MATCHING_NOT_FORWARDED:
+       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);
        }
 
@@ -1177,8 +787,10 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
                return NULL;
 
        switch (matcher->matchtype) {
-       case MATCHING_MATCH:
-       case MATCHING_MATCHCASE:
+       case MATCHTYPE_MATCH:
+       case MATCHTYPE_MATCHCASE:
+       case MATCHTYPE_REGEXP:
+       case MATCHTYPE_REGEXPCASE:
                count = 0;
                for(p = matcher->expr; *p != 0 ; p++)
                        if (*p == '\"') count ++;
@@ -1209,8 +821,9 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
                
                break;
 
-       case MATCHING_REGEXP:
-       case MATCHING_REGEXPCASE:
+               /*
+       case MATCHTYPE_REGEXP:
+       case MATCHTYPE_REGEXPCASE:
 
                if (matcher->header)
                        matcher_str =
@@ -1223,6 +836,7 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
                                                matchtype_str, matcher->expr);
 
                break;
+               */
        }
 
        return matcher_str;
@@ -1259,18 +873,6 @@ gchar * matcherlist_to_string(MatcherList * matchers)
        return result;
 }
 
-static inline gint strlen_with_check(const gchar *expr, gint fline, const gchar *str)
-{
-       if (str) 
-               return strlen(str);
-       else {
-               debug_print("%s(%d) - invalid string %s\n", __FILE__, fline, expr);
-               return 0;
-       }
-}
-
-#define STRLEN_WITH_CHECK(expr) \
-       strlen_with_check(#expr, __LINE__, expr)
 
 gchar * matching_build_command(gchar * cmd, MsgInfo * info)
 {
@@ -1280,6 +882,8 @@ gchar * matching_build_command(gchar * cmd, MsgInfo * info)
        gchar * p;
        gint size;
 
+       matcher_unescape_str(cmd);
+
        size = strlen(cmd) + 1;
        while (*s != '\0') {
                if (*s == '%') {
@@ -1289,37 +893,35 @@ gchar * matching_build_command(gchar * cmd, MsgInfo * info)
                                size -= 1;
                                break;
                        case 's': /* subject */
-                               size += STRLEN_WITH_CHECK(info->subject) - 2;
+                               size += strlen(info->subject) - 2;
                                break;
                        case 'f': /* from */
-                               size += STRLEN_WITH_CHECK(info->from) - 2;
+                               size += strlen(info->from) - 2;
                                break;
                        case 't': /* to */
-                               size += STRLEN_WITH_CHECK(info->to) - 2;
+                               size += strlen(info->to) - 2;
                                break;
                        case 'c': /* cc */
-                               size += STRLEN_WITH_CHECK(info->cc) - 2;
+                               size += strlen(info->cc) - 2;
                                break;
                        case 'd': /* date */
-                               size += STRLEN_WITH_CHECK(info->date) - 2;
+                               size += strlen(info->date) - 2;
                                break;
                        case 'i': /* message-id */
-                               size += STRLEN_WITH_CHECK(info->msgid) - 2;
+                               size += strlen(info->msgid) - 2;
                                break;
                        case 'n': /* newsgroups */
-                               size += STRLEN_WITH_CHECK(info->newsgroups) - 2;
+                               size += strlen(info->newsgroups) - 2;
                                break;
                        case 'r': /* references */
-                               size += STRLEN_WITH_CHECK(info->references) - 2;
+                               size += strlen(info->references) - 2;
                                break;
                        case 'F': /* file */
-                               if (MSG_IS_FILTERING(info->flags))
-                                       filename = g_strdup(info->folder);
-                               else                                            
-                                       filename = folder_item_fetch_msg(info->folder, info->msgnum);
+                               filename = folder_item_fetch_msg(info->folder,
+                                                                info->msgnum);
                                
                                if (filename == NULL) {
-                                       debug_print(_("%s(%d) - filename is not set"), __FILE__, __LINE__);
+                                       g_warning(_("filename is not set"));
                                        return NULL;
                                }
                                else
@@ -1331,6 +933,7 @@ gchar * matching_build_command(gchar * cmd, MsgInfo * info)
                else s++;
        }
 
+
        processed_cmd = g_new0(gchar, size);
        s = cmd;
        p = processed_cmd;
@@ -1347,56 +950,56 @@ gchar * matching_build_command(gchar * cmd, MsgInfo * info)
                                if (info->subject != NULL)
                                        strcpy(p, info->subject);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'f': /* from */
                                if (info->from != NULL)
                                        strcpy(p, info->from);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 't': /* to */
                                if (info->to != NULL)
                                        strcpy(p, info->to);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'c': /* cc */
                                if (info->cc != NULL)
                                        strcpy(p, info->cc);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'd': /* date */
                                if (info->date != NULL)
                                        strcpy(p, info->date);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'i': /* message-id */
                                if (info->msgid != NULL)
                                        strcpy(p, info->msgid);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'n': /* newsgroups */
                                if (info->newsgroups != NULL)
                                        strcpy(p, info->newsgroups);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'r': /* references */
                                if (info->references != NULL)
                                        strcpy(p, info->references);
                                else
-                                       strcpy(p, "(none)");
+                                       strcpy(p, _("(none)"));
                                p += strlen(p);
                                break;
                        case 'F': /* file */
@@ -1419,17 +1022,187 @@ gchar * matching_build_command(gchar * cmd, MsgInfo * info)
                }
        }
 
-       g_free(filename);
+       debug_print("*** exec string \"%s\"\n", processed_cmd);
        return processed_cmd;
 }
 
 
+/* ************************************************************ */
+/* ************************************************************ */
+/* ************************************************************ */
+/* ************************************************************ */
 /* ************************************************************ */
 
-/*
-static void matcher_parse              (gchar * str)
+
+static void prefs_scoring_write(FILE * fp, GSList * prefs_scoring)
 {
-       matcher_parser_scan_string(str);
-       matcher_parserparse();
+       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);
+       }
+}
+
+static void prefs_filtering_write(FILE * fp, GSList * prefs_scoring)
+{
+       GSList * cur;
+
+       for (cur = prefs_scoring; cur != NULL; cur = cur->next) {
+               gchar *filtering_str;
+               FilteringProp * prop;
+
+               prop = (FilteringProp *) cur->data;
+               filtering_str = filteringprop_to_string(prop);
+               
+               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);
+       }
+}
+
+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;
+       }
+
+       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;
+       }
+}
+
+
+
+
+
+
+/* ******************************************************************* */
+
+void prefs_matcher_read_config(void)
+{
+       gchar * rcpath;
+       FILE * f;
+
+       prefs_scoring_clear();
+       prefs_filtering_clear();
+
+       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MATCHER_RC, NULL);
+       f = fopen(rcpath, "r");
+       g_free(rcpath);
+
+       if (f != NULL)
+               matcher_parser_start_parsing(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, "r");
+               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, "r");
+               g_free(rcpath);
+               
+               if (f != NULL) {
+                       matcher_parser_start_parsing(f);
+                       fclose(matcher_parserin);
+               }
+       }
 }
-*/