From: Vsevolod Stakhov Date: Thu, 23 Jul 2009 13:16:36 +0000 (+0400) Subject: * Fix error with statfiles sorting function X-Git-Tag: 0.2.7~76 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ab9bba4afc865f30ecd93570cf6b512cb71f4570;p=rspamd.git * Fix error with statfiles sorting function --- diff --git a/conf/lotto.inc b/conf/lotto.inc index 78ffdea57..40cb98f2a 100644 --- a/conf/lotto.inc +++ b/conf/lotto.inc @@ -11,6 +11,6 @@ $__KAM_LOTTO4="/(claims (officer|agent)|lottery coordinator|fiduciary (officer|a $__KAM_LOTTO5="/(freelotto group|Royal Heritage Lottery|UK National (Online)? Lottery|U\.?K\.? Grand Promotions|Lottery Department UK|Euromillion Loteria|Luckyday International Lottery|International Lottery)/isrP"; $__KAM_LOTTO6="/(Dear Lucky Winner|Winning Notification|Attention:Winner|Dear Winner)/isrP"; $__KAM_LOTTO7="Subject=/(Your Lucky Day|(Attention:|ONLINE) WINNER)/iH"; -$KAM_LOTTO1="(${R_UNDISC_RCPT} | ${R_BAD_CTE_7BIT} | ${R_NO_SPACE_IN_FROM}) & regexp_match_number(3, ${__KAM_LOTTO1}, ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6}, ${__KAM_LOTTO7})"; -$R_LOTTO="(${R_UNDISC_RCPT} | ${R_BAD_CTE_7BIT} | ${R_NO_SPACE_IN_FROM}) & regexp_match_number(3, ${__KAM_LOTTO1}, ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6})"; +$KAM_LOTTO1="regexp_match_number(3, ${__KAM_LOTTO1}, ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6}, ${__KAM_LOTTO7})"; +#$R_LOTTO="regexp_match_number(3, ${__KAM_LOTTO1}, ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6})"; diff --git a/src/statfile.c b/src/statfile.c index 048ebc485..d1382e368 100644 --- a/src/statfile.c +++ b/src/statfile.c @@ -35,7 +35,7 @@ cmpstatfile (const void *a, const void *b) { const stat_file_t *s1 = a, *s2 = b; - return rspamd_strcase_equal (s1->filename, s2->filename); + return g_ascii_strcasecmp (s1->filename, s2->filename); } /* Check whether specified file is statistic file and calculate its len in blocks */