fix actions: escaping, forwarding, execute
[claws.git] / src / matcher.c
index 284f291a942012b3faf98edc9683b461375b8cb0..06b5f1244fa153d6b94a9acdadb058712e4dfdfc 100644 (file)
@@ -1,11 +1,39 @@
+/*
+ * 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>
 #include <errno.h>
-#include "utils.h"
 #include "defs.h"
+#include "utils.h"
 #include "procheader.h"
 #include "matcher.h"
+#include "intl.h"
 
 struct _MatchParser {
        gint id;
@@ -14,7 +42,7 @@ struct _MatchParser {
 
 typedef struct _MatchParser MatchParser;
 
-MatchParser matchparser_tab[] = {
+static MatchParser matchparser_tab[] = {
        /* msginfo flags */
        {MATCHING_ALL, "all"},
        {MATCHING_UNREAD, "unread"},
@@ -45,6 +73,12 @@ MatchParser matchparser_tab[] = {
        {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"},
 
        /* content have to be read */
        {MATCHING_HEADER, "header"},
@@ -55,6 +89,8 @@ MatchParser matchparser_tab[] = {
        {MATCHING_NOT_MESSAGE, "~message"},
        {MATCHING_BODY_PART, "body_part"},
        {MATCHING_NOT_BODY_PART, "~body_part"},
+       {MATCHING_EXECUTE, "execute"},
+       {MATCHING_NOT_EXECUTE, "~execute"},
 
        /* match type */
        {MATCHING_MATCHCASE, "matchcase"},
@@ -64,8 +100,34 @@ MatchParser matchparser_tab[] = {
 
        /* actions */
        {MATCHING_SCORE, "score"},
+
+       /* 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"}, */
 };
 
+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
 
@@ -90,7 +152,7 @@ MatcherProp * matcherprop_parse(gchar ** str)
        MatcherProp * prop;
        gchar * tmp;
        gint key;
-       gint age;
+       gint value;
        gchar * expr;
        gint match;
        gchar * header = NULL;
@@ -105,14 +167,16 @@ MatcherProp * matcherprop_parse(gchar ** str)
        switch (key) {
        case MATCHING_AGE_LOWER:
        case MATCHING_AGE_GREATER:
-               age = matcher_parse_number(&tmp);
+       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, age);
+               prop = matcherprop_new(key, NULL, 0, NULL, value);
 
                return prop;
 
@@ -146,8 +210,14 @@ MatcherProp * matcherprop_parse(gchar ** str)
        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:
@@ -234,11 +304,12 @@ gint matcher_parse_keyword(gchar ** str)
        match = -1;
        for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
            i++) {
-               if (strncasecmp(matchparser_tab[i].str, start,
-                               p - start) == 0) {
-                       match = i;
-                       break;
-               }
+               if ((strlen(matchparser_tab[i].str) == p - start) &&
+                   (strncasecmp(matchparser_tab[i].str, start,
+                                p - start) == 0)) {
+                               match = i;
+                               break;
+                       }
        }
 
        if (match == -1) {
@@ -336,6 +407,10 @@ gchar * matcher_parse_regexp(gchar ** str)
        return g_strdup(start);
 }
 
+/* matcher_parse_str() - parses a string until it hits a 
+ * terminating \". to unescape characters use \. The string
+ * should not be used directly: matcher_unescape_str() 
+ * returns a string that can be used directly. */
 gchar * matcher_parse_str(gchar ** str)
 {
        gchar * p;
@@ -358,28 +433,58 @@ gchar * matcher_parse_str(gchar ** str)
        p ++;
        start = p;
        dest = p;
-       while (*p != '"') {
+
+       for ( ; *p && *p != '\"'; p++, dest++) {
                if (*p == '\\') {
-                       p++;
+                       *dest++ = *p++;
                        *dest = *p;
                }
-               else
+               else 
                        *dest = *p;
-               dest++;
-               p++;
        }
        *dest = '\0';
-
+       
        *str += dest - dup + 2;
        return g_strdup(start);
 }
 
+gchar *matcher_unescape_str(gchar *str)
+{
+       gchar *tmp = alloca(strlen(str) + 1);
+       register gchar *src = tmp;
+       register gchar *dst = str;
+       
+       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;
+                       }                               
+               }
+       }
+       *dst = 0;
+       return str;
+}
+
 /* **************** data structure allocation **************** */
 
 
 MatcherProp * matcherprop_new(gint criteria, gchar * header,
                              gint matchtype, gchar * expr,
-                             int age)
+                             int value)
 {
        MatcherProp * prop;
 
@@ -395,7 +500,7 @@ MatcherProp * matcherprop_new(gint criteria, gchar * header,
                prop->expr = NULL;
        prop->matchtype = matchtype;
        prop->preg = NULL;
-       prop->age = age;
+       prop->value = value;
        prop->error = 0;
 
        return prop;
@@ -426,8 +531,8 @@ static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
                return FALSE;
 
        switch(prop->matchtype) {
-       case MATCHING_REGEXP:
        case MATCHING_REGEXPCASE:
+       case MATCHING_REGEXP:
                if (!prop->preg && (prop->error == 0)) {
                        prop->preg = g_new0(regex_t, 1);
                        if (regcomp(prop->preg, prop->expr,
@@ -463,6 +568,17 @@ static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
        }
 }
 
+gboolean matcherprop_match_execute(MatcherProp * prop, MsgInfo * info)
+{
+       gchar * cmd;
+
+       cmd = matching_build_command(prop->expr, info);
+       if (cmd == NULL)
+               return FALSE;
+
+       return (system(cmd) == 0);
+}
+
 /* match a message and his headers, hlist can be NULL if you don't
    want to use headers */
 
@@ -521,15 +637,30 @@ gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info)
                || matcherprop_string_match(prop, info->cc));
        case MATCHING_AGE_GREATER:
                t = time(NULL);
-               return ((t - info->date_t) / (60 * 60 * 24)) >= prop->age;
+               return ((t - info->date_t) / (60 * 60 * 24)) >= prop->value;
        case MATCHING_AGE_LOWER:
                t = time(NULL);
-               return ((t - info->date_t) / (60 * 60 * 24)) <= prop->age;
+               return ((t - info->date_t) / (60 * 60 * 24)) <= prop->value;
+       case MATCHING_SCORE_GREATER:
+               return info->score >= prop->value;
+       case MATCHING_SCORE_LOWER:
+               return info->score <= prop->value;
        case MATCHING_NEWSGROUPS:
                return matcherprop_string_match(prop, info->newsgroups);
        case MATCHING_NOT_NEWSGROUPS:
                return !matcherprop_string_match(prop, info->newsgroups);
-       case MATCHING_HEADER:
+       case MATCHING_INREPLYTO:
+               return matcherprop_string_match(prop, info->inreplyto);
+       case MATCHING_NOT_INREPLYTO:
+               return !matcherprop_string_match(prop, info->inreplyto);
+       case MATCHING_REFERENCES:
+               return matcherprop_string_match(prop, info->references);
+       case MATCHING_NOT_REFERENCES:
+               return !matcherprop_string_match(prop, info->references);
+       case MATCHING_EXECUTE:
+               return matcherprop_match_execute(prop, info);
+       case MATCHING_NOT_EXECUTE:
+               return !matcherprop_match_execute(prop, info);
        default:
                return 0;
        }
@@ -642,6 +773,8 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
        case MATCHING_HEADER:
        case MATCHING_NOT_HEADER:
                header = procheader_parse_header(buf);
+               if (!header)
+                       return FALSE;
                if (procheader_headername_equal(header->name,
                                                matcher->header)) {
                        if (matcher->criteria == MATCHING_HEADER)
@@ -651,6 +784,9 @@ static gboolean matcherprop_match_one_header(MatcherProp * matcher,
                        procheader_header_free(header);
                        return result;
                }
+               else {
+                       procheader_header_free(header);
+               }
                break;
        case MATCHING_HEADERS_PART:
        case MATCHING_MESSAGE:
@@ -674,6 +810,15 @@ static gboolean matcherprop_criteria_headers(MatcherProp * matcher)
        case MATCHING_NOT_HEADER:
        case MATCHING_HEADERS_PART:
        case MATCHING_NOT_HEADERS_PART:
+               return TRUE;
+       default:
+               return FALSE;
+       }
+}
+
+static gboolean matcherprop_criteria_message(MatcherProp * matcher)
+{
+       switch(matcher->criteria) {
        case MATCHING_MESSAGE:
        case MATCHING_NOT_MESSAGE:
                return TRUE;
@@ -684,30 +829,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;
 
-               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;
 }
 
 /*
@@ -715,22 +863,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;
 }
 
 /*
@@ -743,8 +884,6 @@ static gboolean matcherprop_criteria_body(MatcherProp * matcher)
        switch(matcher->criteria) {
        case MATCHING_BODY_PART:
        case MATCHING_NOT_BODY_PART:
-       case MATCHING_MESSAGE:
-       case MATCHING_NOT_MESSAGE:
                return TRUE;
        default:
                return FALSE;
@@ -774,26 +913,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;
 }
 
 /*
@@ -801,22 +940,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,
@@ -827,11 +959,12 @@ gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
        GSList * l;
        FILE * fp;
        gchar * file;
-
-       /* file need to be read ? */
-
+       gboolean is_incorporating = MSG_IS_FILTERING(info->flags);
+       
+       /* check which things we need to do */
        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;
 
@@ -839,12 +972,19 @@ 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);
+       file = is_incorporating ? g_strdup(info->folder) 
+               : procmsg_get_message_file(info);
+               
        if (file == NULL)
                return FALSE;
 
