/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2004 by the Claws Mail Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002-2012 by the Claws Mail 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include <glib.h>
{MATCHCRITERIA_NOT_WATCH_THREAD, "~watch_thread"},
{MATCHCRITERIA_SPAM, "spam"},
{MATCHCRITERIA_NOT_SPAM, "~spam"},
+ {MATCHCRITERIA_HAS_ATTACHMENT, "has_attachment"},
+ {MATCHCRITERIA_HAS_NO_ATTACHMENT, "~has_attachment"},
+ {MATCHCRITERIA_SIGNED, "signed"},
+ {MATCHCRITERIA_NOT_SIGNED, "~signed"},
/* msginfo headers */
{MATCHCRITERIA_SUBJECT, "subject"},
prop = g_new0(MatcherProp, 1);
prop->criteria = criteria;
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;
gboolean found = FALSE;
gchar *path = NULL;
- g_return_val_if_fail(address_list != NULL, FALSE);
+ cm_return_val_if_fail(address_list != NULL, FALSE);
debug_print("match_with_addresses_in_addressbook(%d, %s)\n",
g_slist_length(address_list), folderpath?folderpath:"(null)");
if (folderpath == NULL ||
- strcasecmp(folderpath, _("Any")) == 0 ||
+ strcasecmp(folderpath, "Any") == 0 ||
*folderpath == '\0')
path = NULL;
else
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH
&& !found) {
log_print(LOG_DEBUG_FILTERING,
- "address [ %s ] doesn't match\n",
+ "address [ %s ] does NOT match\n",
(gchar *)walk->data);
}
g_free(walk->data);
* matcher structure
*/
static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
- const gchar *debug_context)
+ const gchar *debug_context)
{
gchar *str1;
- gchar *str2;
+ gchar *down_expr;
gboolean ret = FALSE;
-
+ gboolean should_free = FALSE;
if (str == NULL)
return FALSE;
+ if (prop->matchtype == MATCHTYPE_REGEXPCASE ||
+ prop->matchtype == MATCHTYPE_MATCHCASE) {
+ str1 = g_utf8_casefold(str, -1);
+ down_expr = g_utf8_casefold(prop->expr, -1);
+ should_free = TRUE;
+ } else {
+ str1 = (gchar *)str;
+ down_expr = (gchar *)prop->expr;
+ should_free = FALSE;
+ }
+
switch (prop->matchtype) {
case MATCHTYPE_REGEXPCASE:
case MATCHTYPE_REGEXP:
+#ifndef G_OS_WIN32
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,
+ if (regcomp(prop->preg, down_expr,
REG_NOSUB | REG_EXTENDED
| ((prop->matchtype == MATCHTYPE_REGEXPCASE)
? REG_ICASE : 0)) != 0) {
prop->preg = NULL;
}
}
- if (prop->preg == NULL)
- return FALSE;
+ if (prop->preg == NULL) {
+ ret = FALSE;
+ goto free_strs;
+ }
- if (regexec(prop->preg, str, 0, NULL, 0) == 0)
+ if (regexec(prop->preg, str1, 0, NULL, 0) == 0)
ret = TRUE;
else
ret = FALSE;
strretchomp(stripped);
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] matches regular expression [ %s ]\n",
- debug_context, stripped, prop->expr);
+ "%s value [ %s ] matches regular expression [ %s ] (%s)\n",
+ debug_context, stripped, prop->expr,
+ prop->matchtype == MATCHTYPE_REGEXP ? _("Case sensitive"):_("Case insensitive"));
} else {
log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] doesn't matches regular expression [ %s ]\n",
- debug_context, stripped, prop->expr);
+ "%s value [ %s ] does NOT match regular expression [ %s ] (%s)\n",
+ debug_context, stripped, prop->expr,
+ prop->matchtype == MATCHTYPE_REGEXP ? _("Case sensitive"):_("Case insensitive"));
}
g_free(stripped);
}
break;
-
+#endif
+ case MATCHTYPE_MATCHCASE:
case MATCHTYPE_MATCH:
- ret = (strstr(str, prop->expr) != NULL);
+ ret = (strstr(str1, down_expr) != NULL);
/* debug output */
if (debug_filtering_session
strretchomp(stripped);
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] contains [ %s ] (case sensitive)\n",
- debug_context, stripped, prop->expr);
+ "%s value [ %s ] contains [ %s ] (%s)\n",
+ debug_context, stripped, prop->expr,
+ prop->matchtype == MATCHTYPE_MATCH ? _("Case sensitive"):_("Case insensitive"));
} else {
log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] doesn't contains [ %s ] (case sensitive)\n",
- debug_context, stripped, prop->expr);
+ "%s value [ %s ] does NOT contain [ %s ] (%s)\n",
+ debug_context, stripped, prop->expr,
+ prop->matchtype == MATCHTYPE_MATCH ? _("Case sensitive"):_("Case insensitive"));
}
g_free(stripped);
}
break;
- /* FIXME: put upper in unesc_str */
- case MATCHTYPE_MATCHCASE:
- str2 = alloca(strlen(prop->expr) + 1);
- strcpy(str2, prop->expr);
- g_strup(str2);
- str1 = alloca(strlen(str) + 1);
- strcpy(str1, str);
- g_strup(str1);
- ret = (strstr(str1, str2) != NULL);
-
- /* debug output */
- if (debug_filtering_session
- && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
- gchar *stripped = g_strdup(str);
-
- strretchomp(stripped);
- if (ret) {
- log_print(LOG_DEBUG_FILTERING,
- "%s value [ %s ] contains [ %s ] (case insensitive)\n",
- debug_context, stripped, prop->expr);
- } else {
- log_print(LOG_DEBUG_FILTERING,
- "%s [ %s ] doesn't contains [ %s ] (case insensitive)\n",
- debug_context, stripped, prop->expr);
- }
- g_free(stripped);
- }
- break;
-
default:
break;
}
+
+free_strs:
+ if (should_free) {
+ g_free(str1);
+ g_free(down_expr);
+ }
return ret;
}
return FALSE;
}
-/* FIXME body search is a hack. */
-static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *str,
- const gchar *debug_context)
+static gboolean matcherprop_header_line_match(MatcherProp *prop, const gchar *hdr,
+ const gchar *str, const gchar *debug_context)
{
- gchar *utf = NULL;
- gchar tmp[BUFFSIZE];
+ gchar *line = NULL;
gboolean res = FALSE;
- if (str == NULL)
+ if (hdr == NULL || str == NULL)
return FALSE;
- /* we try to decode QP first, because it's faster than base64 */
- qp_decode_const(tmp, BUFFSIZE-1, str);
- if (!g_utf8_validate(tmp, -1, NULL)) {
- utf = conv_codeset_strdup
- (tmp, conv_get_locale_charset_str_no_utf8(),
- CS_INTERNAL);
- res = matcherprop_string_match(prop, utf, debug_context);
- g_free(utf);
- } else {
- res = matcherprop_string_match(prop, tmp, debug_context);
- }
-
- if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')
- || strchr(str, '=') || strchr(str, '_'))) {
- /* if searching for something with an equal char, maybe
- * we should try to match the non-decoded string.
- * In case it was not qp-encoded. */
- if (!g_utf8_validate(str, -1, NULL)) {
- utf = conv_codeset_strdup
- (str, conv_get_locale_charset_str_no_utf8(),
- CS_INTERNAL);
- res = matcherprop_string_match(prop, utf, debug_context);
- g_free(utf);
- } else {
- res = matcherprop_string_match(prop, str, debug_context);
- }
- }
-
- /* FIXME base64 decoding is too slow, especially since text can
- * easily be handled as base64. Don't even try now. */
-
+ line = g_strdup_printf("%s %s", hdr, str);
+ res = matcherprop_string_match(prop, line, debug_context);
+ g_free(line);
+
return res;
}
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
result = system(td->cmd);
- if (result) perror("system");
td->done = TRUE; /* let the caller thread join() */
return GINT_TO_POINTER(result);
}
gint retval;
#ifdef USE_PTHREAD
pthread_t pt;
+ pthread_attr_t pta;
thread_data *td = g_new0(thread_data, 1);
void *res = NULL;
time_t start_time = time(NULL);
#endif
file = procmsg_get_message_file(info);
- if (file == NULL)
+ if (file == NULL) {
+#ifdef USE_PTHREAD
+ g_free(td);
+#endif
return FALSE;
+ }
g_free(file);
cmd = matching_build_command(prop->expr, info);
- if (cmd == NULL)
+ if (cmd == NULL) {
+#ifdef USE_PTHREAD
+ g_free(td);
+#endif
return FALSE;
+}
-#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
+#ifdef USE_PTHREAD
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
td->cmd = cmd;
td->done = FALSE;
- if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
- matcher_test_thread, td) != 0)
+ if (pthread_attr_init(&pta) != 0 ||
+ pthread_attr_setdetachstate(&pta, PTHREAD_CREATE_JOINABLE) != 0 ||
+ pthread_create(&pt, &pta, matcher_test_thread, td) != 0)
retval = system(cmd);
else {
- g_print("waiting for test thread\n");
+ debug_print("waiting for test thread\n");
while(!td->done) {
/* don't let the interface freeze while waiting */
claws_do_idle();
}
pthread_join(pt, &res);
retval = GPOINTER_TO_INT(res);
- g_print(" test thread returned %d\n", retval);
+ debug_print(" test thread returned %d\n", retval);
}
g_free(td);
#else
*
*\return gboolean TRUE if a match
*/
-gboolean matcherprop_match(MatcherProp *prop,
- MsgInfo *info)
+static gboolean matcherprop_match(MatcherProp *prop,
+ MsgInfo *info)
{
time_t t;
return MSG_IS_SPAM(info->flags);
case MATCHCRITERIA_NOT_SPAM:
return !MSG_IS_SPAM(info->flags);
+ case MATCHCRITERIA_HAS_ATTACHMENT:
+ return MSG_IS_WITH_ATTACHMENT(info->flags);
+ case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+ return !MSG_IS_WITH_ATTACHMENT(info->flags);
+ case MATCHCRITERIA_SIGNED:
+ return MSG_IS_SIGNED(info->flags);
+ case MATCHCRITERIA_NOT_SIGNED:
+ return !MSG_IS_SIGNED(info->flags);
case MATCHCRITERIA_COLORLABEL:
{
gint color = MSG_GET_COLORLABEL_VALUE(info->flags);
color, prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message color value [ %d ] doesn't matches color value [ %d ]\n",
+ "message color value [ %d ] does NOT match color value [ %d ]\n",
color, prop->value);
}
}
color, prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message color value [ %d ] doesn't matches color value [ %d ]\n",
+ "message color value [ %d ] does NOT match color value [ %d ]\n",
color, prop->value);
}
}
t = time(NULL);
age = ((t - info->date_t) / (60 * 60 * 24));
- ret = (age > prop->value);
+ ret = (age >= prop->value);
/* debug output */
if (debug_filtering_session
}
case MATCHCRITERIA_SIZE_GREATER:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->size > (off_t) prop->value);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->size > (goffset) prop->value);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is greater than [ %d ]\n",
- info->size, prop->value);
+ "message size is greater than [ %d ]\n",
+ prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is not greater than [ %d ]\n",
- info->size, prop->value);
+ "message size is not greater than [ %d ]\n",
+ prop->value);
}
}
return ret;
}
case MATCHCRITERIA_SIZE_SMALLER:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->size < (off_t) prop->value);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->size < (goffset) prop->value);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is smaller than [ %d ]\n",
- info->size, prop->value);
+ "message size is smaller than [ %d ]\n",
+ prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is not smaller than [ %d ]\n",
- info->size, prop->value);
+ "message size is not smaller than [ %d ]\n",
+ prop->value);
}
}
return ret;
}
case MATCHCRITERIA_SIZE_EQUAL:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->size == (off_t) prop->value);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->size == (goffset) prop->value);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is equal to [ %d ]\n",
- info->size, prop->value);
+ "message size is equal to [ %d ]\n",
+ prop->value);
} else {
log_print(LOG_DEBUG_FILTERING,
- "message size [ %ld ] is not equal to [ %d ]\n",
- info->size, prop->value);
+ "message size is not equal to [ %d ]\n",
+ prop->value);
}
}
return ret;
}
case MATCHCRITERIA_PARTIAL:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->total_size != 0 && info->size != (off_t)info->total_size);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->total_size != 0 && info->size != (goffset)info->total_size);
/* debug output */
if (debug_filtering_session
&& prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
if (ret) {
log_print(LOG_DEBUG_FILTERING,
- "message is partially downloaded, size [ %ld ] is less than total size [ %d ])\n",
- info->size, info->total_size);
+ "message is partially downloaded, size is less than total size [ %d ])\n",
+ info->total_size);
} else {
log_print(LOG_DEBUG_FILTERING,
"message is not partially downloaded\n");
}
case MATCHCRITERIA_NOT_PARTIAL:
{
- /* FIXME: info->size is an off_t */
- gboolean ret = (info->total_size == 0 || info->size == (off_t)info->total_size);
+ /* FIXME: info->size is a goffset */
+ gboolean ret = (info->total_size == 0 || info->size == (goffset)info->total_size);
/* debug output */
if (debug_filtering_session
"message is not partially downloaded\n");
} else {
log_print(LOG_DEBUG_FILTERING,
- "message is partially downloaded, size [ %ld ] is less than total size [ %d ])\n",
- info->size, info->total_size);
+ "message is partially downloaded, size is less than total size [ %d ])\n",
+ info->total_size);
}
}
return ret;
{
GSList *l;
- g_return_if_fail(cond);
+ cm_return_if_fail(cond);
for (l = cond->matchers ; l != NULL ; l = g_slist_next(l)) {
matcherprop_free((MatcherProp *) l->data);
}
+ g_slist_free(cond->matchers);
g_free(cond);
}
}
break;
case MATCHCRITERIA_HEADERS_PART:
- return matcherprop_string_match(matcher, buf, _("header line"));
- case MATCHCRITERIA_NOT_HEADERS_PART:
- return !matcherprop_string_match(matcher, buf, _("headers line"));
case MATCHCRITERIA_MESSAGE:
- return matcherprop_string_decode_match(matcher, buf, _("message line"));
+ header = procheader_parse_header(buf);
+ if (!header)
+ return FALSE;
+ result = matcherprop_header_line_match(matcher,
+ header->name, header->body, _("header line"));
+ procheader_header_free(header);
+ return result;
+ case MATCHCRITERIA_NOT_HEADERS_PART:
case MATCHCRITERIA_NOT_MESSAGE:
- return !matcherprop_string_decode_match(matcher, buf, _("message line"));
+ header = procheader_parse_header(buf);
+ if (!header)
+ return FALSE;
+ result = !matcherprop_header_line_match(matcher,
+ header->name, header->body, _("header line"));
+ procheader_header_free(header);
+ return result;
case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
{
gboolean found = FALSE;
/* how many address headers are me trying to mach? */
- if (strcasecmp(matcher->header, _("Any")) == 0)
+ if (strcasecmp(matcher->header, "Any") == 0)
match = MATCH_ANY;
- else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
+ else if (strcasecmp(matcher->header, "All") == 0)
match = MATCH_ALL;
if (match == MATCH_ONE) {
procheader_headername_equal(header->name, "Reply-To") ||
procheader_headername_equal(header->name, "Sender"))) {
- if (strcasecmp(matcher->header, _("Any")) == 0)
+ if (strcasecmp(matcher->header, "Any") == 0)
match = MATCH_ANY;
- else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
+ else if (strcasecmp(matcher->header, "All") == 0)
match = MATCH_ALL;
else
match = MATCH_ONE;
}
}
-/*!
- *\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, const gchar *line)
-{
- switch (matcher->criteria) {
- case MATCHCRITERIA_BODY_PART:
- case MATCHCRITERIA_MESSAGE:
- return matcherprop_string_decode_match(matcher, line, _("body line"));
- case MATCHCRITERIA_NOT_BODY_PART:
- case MATCHCRITERIA_NOT_MESSAGE:
- return !matcherprop_string_decode_match(matcher, line, _("body line"));
- }
- return FALSE;
-}
-
/*!
*\brief Check if a line in a message file's body matches
* the criteria
*
*\return gboolean TRUE if succesful match
*/
-static gboolean matcherlist_match_body(MatcherList *matchers, FILE *fp)
+static gboolean matcherlist_match_body(MatcherList *matchers, gboolean body_only, MsgInfo *info)
{
GSList *l;
+ MimeInfo *mimeinfo = NULL;
+ MimeInfo *partinfo = NULL;
gchar buf[BUFFSIZE];
-
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
- MatcherProp *matcher = (MatcherProp *) l->data;
-
- if (matcher->done)
- continue;
+ gboolean first_text_found = FALSE;
+ FILE *outfp = NULL;
- /* if the criteria is ~body_part or ~message, ZERO lines
- * must NOT match for the rule to match. */
- if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
- matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
- if (matcherprop_match_line(matcher, buf)) {
- matcher->result = TRUE;
- } else {
- matcher->result = FALSE;
- matcher->done = TRUE;
- }
- /* else, just one line has to match */
- } else if (matcherprop_criteria_body(matcher) ||
- matcherprop_criteria_message(matcher)) {
- if (matcherprop_match_line(matcher, buf)) {
- matcher->result = TRUE;
- matcher->done = TRUE;
+ cm_return_val_if_fail(info != NULL, FALSE);
+
+ mimeinfo = procmime_scan_message(info);
+
+ /* Skip headers */
+ partinfo = procmime_mimeinfo_next(mimeinfo);
+
+ for (; partinfo != NULL; partinfo = procmime_mimeinfo_next(partinfo)) {
+
+ if (partinfo->type != MIMETYPE_TEXT && body_only)
+ continue;
+
+ if (partinfo->type == MIMETYPE_TEXT) {
+ first_text_found = TRUE;
+ outfp = procmime_get_text_content(partinfo);
+ } else
+ outfp = procmime_get_binary_content(partinfo);
+
+ if (!outfp) {
+ procmime_mimeinfo_free_all(mimeinfo);
+ return FALSE;
+ }
+
+ while (fgets(buf, sizeof(buf), outfp) != NULL) {
+ strretchomp(buf);
+
+ for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
+ MatcherProp *matcher = (MatcherProp *) l->data;
+
+ if (matcher->done)
+ continue;
+
+ /* Don't scan non-text parts when looking in body, only
+ * when looking in whole message
+ */
+ if (partinfo && partinfo->type != MIMETYPE_TEXT &&
+ (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
+ matcher->criteria == MATCHCRITERIA_BODY_PART))
+ continue;
+
+ /* if the criteria is ~body_part or ~message, ZERO lines
+ * must match for the rule to match.
+ */
+ if (matcher->criteria == MATCHCRITERIA_NOT_BODY_PART ||
+ matcher->criteria == MATCHCRITERIA_NOT_MESSAGE) {
+ if (matcherprop_string_match(matcher, buf,
+ _("body line"))) {
+ matcher->result = FALSE;
+ matcher->done = TRUE;
+ } else
+ matcher->result = TRUE;
+ /* else, just one line has to match */
+ } else if (matcherprop_criteria_body(matcher) ||
+ matcherprop_criteria_message(matcher)) {
+ if (matcherprop_string_match(matcher, buf,
+ _("body line"))) {
+ matcher->result = TRUE;
+ matcher->done = TRUE;
+ }
}
- }
- /* if the matchers are OR'ed and the rule matched,
- * no need to check the others. */
- if (matcher->result && matcher->done) {
- if (!matchers->bool_and)
- return TRUE;
+ /* if the matchers are OR'ed and the rule matched,
+ * no need to check the others. */
+ if (matcher->result && matcher->done) {
+ if (!matchers->bool_and) {
+ procmime_mimeinfo_free_all(mimeinfo);
+ fclose(outfp);
+ return TRUE;
+ }
+ }
}
}
+ fclose(outfp);
+
+ if (body_only && first_text_found)
+ break;
}
+ procmime_mimeinfo_free_all(mimeinfo);
+
return FALSE;
}
{
gboolean read_headers;
gboolean read_body;
+ gboolean body_only;
GSList *l;
FILE *fp;
gchar *file;
read_headers = FALSE;
read_body = FALSE;
+ body_only = TRUE;
for (l = matchers->matchers ; l != NULL ; l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
if (matcherprop_criteria_message(matcher)) {
read_headers = TRUE;
read_body = TRUE;
+ body_only = FALSE;
}
matcher->result = FALSE;
matcher->done = FALSE;
/* read the body */
if (read_body) {
- matcherlist_match_body(matchers, fp);
+ matcherlist_match_body(matchers, body_only, info);
}
for (l = matchers->matchers; l != NULL; l = g_slist_next(l)) {
case MATCHCRITERIA_NOT_LOCKED:
case MATCHCRITERIA_SPAM:
case MATCHCRITERIA_NOT_SPAM:
+ case MATCHCRITERIA_HAS_ATTACHMENT:
+ case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+ case MATCHCRITERIA_SIGNED:
+ case MATCHCRITERIA_NOT_SIGNED:
case MATCHCRITERIA_COLORLABEL:
case MATCHCRITERIA_NOT_COLORLABEL:
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_LOCKED:
case MATCHCRITERIA_SPAM:
case MATCHCRITERIA_NOT_SPAM:
+ case MATCHCRITERIA_HAS_ATTACHMENT:
+ case MATCHCRITERIA_HAS_NO_ATTACHMENT:
+ case MATCHCRITERIA_SIGNED:
+ case MATCHCRITERIA_NOT_SIGNED:
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
case MATCHCRITERIA_IGNORE_THREAD:
/* matching_build_command() - preferably cmd should be unescaped */
/*!
- *\brief Build the command line to execute
+ *\brief Build the command-line to execute
*
- *\param cmd String with command line specifiers
+ *\param cmd String with command-line specifiers
*\param info Message info to use for command
*
*\return gchar * Newly allocated string
*\param fp File
*\param prefs_filtering List of filtering conditions
*/
-static void prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
+static int prefs_filtering_write(FILE *fp, GSList *prefs_filtering)
{
GSList *cur = NULL;
if (prop->enabled) {
if (fputs("enabled ", fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs");
- return;
+ return -1;
}
} else {
if (fputs("disabled ", fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs");
- return;
+ return -1;
}
}
if (fputs("rulename \"", fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs");
g_free(filtering_str);
- return;
+ return -1;
}
tmp_name = prop->name;
while (tmp_name && *tmp_name != '\0') {
if (fputc(*tmp_name, fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs || fputc");
g_free(filtering_str);
- return;
+ return -1;
}
} else if (*tmp_name == '"') {
if (fputc('\\', fp) == EOF ||
fputc('"', fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs || fputc");
g_free(filtering_str);
- return;
+ return -1;
}
}
tmp_name ++;
if (fputs("\" ", fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs");
g_free(filtering_str);
- return;
+ return -1;
}
if (prop->account_id != 0) {
if (fputs(tmp, fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs");
g_free(tmp);
- return;
+ return -1;
}
g_free(tmp);
}
fputc('\n', fp) == EOF) {
FILE_OP_ERROR("filtering config", "fputs || fputc");
g_free(filtering_str);
- return;
+ return -1;
}
g_free(filtering_str);
}
+
+ return 0;
}
+typedef struct _NodeLoopData {
+ FILE *fp;
+ gboolean error;
+} NodeLoopData;
+
/*!
*\brief Write matchers from a folder item
*
*
*\return gboolean FALSE
*/
-static gboolean prefs_matcher_write_func(GNode *node, gpointer data)
+static gboolean prefs_matcher_write_func(GNode *node, gpointer d)
{
FolderItem *item;
- FILE *fp = data;
+ NodeLoopData *data = (NodeLoopData *)d;
gchar *id;
GSList *prefs_filtering;
prefs_filtering = item->prefs->processing;
if (prefs_filtering != NULL) {
- fprintf(fp, "[%s]\n", id);
- prefs_filtering_write(fp, prefs_filtering);
- fputc('\n', fp);
+ if (fprintf(data->fp, "[%s]\n", id) < 0) {
+ data->error = TRUE;
+ goto fail;
+ }
+ if (prefs_filtering_write(data->fp, prefs_filtering) < 0) {
+ data->error = TRUE;
+ goto fail;
+ }
+ if (fputc('\n', data->fp) == EOF) {
+ data->error = TRUE;
+ goto fail;
+ }
}
-
+fail:
g_free(id);
return FALSE;
*
*\param fp File
*/
-static void prefs_matcher_save(FILE *fp)
+static int prefs_matcher_save(FILE *fp)
{
GList *cur;
+ NodeLoopData data;
+
+ data.fp = fp;
+ data.error = FALSE;
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, &data);
}
+ if (data.error == TRUE)
+ return -1;
+
/* pre global rules */
- fprintf(fp, "[preglobal]\n");
- prefs_filtering_write(fp, pre_global_processing);
- fputc('\n', fp);
+ if (fprintf(fp, "[preglobal]\n") < 0 ||
+ prefs_filtering_write(fp, pre_global_processing) < 0 ||
+ fputc('\n', fp) == EOF)
+ return -1;
/* post global rules */
- fprintf(fp, "[postglobal]\n");
- prefs_filtering_write(fp, post_global_processing);
- fputc('\n', fp);
+ if (fprintf(fp, "[postglobal]\n") < 0 ||
+ prefs_filtering_write(fp, post_global_processing) < 0 ||
+ fputc('\n', fp) == EOF)
+ return -1;
/* filtering rules */
- fprintf(fp, "[filtering]\n");
- prefs_filtering_write(fp, filtering_rules);
- fputc('\n', fp);
+ if (fprintf(fp, "[filtering]\n") < 0 ||
+ prefs_filtering_write(fp, filtering_rules) < 0 ||
+ fputc('\n', fp) == EOF)
+ return -1;
+
+ return 0;
}
/*!
return;
}
-
- prefs_matcher_save(pfile->fp);
-
g_free(rcpath);
- if (prefs_file_close(pfile) < 0) {
+ if (prefs_matcher_save(pfile->fp) < 0) {
g_warning("failed to write configuration to file\n");
- return;
+ prefs_file_close_revert(pfile);
+ } else if (prefs_file_close(pfile) < 0) {
+ g_warning("failed to save configuration to file\n");
}
}
FILE *src = g_fopen(rcpath, "rb");
FILE *dst = g_fopen(newpath, "wb");
gchar buf[BUFFSIZE];
-
+ int r;
+ if (src == NULL) {
+ perror("fopen");
+ if (dst)
+ fclose(dst);
+ g_free(newpath);
+ return;
+ }
if (dst == NULL) {
perror("fopen");
+ if (src)
+ fclose(src);
g_free(newpath);
return;
}
&& strncmp(buf, "rulename \"", 10)
&& strncmp(buf, "enabled rulename \"", 18)
&& strncmp(buf, "disabled rulename \"", 18)) {
- fwrite("enabled rulename \"\" ",
+ r = fwrite("enabled rulename \"\" ",
strlen("enabled rulename \"\" "), 1, dst);
}
- fwrite(buf, strlen(buf), 1, dst);
+ r = fwrite(buf, strlen(buf), 1, dst);
}
fclose(dst);
fclose(src);
projects / claws.git / blobdiff