diff -r 1a5f0c5987d0 -r 45696d13651f src.overquota --- a/src.overquota Tue May 17 16:19:46 2011 +0200 +++ b/src.overquota Thu May 26 23:05:19 2011 +0200 @@ -1,9 +1,9 @@ # HG changeset patch -# Parent f28044d5dcaf4418eb3c92fd325ce439c57cbab4 +# Parent c61873df44aedd71ff4e40bc1067f8f03f6afd5b -diff -r f28044d5dcaf doc/spec.txt ---- a/doc/spec.txt Tue May 17 16:17:21 2011 +0200 -+++ b/doc/spec.txt Tue May 17 16:17:42 2011 +0200 +diff -r c61873df44ae doc/spec.txt +--- a/doc/spec.txt Tue May 17 16:24:29 2011 +0200 ++++ b/doc/spec.txt Fri May 20 11:48:11 2011 +0200 @@ -4,6 +4,16 @@ Copyright (c) 2011 University of Cambridge @@ -21,9 +21,9 @@ +-----------------------------------------------------------------------------+ +-------------------------------------+--------------------------------+------+ |Revision 4.76 |06 May 2011 |EM | -diff -r f28044d5dcaf src/transports/appendfile.c ---- a/src/transports/appendfile.c Tue May 17 16:17:21 2011 +0200 -+++ b/src/transports/appendfile.c Tue May 17 16:17:42 2011 +0200 +diff -r c61873df44ae src/transports/appendfile.c +--- a/src/transports/appendfile.c Tue May 17 16:24:29 2011 +0200 ++++ b/src/transports/appendfile.c Fri May 20 11:48:11 2011 +0200 @@ -104,6 +104,8 @@ #ifdef SUPPORT_MAILDIR { "maildir_format", opt_bool, @@ -41,15 +41,7 @@ US"^(?:cur|new|\\..*)$", /* maildir_dir_regex */ NULL, /* maildir_tag */ NULL, /* maildirfolder_create_regex */ -@@ -308,6 +311,7 @@ - ob->maildir_use_size_file = expand_check_condition(ob->expand_maildir_use_size_file, - US"`maildir_use_size_file` in transport", tblock->name); - -+//debug_printf("***>>>>>>>>>>>>> %s\n", ob->maildir_use_size_file); - /* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size, - mailbox_filecount */ - -@@ -2778,9 +2782,10 @@ +@@ -2778,9 +2781,10 @@ is for the mailbox already being over quota (i.e. the current message is not included in the check). */ @@ -62,7 +54,7 @@ { debug_printf("Exim quota = " OFF_T_FMT " old size = " OFF_T_FMT " this message = %d (%sincluded)\n", -@@ -2791,31 +2796,62 @@ +@@ -2791,31 +2795,62 @@ } if (mailbox_size + (ob->quota_is_inclusive? message_size:0) > ob->quota_value) { @@ -140,9 +132,9 @@ } } -diff -r f28044d5dcaf src/transports/appendfile.h ---- a/src/transports/appendfile.h Tue May 17 16:17:21 2011 +0200 -+++ b/src/transports/appendfile.h Tue May 17 16:17:42 2011 +0200 +diff -r c61873df44ae src/transports/appendfile.h +--- a/src/transports/appendfile.h Tue May 17 16:24:29 2011 +0200 ++++ b/src/transports/appendfile.h Fri May 20 11:48:11 2011 +0200 @@ -24,6 +24,7 @@ uschar *mailbox_size_string; uschar *mailbox_filecount_string;