--- a/src.lock_maildirsize Thu Apr 07 16:15:57 2011 +0200
+++ b/src.lock_maildirsize Wed Apr 13 12:23:23 2011 +0200
@@ -1,9 +1,9 @@
# HG changeset patch
-# Parent 3cbad740cf65b90cb75768c7784ac22a8ee7622d
+# Parent 725ab374f90553e848d1c418c11003dab45ec07c
-diff -r 3cbad740cf65 src/transports/appendfile.c
---- a/src/transports/appendfile.c Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/appendfile.c Fri Apr 01 14:06:51 2011 +0200
+diff -r 725ab374f905 src/transports/appendfile.c
+--- a/src/transports/appendfile.c Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/appendfile.c Wed Apr 13 12:08:39 2011 +0200
@@ -13,6 +13,7 @@
#ifdef SUPPORT_MAILDIR
@@ -12,8 +12,8 @@
#endif
-@@ -239,6 +240,30 @@
- TRUE /* quota_is_inclusive */
+@@ -241,6 +242,30 @@
+ FALSE /* quota_filecount_no_check */
};
+void hs12_lock(int fd, int type, const char* msg)
@@ -43,7 +43,7 @@
/*************************************************
-@@ -278,8 +303,8 @@
+@@ -280,8 +305,8 @@
gid = gid;
if (ob->expand_maildir_use_size_file)
@@ -54,7 +54,7 @@
/* Loop for quota, quota_filecount, quota_warn_threshold, mailbox_size,
mailbox_filecount */
-@@ -841,7 +866,7 @@
+@@ -855,7 +880,7 @@
sigalrm_seen set if there has been a timeout
*/
@@ -63,7 +63,7 @@
apply_lock(int fd, int fcntltype, BOOL dofcntl, int fcntltime, BOOL doflock,
int flocktime)
{
-@@ -887,7 +912,6 @@
+@@ -901,7 +926,6 @@
@@ -71,7 +71,7 @@
#ifdef SUPPORT_MBX
/*************************************************
* Copy message into MBX mailbox *
-@@ -2417,18 +2441,19 @@
+@@ -2433,18 +2457,19 @@
{
off_t size;
int filecount;
@@ -94,7 +94,7 @@
if (mailbox_size < 0) mailbox_size = size;
if (mailbox_filecount < 0) mailbox_filecount = filecount;
}
-@@ -3125,6 +3150,12 @@
+@@ -3154,6 +3179,12 @@
uschar *renamename = newname;
fd = -1;
@@ -107,7 +107,7 @@
DEBUG(D_transport) debug_printf("renaming temporary file\n");
/* If there is no rename name set, we are in a non-maildir, non-mailstore
-@@ -3245,6 +3276,7 @@
+@@ -3274,6 +3305,7 @@
filename = dataname = NULL; /* Prevents attempt to unlink at end */
}
} /* maildir or mailstore */
@@ -115,7 +115,7 @@
} /* successful write + close */
} /* isdirectory */
} /* write success */
-@@ -3280,6 +3312,11 @@
+@@ -3309,6 +3341,11 @@
detected, in order to get the file closed and the lock file tidied away. */
RETURN:
@@ -127,10 +127,10 @@
#ifdef SUPPORT_MBX
if (mbx_lockfd >= 0)
-diff -r 3cbad740cf65 src/transports/appendfile.h
---- a/src/transports/appendfile.h Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/appendfile.h Fri Apr 01 14:06:51 2011 +0200
-@@ -95,5 +95,8 @@
+diff -r 725ab374f905 src/transports/appendfile.h
+--- a/src/transports/appendfile.h Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/appendfile.h Wed Apr 13 12:08:39 2011 +0200
+@@ -97,5 +97,8 @@
/* Function that is shared with tf_maildir.c */
extern off_t check_dir_size(uschar *, int *, const pcre *);
@@ -139,9 +139,9 @@
+
/* End of transports/appendfile.h */
-diff -r 3cbad740cf65 src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/tf_maildir.c Fri Apr 01 14:06:51 2011 +0200
+diff -r 725ab374f905 src/transports/tf_maildir.c
+--- a/src/transports/tf_maildir.c Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/tf_maildir.c Wed Apr 13 12:08:39 2011 +0200
@@ -367,13 +367,16 @@
Returns: >=0 a file descriptor for an open maildirsize file
@@ -248,9 +248,9 @@
DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT
" filecount=%d\n", size, filecount);
*returned_size = size;
-diff -r 3cbad740cf65 src/transports/tf_maildir.h
---- a/src/transports/tf_maildir.h Fri Apr 01 14:06:51 2011 +0200
-+++ b/src/transports/tf_maildir.h Fri Apr 01 14:06:51 2011 +0200
+diff -r 725ab374f905 src/transports/tf_maildir.h
+--- a/src/transports/tf_maildir.h Wed Apr 13 12:08:31 2011 +0200
++++ b/src/transports/tf_maildir.h Wed Apr 13 12:08:39 2011 +0200
@@ -16,7 +16,7 @@
uschar *);
extern int maildir_ensure_sizefile(uschar *,