summaryrefslogtreecommitdiffstats
path: root/maildir/maildirfilter.h
diff options
context:
space:
mode:
authorSam Varshavchik2013-08-28 21:03:32 -0400
committerSam Varshavchik2013-08-28 21:57:00 -0400
commit2b94d904b8c03ab9ae4074230ac50aa1ad7f362b (patch)
tree03d9f87855ff8d1cca2cd2592b63da6f9d22ad42 /maildir/maildirfilter.h
parente0a0a6eba9f31aea09624b3ea21fb75107c96780 (diff)
downloadcourier-libs-2b94d904b8c03ab9ae4074230ac50aa1ad7f362b.tar.bz2
Update sqwebmail to talk to UTF-8-able maildrop.
Writes out mail filtering scripts in UTF-8. maildir_filter_appendrule() and maildir_filter_ruleupdate() take an additional parameter, a character set, and convert the header name, value, and rule name parameters from the given character set to UTF-8. sqwebmail passes the current character set, when adding or updating maildrop rules.
Diffstat (limited to 'maildir/maildirfilter.h')
-rw-r--r--maildir/maildirfilter.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/maildir/maildirfilter.h b/maildir/maildirfilter.h
index 59cdee7..3d4bfdf 100644
--- a/maildir/maildirfilter.h
+++ b/maildir/maildirfilter.h
@@ -26,7 +26,7 @@ enum maildirfiltertype {
struct maildirfilterrule {
struct maildirfilterrule *next, *prev;
- char *rulename;
+ char *rulename_utf8;
enum maildirfiltertype type;
int flags;
@@ -37,8 +37,8 @@ struct maildirfilterrule {
#define MFR_CONTINUE 4 /* Continue filtering (cc instead of to) */
#define MFR_PLAINSTRING 8 /* Pattern is a plain string, not a regex */
- char *fieldname; /* Match this header */
- char *fieldvalue; /* Match/search value */
+ char *fieldname_utf8; /* Match this header */
+ char *fieldvalue_utf8; /* Match/search value */
char *tofolder; /* Destination folder, fwd address, err msg */
char *fromhdr; /* From: header on autoreplies. */
} ;
@@ -62,6 +62,7 @@ struct maildirfilterrule *maildir_filter_appendrule(struct maildirfilter *r,
const char *value,
const char *folder,
const char *fromhdr,
+ const char *rulecharset,
int *errcode); /* Append a new rule */
int maildir_filter_setautoreplyfrom(struct maildirfilter *, const char *);
@@ -85,6 +86,7 @@ int maildir_filter_ruleupdate(struct maildirfilter *, struct maildirfilterrule *
const char *,
const char *,
const char *,
+ const char *,
int *);
#define maildir_filter_freerules(r) do { \