--- a/src.lock_maildirsize Thu Feb 24 10:43:12 2011 +0100
+++ b/src.lock_maildirsize Thu Feb 24 17:18:01 2011 +0100
@@ -1,46 +1,21 @@
# HG changeset patch
-# Parent 68c3fb9c52b0af6e32558b20d60b34d0cc9daef4
+# Parent 148c0a8c561d4cc98dd473167fa50d2c59760400
-diff -r 68c3fb9c52b0 OS/Makefile-Linux
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/OS/Makefile-Linux Thu Feb 24 10:42:47 2011 +0100
-@@ -0,0 +1,33 @@
-+# $Cambridge: exim/src/OS/Makefile-Linux,v 1.4 2008/08/11 15:30:02 fanf2 Exp $
-+
-+# Exim: OS-specific make file for Linux. This is for modern Linuxes,
-+# which use libc6.
-+
-+HAVE_ICONV=yes
-+
-+BASENAME_COMMAND=look_for_it
-+CHOWN_COMMAND=look_for_it
-+CHGRP_COMMAND=look_for_it
-+CHMOD_COMMAND=look_for_it
-+
-+CFLAGS=-O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CFLAGS_DYNAMIC=-shared -rdynamic
-+
-+DBMLIB = -ldb
-+USE_DB = yes
-+
+diff -r 148c0a8c561d OS/Makefile-Linux
+--- a/OS/Makefile-Linux Thu Feb 24 17:15:25 2011 +0100
++++ b/OS/Makefile-Linux Thu Feb 24 17:17:37 2011 +0100
+@@ -16,7 +16,7 @@
+ DBMLIB = -ldb
+ USE_DB = yes
+
+-LIBS = -lnsl -lcrypt -lm
+LIBS = -lnsl -lcrypt -lm -lrt
-+LIBRESOLV = -lresolv
-+
-+X11=/usr/X11R6
-+XINCLUDE=-I$(X11)/include
-+XLFLAGS=-L$(X11)/lib
-+X11_LD_LIB=$(X11)/lib
-+
-+EXIWHAT_PS_ARG=ax
-+EXIWHAT_EGREP_ARG='/exim( |$$)'
-+EXIWHAT_MULTIKILL_CMD=killall
-+EXIWHAT_MULTIKILL_ARG=exim
-+EXIWHAT_KILL_SIGNAL=-USR1
-+
-+# End
-diff -r 68c3fb9c52b0 src/transports/appendfile.c
---- a/src/transports/appendfile.c Thu Feb 24 10:39:43 2011 +0100
-+++ b/src/transports/appendfile.c Thu Feb 24 10:42:47 2011 +0100
+ LIBRESOLV = -lresolv
+
+ X11=/usr/X11R6
+diff -r 148c0a8c561d src/transports/appendfile.c
+--- a/src/transports/appendfile.c Thu Feb 24 17:15:25 2011 +0100
++++ b/src/transports/appendfile.c Thu Feb 24 17:17:37 2011 +0100
@@ -13,6 +13,7 @@
#ifdef SUPPORT_MAILDIR
@@ -160,9 +135,9 @@
#ifdef SUPPORT_MBX
if (mbx_lockfd >= 0)
-diff -r 68c3fb9c52b0 src/transports/appendfile.h
---- a/src/transports/appendfile.h Thu Feb 24 10:39:43 2011 +0100
-+++ b/src/transports/appendfile.h Thu Feb 24 10:42:47 2011 +0100
+diff -r 148c0a8c561d src/transports/appendfile.h
+--- a/src/transports/appendfile.h Thu Feb 24 17:15:25 2011 +0100
++++ b/src/transports/appendfile.h Thu Feb 24 17:17:37 2011 +0100
@@ -95,5 +95,8 @@
/* Function that is shared with tf_maildir.c */
@@ -172,9 +147,9 @@
+
/* End of transports/appendfile.h */
-diff -r 68c3fb9c52b0 src/transports/tf_maildir.c
---- a/src/transports/tf_maildir.c Thu Feb 24 10:39:43 2011 +0100
-+++ b/src/transports/tf_maildir.c Thu Feb 24 10:42:47 2011 +0100
+diff -r 148c0a8c561d src/transports/tf_maildir.c
+--- a/src/transports/tf_maildir.c Thu Feb 24 17:15:25 2011 +0100
++++ b/src/transports/tf_maildir.c Thu Feb 24 17:17:37 2011 +0100
@@ -367,13 +367,16 @@
Returns: >=0 a file descriptor for an open maildirsize file
@@ -299,29 +274,3 @@
DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT
" filecount=%d\n", size, filecount);
*returned_size = size;
-diff -r 68c3fb9c52b0 src/transports/tf_maildir.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/transports/tf_maildir.h Thu Feb 24 10:42:47 2011 +0100
-@@ -0,0 +1,22 @@
-+/* $Cambridge: exim/src/src/transports/tf_maildir.h,v 1.7 2009/11/16 19:56:54 nm4 Exp $ */
-+
-+/*************************************************
-+* Exim - an Internet mail transport agent *
-+*************************************************/
-+
-+/* Copyright (c) University of Cambridge 1995 - 2009 */
-+/* See the file NOTICE for conditions of use and distribution. */
-+
-+/* Header file for the functions that are used to support the use of
-+maildirsize files for quota handling in maildir directories. */
-+
-+extern off_t maildir_compute_size(uschar *, int *, time_t *, const pcre *,
-+ const pcre *, BOOL);
-+extern BOOL maildir_ensure_directories(uschar *, address_item *, BOOL, int,
-+ uschar *);
-+extern int maildir_ensure_sizefile(uschar *,
-+ appendfile_transport_options_block *, const pcre *,
-+ const pcre *, off_t *, int *, uschar **);
-+extern void maildir_record_length(int, int);
-+
-+/* End of tf_maildir.h */