From 2b94d904b8c03ab9ae4074230ac50aa1ad7f362b Mon Sep 17 00:00:00 2001 From: Sam Varshavchik Date: Wed, 28 Aug 2013 21:03:32 -0400 Subject: 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. --- maildir/maildirfilter.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'maildir/maildirfilter.h') 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 { \ -- cgit v1.2.3