/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * 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
* 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 "matcher.h"
#include "intl.h"
#include "matcher_parser.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
+/*!
+ *\brief Keyword lookup element
+ */
struct _MatchParser {
- gint id;
- gchar * str;
+ gint id; /*!< keyword id */
+ gchar *str; /*!< keyword */
};
-
typedef struct _MatchParser MatchParser;
-static MatchParser matchparser_tab[] = {
+/*!
+ *\brief Table with strings and ids used by the lexer and
+ * the parser. New keywords can be added here.
+ */
+static const MatchParser matchparser_tab[] = {
/* msginfo flags */
{MATCHCRITERIA_ALL, "all"},
{MATCHCRITERIA_UNREAD, "unread"},
{MATCHCRITERIA_NOT_REPLIED, "~replied"},
{MATCHCRITERIA_FORWARDED, "forwarded"},
{MATCHCRITERIA_NOT_FORWARDED, "~forwarded"},
+ {MATCHCRITERIA_LOCKED, "locked"},
+ {MATCHCRITERIA_NOT_LOCKED, "~locked"},
+ {MATCHCRITERIA_COLORLABEL, "colorlabel"},
+ {MATCHCRITERIA_NOT_COLORLABEL, "~colorlabel"},
+ {MATCHCRITERIA_IGNORE_THREAD, "ignore_thread"},
+ {MATCHCRITERIA_NOT_IGNORE_THREAD, "~ignore_thread"},
/* msginfo headers */
{MATCHCRITERIA_SUBJECT, "subject"},
{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 */
{MATCHCRITERIA_HEADER, "header"},
{MATCHCRITERIA_NOT_HEADER, "~header"},
{MATCHACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},
{MATCHACTION_EXECUTE, "execute"},
{MATCHACTION_COLOR, "color"},
- {MATCHACTION_BOUNCE, "bounce"}
+ {MATCHACTION_REDIRECT, "redirect"},
+ {MATCHACTION_DELETE_ON_SERVER, "delete_on_server"}
};
-gchar * get_matchparser_tab_str(gint id)
+/*!
+ *\brief Look up table with keywords defined in \sa matchparser_tab
+ */
+static GHashTable *matchparser_hashtab;
+
+/*!
+ *\brief Translate keyword id to keyword string
+ *
+ *\param id Id of keyword
+ *
+ *\return const gchar * Keyword
+ */
+const gchar *get_matchparser_tab_str(gint id)
{
gint i;
- for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
- i++) {
+ for (i = 0; i < sizeof matchparser_tab / sizeof matchparser_tab[0]; 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
+/*!
+ *\brief Create keyword lookup table
*/
-
-#if 0
-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)
+static void create_matchparser_hashtab(void)
{
- MatcherProp * prop;
- gchar * tmp;
- gint key;
- gint value;
- gchar * expr;
- gint match;
- gchar * header = NULL;
+ int i;
- tmp = * str;
- key = matcher_parse_keyword(&tmp);
- if (tmp == NULL) {
- * str = NULL;
- return NULL;
- }
-
- switch (key) {
- case MATCHCRITERIA_AGE_LOWER:
- case MATCHCRITERIA_AGE_GREATER:
- case MATCHCRITERIA_SCORE_LOWER:
- case MATCHCRITERIA_SCORE_GREATER:
- case MATCHCRITERIA_SCORE_EQUAL:
- 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 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:
- prop = matcherprop_new(key, NULL, 0, NULL, 0);
- *str = tmp;
-
- return prop;
-
- 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_NEWSGROUPS:
- case MATCHCRITERIA_NOT_NEWSGROUPS:
- case MATCHCRITERIA_INREPLYTO:
- case MATCHCRITERIA_NOT_REFERENCES:
- case MATCHCRITERIA_REFERENCES:
- case MATCHCRITERIA_NOT_INREPLYTO:
- case MATCHCRITERIA_MESSAGE:
- case MATCHCRITERIA_NOT_MESSAGE:
- case MATCHCRITERIA_EXECUTE:
- case MATCHCRITERIA_NOT_EXECUTE:
- case MATCHCRITERIA_HEADERS_PART:
- case MATCHCRITERIA_NOT_HEADERS_PART:
- case MATCHCRITERIA_BODY_PART:
- case MATCHCRITERIA_NOT_BODY_PART:
- case MATCHCRITERIA_HEADER:
- case MATCHCRITERIA_NOT_HEADER:
- if ((key == MATCHCRITERIA_HEADER) || (key == MATCHCRITERIA_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 MATCHCRITERIA_REGEXP:
- case MATCHCRITERIA_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 MATCHCRITERIA_MATCH:
- case MATCHCRITERIA_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;
- }
+ if (matchparser_hashtab) return;
+ matchparser_hashtab = g_hash_table_new(g_str_hash, g_str_equal);
+ for (i = 0; i < sizeof matchparser_tab / sizeof matchparser_tab[0]; i++)
+ g_hash_table_insert(matchparser_hashtab,
+ matchparser_tab[i].str,
+ &matchparser_tab[i]);
}
-gint matcher_parse_keyword(gchar ** str)
+/*!
+ *\brief Return a keyword id from a keyword string
+ *
+ *\param str Keyword string
+ *
+ *\return gint Keyword id
+ */
+gint get_matchparser_tab_id(const gchar *str)
{
- gchar * p;
- gchar * dup;
- gchar * start;
gint i;
- gint match;
+ MatchParser *res;
- 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 (*p == '-' || *p == '+')
- p++;
- while (isdigit(*p))
- p++;
-
- *p = '\0';
-
- *str += p - dup + 1;
- return atoi(start);
+ if (NULL != (res = g_hash_table_lookup(matchparser_hashtab, str))) {
+ return res->id;
+ } else
+ return -1;
}
-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)
+/*!
+ *\brief Escape characters in a string by inserting '\' characters
+ *
+ *\param str String with characters to be escaped
+ *
+ *\return gchar * Newly allocated string with escaped characters
+ */
+const gchar *matcher_escape_str(const gchar *str)
{
- gchar * p;
- gchar * dup;
- gchar * start;
-
- dup = alloca(strlen(* str) + 1);
- p = dup;
- strcpy(dup, * str);
+ register const gchar *walk;
+ register int escape;
+ gchar *res;
+ register char *reswalk;
- while (matcher_is_blank(*p))
- p++;
-
- if (*p != '/') {
- * str = NULL;
+ if (str == NULL)
return NULL;
- }
-
- p ++;
- start = p;
- while (*p != '/') {
- if (*p == '\\')
- p++;
- p++;
- }
- *p = '\0';
-
- *str += p - dup + 2;
- return g_strdup(start);
-}
-#endif
-
-/* 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. */
-#if 0
-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++;
+ for (escape = 0, walk = str; *walk; walk++)
+ if (*walk == '\\' || *walk == '\'' || *walk == '\"')
+ escape++;
- if (*p != '"') {
- * str = NULL;
- return NULL;
- }
+ if (!escape)
+ return g_strdup(str);
- p ++;
- start = p;
- dest = p;
-
- for ( ; *p && *p != '\"'; p++, dest++) {
- if (*p == '\\') {
- *dest++ = *p++;
- *dest = *p;
- }
- else
- *dest = *p;
+ reswalk = res = g_new0(gchar, (walk - str) + escape + 1);
+ for (walk = str; *walk; walk++, reswalk++) {
+ if (*walk == '\\' || *walk == '\'' || *walk == '\"')
+ *reswalk++ = '\\';
+ *reswalk = *walk;
}
- *dest = '\0';
-
- *str += dest - dup + 2;
- return g_strdup(start);
+
+ *reswalk = 0;
+ return res;
}
-#endif
+/*!
+ *\brief Unescape string by replacing escaped char sequences
+ * (\b, \n, etc) by their actual char. Note that this
+ * function changes the contents of the buffer pointed
+ * to by \a str.
+ *
+ *\param str Buffer containing string that needs to be escaped.
+ * Note that this function changes the contents of the
+ * buffer
+ *
+ *\return gchar * Pointer to changed buffer
+ */
gchar *matcher_unescape_str(gchar *str)
{
gchar *tmp = alloca(strlen(str) + 1);
*dst++ = *src;
else {
src++;
- if (*src == '\\')
- *dst++ = '\\';
- else if (*src == 'n')
+ if (*src == 'n') /* insert control characters */
*dst++ = '\n';
else if (*src == 'r')
*dst++ = '\r';
- else if (*src == '\'' || *src == '\"')
+ 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 == '\'' || *src == '\"')
+ /* insert \\, \' or \" */
*dst++ = *src;
else {
+ /* FIXME: should perhaps escape character... */
src--;
*dst++ = *src;
}
/* **************** data structure allocation **************** */
-
-MatcherProp * matcherprop_new(gint criteria, gchar * header,
- gint matchtype, gchar * expr,
+/*!
+ *\brief Allocate a structure for a filtering / scoring
+ * "condition" (a matcher structure)
+ *
+ *\param criteria Criteria ID (MATCHCRITERIA_XXXX)
+ *\param header Header string (if criteria is MATCHCRITERIA_HEADER)
+ *\param matchtype Type of action (MATCHTYPE_XXX)
+ *\param expr String value or expression to check
+ *\param value Integer value to check
+ *
+ *\return MatcherProp * Pointer to newly allocated structure
+ */
+MatcherProp *matcherprop_new(gint criteria, const gchar *header,
+ gint matchtype, const gchar *expr,
int value)
{
- MatcherProp * prop;
+ 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;
+ prop->header = header != NULL ? g_strdup(header) : NULL;
+ prop->expr = expr != NULL ? g_strdup(expr) : NULL;
prop->matchtype = matchtype;
prop->preg = NULL;
prop->value = value;
return prop;
}
-void matcherprop_free(MatcherProp * prop)
+/*!
+ *\brief Free a matcher structure
+ *
+ *\param prop Pointer to matcher structure allocated with
+ * #matcherprop_new
+ */
+void matcherprop_free(MatcherProp *prop)
{
- g_free(prop->expr);
+ if (prop->expr)
+ g_free(prop->expr);
+ if (prop->header)
+ g_free(prop->header);
if (prop->preg != NULL) {
regfree(prop->preg);
g_free(prop->preg);
g_free(prop);
}
+/*!
+ *\brief Copy a matcher structure
+ *
+ *\param src Matcher structure to copy
+ *
+ *\return MatcherProp * Pointer to newly allocated matcher structure
+ */
+MatcherProp *matcherprop_copy(const MatcherProp *src)
+{
+ MatcherProp *prop = g_new0(MatcherProp, 1);
+
+ prop->criteria = src->criteria;
+ prop->header = src->header ? g_strdup(src->header) : NULL;
+ prop->expr = src->expr ? g_strdup(src->expr) : NULL;
+ prop->matchtype = src->matchtype;
+
+ prop->preg = NULL; /* will be re-evaluated */
+ prop->value = src->value;
+ prop->error = src->error;
+ return prop;
+}
-/* ************** match ******************************/
+/* ****************** wrapper for file reading ************** */
+
+/*!
+ *\brief Allocate a matcher structure where all strings
+ * are unescaped ("unquoted")
+ *
+ *\param criteria One of the MATCHCRITERIA_XXX constants
+ *\param header A header string
+ *\param matchtype Type of matcher (MATCHTYPE_XXX)
+ *\param expr Matcher string expression
+ *\param value Matcher integer value
+ *
+ *\return MatcherProp * Pointer to newly allocated matcher
+ * structure
+ */
+MatcherProp *matcherprop_unquote_new(gint criteria, const gchar *header,
+ gint matchtype, const gchar *expr,
+ int value)
+{
+ MatcherProp *prop;
+
+ if (expr != NULL)
+ expr = matcher_unescape_str(g_strdup(expr));
+ if (header != NULL)
+ header = matcher_unescape_str(g_strdup(header));
+
+ prop = matcherprop_new(criteria, header, matchtype, expr, value);
-/* match the given string */
+ g_free(header);
+ g_free(expr);
+
+ return prop;
+}
-static gboolean matcherprop_string_match(MatcherProp * prop, gchar * str)
+
+/* ************** match ******************************/
+
+/*!
+ *\brief Find out if a string matches a condition
+ *
+ *\param prop Matcher structure
+ *\param str String to check
+ *
+ *\return gboolean TRUE if str matches the condition in the
+ * matcher structure
+ */
+static gboolean matcherprop_string_match(const MatcherProp *prop, const gchar *str)
{
- gchar * str1;
- gchar * str2;
+ gchar *str1;
+ gchar *str2;
if (str == NULL)
return FALSE;
- switch(prop->matchtype) {
+ switch (prop->matchtype) {
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 == MATCHTYPE_REGEXPCASE)
? REG_ICASE : 0)) != 0) {
prop->error = 1;
g_free(prop->preg);
+ prop->preg = NULL;
}
}
if (prop->preg == NULL)
case MATCHTYPE_MATCH:
return (strstr(str, prop->expr) != NULL);
+ /* FIXME: put upper in unesc_str */
case MATCHTYPE_MATCHCASE:
str2 = alloca(strlen(prop->expr) + 1);
strcpy(str2, prop->expr);
}
}
-gboolean matcherprop_match_execute(MatcherProp * prop, MsgInfo * info)
+/*!
+ *\brief Execute a command defined in the matcher structure
+ *
+ *\param prop Pointer to matcher structure
+ *\param info Pointer to message info structure
+ *
+ *\return gboolean TRUE if command was executed succesfully
+ */
+static gboolean matcherprop_match_execute(const MatcherProp *prop,
+ const MsgInfo *info)
{
- gchar * cmd;
+ gchar *file;
+ gchar *cmd;
+ gint retval;
+
+ file = procmsg_get_message_file(info);
+ if (file == NULL)
+ return FALSE;
+ g_free(file);
cmd = matching_build_command(prop->expr, info);
if (cmd == NULL)
return FALSE;
- return (system(cmd) == 0);
-}
+ retval = system(cmd);
+ debug_print("Command exit code: %d\n", retval);
-/* match a message and his headers, hlist can be NULL if you don't
- want to use headers */
+ g_free(cmd);
+ return (retval == 0);
+}
-gboolean matcherprop_match(MatcherProp * prop, MsgInfo * info)
+/*!
+ *\brief Check if a message matches the condition in a matcher
+ * structure.
+ *
+ *\param prop Pointer to matcher structure
+ *\param info Pointer to message info
+ *
+ *\return gboolean TRUE if a match
+ */
+gboolean matcherprop_match(const MatcherProp *prop,
+ const MsgInfo *info)
{
time_t t;
return MSG_IS_FORWARDED(info->flags);
case MATCHCRITERIA_NOT_FORWARDED:
return !MSG_IS_FORWARDED(info->flags);
+ case MATCHCRITERIA_LOCKED:
+ return MSG_IS_LOCKED(info->flags);
+ case MATCHCRITERIA_NOT_LOCKED:
+ return !MSG_IS_LOCKED(info->flags);
+ case MATCHCRITERIA_COLORLABEL:
+ return MSG_GET_COLORLABEL_VALUE(info->flags) == prop->value;
+ case MATCHCRITERIA_NOT_COLORLABEL:
+ return MSG_GET_COLORLABEL_VALUE(info->flags) != prop->value;
+ case MATCHCRITERIA_IGNORE_THREAD:
+ return MSG_IS_IGNORE_THREAD(info->flags);
+ case MATCHCRITERIA_NOT_IGNORE_THREAD:
+ return !MSG_IS_IGNORE_THREAD(info->flags);
case MATCHCRITERIA_SUBJECT:
return matcherprop_string_match(prop, info->subject);
case MATCHCRITERIA_NOT_SUBJECT:
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 MATCHCRITERIA_NOT_NEWSGROUPS:
/* ********************* 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)
+/*!
+ *\brief Create a new list of matchers
+ *
+ *\param matchers List of matcher structures
+ *\param bool_and Operator
+ *
+ *\return MatcherList * New list
+ */
+MatcherList *matcherlist_new(GSList *matchers, gboolean bool_and)
{
- MatcherList * cond;
+ MatcherList *cond;
cond = g_new0(MatcherList, 1);
return cond;
}
-void matcherlist_free(MatcherList * cond)
+/*!
+ *\brief Frees a list of matchers
+ *
+ *\param cond List of matchers
+ */
+void matcherlist_free(MatcherList *cond)
{
- GSList * l;
+ GSList *l;
- for(l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
+ for (l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
matcherprop_free((MatcherProp *) l->data);
}
g_free(cond);
}
-/*
- skip the headers
+/*!
+ *\brief Skip all headers in a message file
+ *
+ *\param fp Message file
*/
-
static void matcherlist_skip_headers(FILE *fp)
{
gchar buf[BUFFSIZE];
- while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
- }
+ while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1)
+ ;
}
-/*
- matcherprop_match_one_header
- returns TRUE if buf matchs the MatchersProp criteria
+/*!
+ *\brief Check if a header matches a matcher condition
+ *
+ *\param matcher Matcher structure to check header for
+ *\param buf Header name
+ *
+ *\return boolean TRUE if matching header
*/
-
-static gboolean matcherprop_match_one_header(MatcherProp * matcher,
- gchar * buf)
+static gboolean matcherprop_match_one_header(const MatcherProp *matcher,
+ const gchar *buf)
{
gboolean result;
Header *header;
- switch(matcher->criteria) {
+ switch (matcher->criteria) {
case MATCHCRITERIA_HEADER:
case MATCHCRITERIA_NOT_HEADER:
header = procheader_parse_header(buf);
return FALSE;
}
-/*
- matcherprop_criteria_header
- returns TRUE if the headers must be matched
+/*!
+ *\brief Check if the matcher structure wants headers to
+ * be matched
+ *
+ *\param matcher Matcher structure
+ *
+ *\return gboolean TRUE if the matcher structure describes
+ * a header match condition
*/
-
-static gboolean matcherprop_criteria_headers(MatcherProp * matcher)
+static gboolean matcherprop_criteria_headers(const MatcherProp *matcher)
{
- switch(matcher->criteria) {
+ switch (matcher->criteria) {
case MATCHCRITERIA_HEADER:
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_HEADERS_PART:
}
}
-static gboolean matcherprop_criteria_message(MatcherProp * matcher)
+/*!
+ *\brief Check if the matcher structure wants the message
+ * to be matched (just perform an action on any
+ * message)
+ *
+ *\param matcher Matcher structure
+ *
+ *\return gboolean TRUE if matcher condition should match
+ * a message
+ */
+static gboolean matcherprop_criteria_message(MatcherProp *matcher)
{
- switch(matcher->criteria) {
+ switch (matcher->criteria) {
case MATCHCRITERIA_MESSAGE:
case MATCHCRITERIA_NOT_MESSAGE:
return TRUE;
}
}
-/*
- matcherlist_match_one_header
- returns TRUE if match should stop
+/*!
+ *\brief Check if a list of conditions match a header
+ *
+ *\param matchers One set of conditions
+ *\param buf Name of header
+ *
+ *\return gboolean TRUE if matching should stop
*/
-
-static gboolean matcherlist_match_one_header(MatcherList * matchers,
- gchar * buf)
+static gboolean matcherlist_match_one_header(MatcherList *matchers,
+ const gchar *buf)
{
- GSList * l;
-
- for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
- MatcherProp * matcher = (MatcherProp *) l->data;
+ GSList *l;
+ for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+ MatcherProp *matcher = (MatcherProp *) l->data;
+
+ /* see if a single condition matches */
if (matcherprop_criteria_headers(matcher) ||
matcherprop_criteria_message(matcher)) {
if (matcherprop_match_one_header(matcher, buf)) {
return FALSE;
}
-/*
- matcherlist_match_headers
- returns TRUE if one of the headers matchs the MatcherList criteria
+/*!
+ *\brief Check if a list of conditions matches one header in
+ * a message file.
+ *
+ *\param matchers List of conditions
+ *\param fp Message file
+ *
+ *\return gboolean TRUE if one of the headers is matched by
+ * the list of conditions.
*/
-
-static gboolean matcherlist_match_headers(MatcherList * matchers, FILE * fp)
+static gboolean matcherlist_match_headers(MatcherList *matchers, FILE *fp)
{
gchar buf[BUFFSIZE];
return FALSE;
}
-/*
- matcherprop_criteria_body
- returns TRUE if the body must be matched
+/*!
+ *\brief Check if a matcher wants to check the message body
+ *
+ *\param matcher Matcher structure
+ *
+ *\return gboolean TRUE if body must be matched.
*/
-
-static gboolean matcherprop_criteria_body(MatcherProp * matcher)
+static gboolean matcherprop_criteria_body(const MatcherProp *matcher)
{
- switch(matcher->criteria) {
+ switch (matcher->criteria) {
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_NOT_BODY_PART:
return TRUE;
}
}
-/*
- matcherprop_match_line
- returns TRUE if the string matchs the MatcherProp criteria
+/*!
+ *\brief Check if a (line) string matches the criteria
+ * described by a matcher structure
+ *
+ *\param matcher Matcher structure
+ *\param line String
+ *
+ *\return gboolean TRUE if string matches criteria
*/
-
-static gboolean matcherprop_match_line(MatcherProp * matcher, gchar * line)
+static gboolean matcherprop_match_line(MatcherProp *matcher, const gchar *line)
{
- switch(matcher->criteria) {
+ switch (matcher->criteria) {
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_MESSAGE:
return matcherprop_string_match(matcher, line);
return FALSE;
}
-/*
- matcherlist_match_line
- returns TRUE if the string matchs the MatcherList criteria
+/*!
+ *\brief Check if a list of conditions matches a (line) string
+ *
+ *\param matchers List of matchers
+ *\param line String to match
+ *
+ *\return gboolean TRUE if string matches list of criteria
*/
-
-static gboolean matcherlist_match_line(MatcherList * matchers, gchar * line)
+static gboolean matcherlist_match_line(MatcherList *matchers, const gchar *line)
{
- GSList * l;
+ GSList *l;
- for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
- MatcherProp * matcher = (MatcherProp *) l->data;
+ for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+ MatcherProp *matcher = (MatcherProp *) l->data;
if (matcherprop_criteria_body(matcher) ||
matcherprop_criteria_message(matcher)) {
return FALSE;
}
-/*
- matcherlist_match_body
- returns TRUE if one line of the body matchs the MatcherList criteria
+/*!
+ *\brief Check if a line in a message file's body matches
+ * the criteria
+ *
+ *\param matchers List of conditions
+ *\param fp Message file
+ *
+ *\return gboolean TRUE if succesful match
*/
-
-static gboolean matcherlist_match_body(MatcherList * matchers, FILE * fp)
+static gboolean matcherlist_match_body(MatcherList *matchers, FILE *fp)
{
gchar buf[BUFFSIZE];
return FALSE;
}
-gboolean matcherlist_match_file(MatcherList * matchers, MsgInfo * info,
+/*!
+ *\brief Check if a message file matches criteria
+ *
+ *\param matchers Criteria
+ *\param info Message info
+ *\param result Default result
+ *
+ *\return gboolean TRUE if matched
+ */
+gboolean matcherlist_match_file(MatcherList *matchers, MsgInfo *info,
gboolean result)
{
gboolean read_headers;
gboolean read_body;
- GSList * l;
- FILE * fp;
- gchar * file;
- gboolean is_incorporating = MSG_IS_FILTERING(info->flags);
-
- /* check which things we need to do */
+ GSList *l;
+ FILE *fp;
+ gchar *file;
+
+ /* file need to be read ? */
+
read_headers = FALSE;
- read_body = FALSE;
-
- for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
- MatcherProp * matcher = (MatcherProp *) l->data;
+ read_body = FALSE;
+ for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+ MatcherProp *matcher = (MatcherProp *) l->data;
if (matcherprop_criteria_headers(matcher))
read_headers = TRUE;
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;
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
g_free(file);
return result;
matcherlist_match_body(matchers, fp);
}
- for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
- MatcherProp * matcher = (MatcherProp *) l->data;
+ 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))
+ matcherprop_criteria_body(matcher) ||
+ matcherprop_criteria_message(matcher)) {
if (matcher->result) {
if (!matchers->bool_and) {
result = TRUE;
result = FALSE;
break;
}
- }
+ }
+ }
}
g_free(file);
return result;
}
-/* test a list of condition */
-
-gboolean matcherlist_match(MatcherList * matchers, MsgInfo * info)
+/*!
+ *\brief Test list of conditions on a message.
+ *
+ *\param matchers List of conditions
+ *\param info Message info
+ *
+ *\return gboolean TRUE if matched
+ */
+gboolean matcherlist_match(MatcherList *matchers, MsgInfo *info)
{
- GSList * l;
+ GSList *l;
gboolean result;
if (matchers->bool_and)
/* test the cached elements */
- for(l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
- MatcherProp * matcher = (MatcherProp *) l->data;
+ for (l = matchers->matchers; l != NULL ;l = g_slist_next(l)) {
+ MatcherProp *matcher = (MatcherProp *) l->data;
switch(matcher->criteria) {
case MATCHCRITERIA_ALL:
case MATCHCRITERIA_NOT_REPLIED:
case MATCHCRITERIA_FORWARDED:
case MATCHCRITERIA_NOT_FORWARDED:
+ case MATCHCRITERIA_LOCKED:
+ case MATCHCRITERIA_NOT_LOCKED:
+ case MATCHCRITERIA_COLORLABEL:
+ case MATCHCRITERIA_NOT_COLORLABEL:
+ case MATCHCRITERIA_IGNORE_THREAD:
+ case MATCHCRITERIA_NOT_IGNORE_THREAD:
case MATCHCRITERIA_SUBJECT:
case MATCHCRITERIA_NOT_SUBJECT:
case MATCHCRITERIA_FROM:
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)) {
return result;
}
-#if 0
-static void matcherprop_print(MatcherProp * matcher)
-{
- int i;
-
- if (matcher == NULL) {
- printf("no matcher\n");
- return;
- }
-
- switch (matcher->matchtype) {
- case MATCHCRITERIA_MATCH:
- printf("match\n");
- break;
- case MATCHCRITERIA_REGEXP:
- printf("regexp\n");
- break;
- case MATCHCRITERIA_MATCHCASE:
- printf("matchcase\n");
- break;
- case MATCHCRITERIA_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)
+/*!
+ *\brief Convert a matcher structure to a string
+ *
+ *\param matcher Matcher structure
+ *
+ *\return gchar * Newly allocated string
+ */
+gchar *matcherprop_to_string(const MatcherProp *matcher)
{
- gchar * matcher_str = NULL;
- gchar * criteria_str;
- gchar * matchtype_str;
+ gchar *matcher_str = NULL;
+ const gchar *criteria_str;
+ const gchar *matchtype_str;
int i;
- gchar * p;
- gint count;
- gchar * expr_str;
- gchar * out;
+ char *expr;
+ char *header;
criteria_str = NULL;
- for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
- i++) {
+ 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) {
+ 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:
+ case MATCHCRITERIA_COLORLABEL:
+ case MATCHCRITERIA_NOT_COLORLABEL:
return g_strdup_printf("%s %i", criteria_str, matcher->value);
- break;
case MATCHCRITERIA_ALL:
case MATCHCRITERIA_UNREAD:
case MATCHCRITERIA_NOT_UNREAD:
case MATCHCRITERIA_NOT_REPLIED:
case MATCHCRITERIA_FORWARDED:
case MATCHCRITERIA_NOT_FORWARDED:
+ case MATCHCRITERIA_LOCKED:
+ case MATCHCRITERIA_NOT_LOCKED:
+ case MATCHCRITERIA_IGNORE_THREAD:
+ case MATCHCRITERIA_NOT_IGNORE_THREAD:
return g_strdup(criteria_str);
+ case MATCHCRITERIA_EXECUTE:
+ case MATCHCRITERIA_NOT_EXECUTE:
+ expr = matcher_escape_str(matcher->expr);
+ matcher_str = g_strdup_printf("%s \"%s\"", criteria_str, expr);
+ g_free(expr);
+ return matcher_str;
}
matchtype_str = NULL;
- for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
- i++) {
+ for (i = 0; i < sizeof matchparser_tab / sizeof matchparser_tab[0]; i++) {
if (matchparser_tab[i].id == matcher->matchtype)
matchtype_str = matchparser_tab[i].str;
}
switch (matcher->matchtype) {
case MATCHTYPE_MATCH:
case MATCHTYPE_MATCHCASE:
- count = 0;
- for(p = matcher->expr; *p != 0 ; p++)
- if (*p == '\"') count ++;
-
- expr_str = g_new(char, strlen(matcher->expr) + count + 1);
-
- for(p = matcher->expr, out = expr_str ; *p != 0 ; p++, out++) {
- if (*p == '\"') {
- *out = '\\'; out++;
- *out = '\"';
- }
- else
- *out = *p;
- }
- * out = '\0';
-
- if (matcher->header)
- matcher_str =
- g_strdup_printf("%s \"%s\" %s \"%s\"",
- criteria_str, matcher->header,
- matchtype_str, expr_str);
- else
- matcher_str =
- g_strdup_printf("%s %s \"%s\"", criteria_str,
- matchtype_str, expr_str);
-
- g_free(expr_str);
-
- break;
-
case MATCHTYPE_REGEXP:
case MATCHTYPE_REGEXPCASE:
-
+ expr = matcher_escape_str(matcher->expr);
+ header = matcher_escape_str(matcher->header);
if (matcher->header)
- matcher_str =
- g_strdup_printf("%s \"%s\" %s /%s/",
- criteria_str, matcher->header,
- matchtype_str, matcher->expr);
+ matcher_str = g_strdup_printf
+ ("%s \"%s\" %s \"%s\"",
+ criteria_str, matcher->header,
+ matchtype_str, expr);
else
- matcher_str =
- g_strdup_printf("%s %s /%s/", criteria_str,
- matchtype_str, matcher->expr);
-
+ matcher_str = g_strdup_printf
+ ("%s %s \"%s\"", criteria_str,
+ matchtype_str, expr);
break;
+ g_free(header);
+ g_free(expr);
}
return matcher_str;
}
-gchar * matcherlist_to_string(MatcherList * matchers)
+/*!
+ *\brief Convert a list of conditions to a string
+ *
+ *\param matchers List of conditions
+ *
+ *\return gchar * Newly allocated string
+ */
+gchar *matcherlist_to_string(const MatcherList *matchers)
{
gint count;
- gchar ** vstr;
- GSList * l;
- gchar ** cur_str;
- gchar * result;
+ gchar **vstr;
+ GSList *l;
+ gchar **cur_str;
+ gchar *result = NULL;
count = g_slist_length(matchers->matchers);
vstr = g_new(gchar *, count + 1);
- for (l = matchers->matchers, cur_str = vstr ; l != NULL ;
+ 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)
else
result = g_strjoinv(" | ", vstr);
- for(cur_str = vstr ; *cur_str != NULL ; cur_str ++)
+ for (cur_str = vstr ; *cur_str != NULL ; cur_str ++)
g_free(*cur_str);
g_free(vstr);
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)
+#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 */
+/*!
+ *\brief Build the command line to execute
+ *
+ *\param cmd String with command line specifiers
+ *\param info Message info to use for command
+ *
+ *\return gchar * Newly allocated string
+ *
+ *\warning The \a cmd string should have been unescaped using
+ * #matcher_unescape_str.
+ */
+gchar *matching_build_command(const gchar *cmd, MsgInfo *info)
{
- gchar * s = cmd;
- gchar * filename = NULL;
- gchar * processed_cmd;
- gchar * p;
+ const gchar *s = cmd;
+ gchar *filename = NULL;
+ gchar *processed_cmd;
+ gchar *p;
gint size;
- matcher_unescape_str(cmd);
+ 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(cmd) + 1;
+ size = STRLEN_ZERO(cmd) + 1;
while (*s != '\0') {
if (*s == '%') {
s++;
size -= 1;
break;
case 's': /* subject */
- size += STRLEN_WITH_CHECK(info->subject) - 2;
+ size += STRLEN_DEFAULT(info->subject, no_subject) - 2;
break;
case 'f': /* from */
- size += STRLEN_WITH_CHECK(info->from) - 2;
+ size += STRLEN_DEFAULT(info->from, no_from) - 2;
break;
case 't': /* to */
- size += STRLEN_WITH_CHECK(info->to) - 2;
+ size += STRLEN_DEFAULT(info->to, no_to) - 2;
break;
case 'c': /* cc */
- size += STRLEN_WITH_CHECK(info->cc) - 2;
+ size += STRLEN_DEFAULT(info->cc, no_cc) - 2;
break;
case 'd': /* date */
- size += STRLEN_WITH_CHECK(info->date) - 2;
+ size += STRLEN_DEFAULT(info->date, no_date) - 2;
break;
case 'i': /* message-id */
- size += STRLEN_WITH_CHECK(info->msgid) - 2;
+ size += STRLEN_DEFAULT(info->msgid, no_msgid) - 2;
break;
case 'n': /* newsgroups */
- size += STRLEN_WITH_CHECK(info->newsgroups) - 2;
+ size += STRLEN_DEFAULT(info->newsgroups, no_newsgroups) - 2;
break;
case 'r': /* references */
- size += STRLEN_WITH_CHECK(info->references) - 2;
+ size += STRLEN_DEFAULT(info->references, no_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
if (info->subject != NULL)
strcpy(p, info->subject);
else
- strcpy(p, "(none)");
+ strcpy(p, no_subject);
p += strlen(p);
break;
case 'f': /* from */
if (info->from != NULL)
strcpy(p, info->from);
else
- strcpy(p, "(none)");
+ strcpy(p, no_from);
p += strlen(p);
break;
case 't': /* to */
if (info->to != NULL)
strcpy(p, info->to);
else
- strcpy(p, "(none)");
+ strcpy(p, no_to);
p += strlen(p);
break;
case 'c': /* cc */
if (info->cc != NULL)
strcpy(p, info->cc);
else
- strcpy(p, "(none)");
+ strcpy(p, no_cc);
p += strlen(p);
break;
case 'd': /* date */
if (info->date != NULL)
strcpy(p, info->date);
else
- strcpy(p, "(none)");
+ strcpy(p, no_date);
p += strlen(p);
break;
case 'i': /* message-id */
if (info->msgid != NULL)
strcpy(p, info->msgid);
else
- strcpy(p, "(none)");
+ strcpy(p, no_msgid);
p += strlen(p);
break;
case 'n': /* newsgroups */
if (info->newsgroups != NULL)
strcpy(p, info->newsgroups);
else
- strcpy(p, "(none)");
+ strcpy(p, no_newsgroups);
p += strlen(p);
break;
case 'r': /* references */
if (info->references != NULL)
strcpy(p, info->references);
else
- strcpy(p, "(none)");
+ strcpy(p, no_references);
p += strlen(p);
break;
case 'F': /* file */
strcpy(p, filename);
p += strlen(p);
+ g_free(filename);
break;
default:
*p = '%';
}
}
- debug_print("*** exec string \"%s\"\n", processed_cmd);
-
- g_free(filename);
return processed_cmd;
}
+#undef STRLEN_DEFAULT
+#undef STRLEN_ZERO
-
-/* ************************************************************ */
-/* ************************************************************ */
/* ************************************************************ */
-/* ************************************************************ */
-/* ************************************************************ */
-
-static void prefs_scoring_write(FILE * fp, GSList * prefs_scoring)
+/*!
+ *\brief Write scoring list to file
+ *
+ *\param fp File
+ *\param prefs_scoring List of scoring conditions
+ */
+static void prefs_scoring_write(FILE *fp, GSList *prefs_scoring)
{
- GSList * cur;
+ GSList *cur;
for (cur = prefs_scoring; cur != NULL; cur = cur->next) {
gchar *scoring_str;
- ScoringProp * prop;
+ ScoringProp *prop;
prop = (ScoringProp *) cur->data;
scoring_str = scoringprop_to_string(prop);
}
}
-static void prefs_filtering_write(FILE * fp, GSList * prefs_scoring)
+/*!
+ *\brief Write filtering list to file
+ *
+ *\param fp File
+ *\param prefs_filtering List of filtering conditions
+ */
+static void prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
{
- GSList * cur;
+ GSList *cur;
- for (cur = prefs_scoring; cur != NULL; cur = cur->next) {
+ for (cur = prefs_filtering; cur != NULL; cur = cur->next) {
gchar *filtering_str;
- FilteringProp * prop;
+ FilteringProp *prop;
- prop = (FilteringProp *) cur->data;
- filtering_str = filteringprop_to_string(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) {
}
}
+/*!
+ *\brief Write matchers from a folder item
+ *
+ *\param node Node with folder info
+ *\param data File pointer
+ *
+ *\return gboolean FALSE
+ */
static gboolean prefs_matcher_write_func(GNode *node, gpointer data)
{
FolderItem *item;
- FILE * fp = data;
- gchar * id;
- GSList * prefs_scoring;
- GSList * prefs_filtering;
+ FILE *fp = data;
+ gchar *id;
+ GSList *prefs_scoring;
+ GSList *prefs_filtering;
if (node != NULL) {
item = node->data;
- /* prevent from the warning */
+ /* prevent warning */
if (item->path == NULL)
return FALSE;
id = folder_item_get_identifier(item);
return FALSE;
}
-static void prefs_matcher_save(FILE * fp)
+/*!
+ *\brief Save matchers from folder items
+ *
+ *\param fp File
+ */
+static void prefs_matcher_save(FILE *fp)
{
- GList * cur;
+ GList *cur;
for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
Folder *folder;
prefs_matcher_write_func(NULL, fp);
}
-
+/*!
+ *\brief Write filtering / matcher configuration file
+ */
void prefs_matcher_write_config(void)
{
gchar *rcpath;
PrefFile *pfile;
- GSList *cur;
- ScoringProp * prop;
- debug_print(_("Writing matcher configuration...\n"));
+ 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_warning("failed to write configuration to file\n");
g_free(rcpath);
return;
}
g_free(rcpath);
- if (prefs_write_close(pfile) < 0) {
- g_warning(_("failed to write configuration to file\n"));
+ if (prefs_file_close(pfile) < 0) {
+ g_warning("failed to write configuration to file\n");
return;
}
}
-
-
-
-
-
/* ******************************************************************* */
+/*!
+ *\brief Read matcher configuration
+ */
void prefs_matcher_read_config(void)
{
- gchar * rcpath;
- FILE * f;
+ gchar *rcpath;
+ FILE *f;
+ create_matchparser_hashtab();
prefs_scoring_clear();
prefs_filtering_clear();
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MATCHER_RC, NULL);
- f = fopen(rcpath, "r");
+ f = fopen(rcpath, "rb");
g_free(rcpath);
- if (f != NULL)
+ if (f != NULL) {
matcher_parser_start_parsing(f);
+ fclose(f);
+ }
else {
/* previous version compatibily */
- printf("reading filtering\n");
+ /* printf("reading filtering\n"); */
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
FILTERING_RC, NULL);
- f = fopen(rcpath, "r");
+ f = fopen(rcpath, "rb");
g_free(rcpath);
if (f != NULL) {
fclose(matcher_parserin);
}
- printf("reading scoring\n");
+ /* printf("reading scoring\n"); */
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
SCORING_RC, NULL);
- f = fopen(rcpath, "r");
+ f = fopen(rcpath, "rb");
g_free(rcpath);
if (f != NULL) {
projects / claws.git / blobdiff