@@ -853,32 +993,39 @@ gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
                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;
+                               }
                }
        }
 
@@ -901,6 +1048,60 @@ 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 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:
+                       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)) {
@@ -912,29 +1113,10 @@ gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
                        return FALSE;
        }
 
-       /* test the cached elements */
-
-       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;
-                               break;
-                       }
-               }
-               else {
-                       if (matchers->bool_and) {
-                               result = FALSE;
-                               break;
-                       }
-               }
-       }
-
        return result;
 }
 
-#ifdef 0
+#if 0
 static void matcherprop_print(MatcherProp * matcher)
 {
   int i;
@@ -968,7 +1150,7 @@ static void matcherprop_print(MatcherProp * matcher)
        if (matcher->expr)
                printf("expr : %s\n", matcher->expr);
 
-       printf("age: %i\n", matcher->age);
+       printf("age: %i\n", matcher->value;
 
        printf("compiled : %s\n", matcher->preg != NULL ? "yes" : "no");
        printf("error: %i\n",  matcher->error);
@@ -998,7 +1180,9 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
        switch(matcher->criteria) {
        case MATCHING_AGE_GREATER:
        case MATCHING_AGE_LOWER:
-               return g_strdup_printf("%s %i", criteria_str, matcher->age);
+       case MATCHING_SCORE_GREATER:
+       case MATCHING_SCORE_LOWER:
+               return g_strdup_printf("%s %i", criteria_str, matcher->value);
                break;
        case MATCHING_ALL:
        case MATCHING_UNREAD:
@@ -1108,3 +1292,182 @@ 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)
+{
+       gchar * s = cmd;
+       gchar * filename = NULL;
+       gchar * processed_cmd;
+       gchar * p;
+       gint size;
+
+       matcher_unescape_str(cmd);
+
+       size = strlen(cmd) + 1;
+       while (*s != '\0') {
+               if (*s == '%') {
+                       s++;
+                       switch (*s) {
+                       case '%':
+                               size -= 1;
+                               break;
+                       case 's': /* subject */
+                               size += STRLEN_WITH_CHECK(info->subject) - 2;
+                               break;
+                       case 'f': /* from */
+                               size += STRLEN_WITH_CHECK(info->from) - 2;
+                               break;
+                       case 't': /* to */
+                               size += STRLEN_WITH_CHECK(info->to) - 2;
+                               break;
+                       case 'c': /* cc */
+                               size += STRLEN_WITH_CHECK(info->cc) - 2;
+                               break;
+                       case 'd': /* date */
+                               size += STRLEN_WITH_CHECK(info->date) - 2;
+                               break;
+                       case 'i': /* message-id */
+                               size += STRLEN_WITH_CHECK(info->msgid) - 2;
+                               break;
+                       case 'n': /* newsgroups */
+                               size += STRLEN_WITH_CHECK(info->newsgroups) - 2;
+                               break;
+                       case 'r': /* references */
+                               size += STRLEN_WITH_CHECK(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);
+                               
+                               if (filename == NULL) {
+                                       debug_print(_("%s(%d) - filename is not set"), __FILE__, __LINE__);
+                                       return NULL;
+                               }
+                               else
+                                       size += strlen(filename) - 2;
+                               break;
+                       }
+                       s++;
+               }
+               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, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'f': /* from */
+                               if (info->from != NULL)
+                                       strcpy(p, info->from);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 't': /* to */
+                               if (info->to != NULL)
+                                       strcpy(p, info->to);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'c': /* cc */
+                               if (info->cc != NULL)
+                                       strcpy(p, info->cc);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'd': /* date */
+                               if (info->date != NULL)
+                                       strcpy(p, info->date);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'i': /* message-id */
+                               if (info->msgid != NULL)
+                                       strcpy(p, info->msgid);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'n': /* newsgroups */
+                               if (info->newsgroups != NULL)
+                                       strcpy(p, info->newsgroups);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'r': /* references */
+                               if (info->references != NULL)
+                                       strcpy(p, info->references);
+                               else
+                                       strcpy(p, "(none)");
+                               p += strlen(p);
+                               break;
+                       case 'F': /* file */
+                               strcpy(p, filename);
+                               p += strlen(p);
+                               break;
+                       default:
+                               *p = '%';
+                               p++;
+                               *p = *s;
+                               p++;
+                               break;
+                       }
+                       s++;
+               }
+               else {
+                       *p = *s;
+                       p++;
+                       s++;
+               }
+       }
+
+       debug_print("*** exec string \"%s\"\n", processed_cmd);
+
+       g_free(filename);
+       return processed_cmd;
+}
+
+
+/* ************************************************************ */
+
+/*
+static void matcher_parse              (gchar * str)
+{
+       matcher_parser_scan_string(str);
+       matcher_parserparse();
+}
+*/