# HG changeset patch # User Heiko Schlittermann (I24) # Date 1298564501 -3600 # Node ID 311a14a1961e05ba2019e29163061e6b6297d247 # Parent 1c01680ee818430067b32c163da7b18cb7141a62 fixed tf_maildir.h diff -r 1c01680ee818 -r 311a14a1961e src.lock_maildirsize --- a/src.lock_maildirsize Thu Feb 24 17:21:26 2011 +0100 +++ b/src.lock_maildirsize Thu Feb 24 17:21:41 2011 +0100 @@ -1,9 +1,9 @@ # HG changeset patch -# Parent 148c0a8c561d4cc98dd473167fa50d2c59760400 +# Parent 52fd74447005c5bef643b4dbe767791d334312ad -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 +diff -r 52fd74447005 OS/Makefile-Linux +--- a/OS/Makefile-Linux Thu Feb 24 17:19:04 2011 +0100 ++++ b/OS/Makefile-Linux Thu Feb 24 17:20:54 2011 +0100 @@ -16,7 +16,7 @@ DBMLIB = -ldb USE_DB = yes @@ -13,9 +13,9 @@ 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 +diff -r 52fd74447005 src/transports/appendfile.c +--- a/src/transports/appendfile.c Thu Feb 24 17:19:04 2011 +0100 ++++ b/src/transports/appendfile.c Thu Feb 24 17:20:54 2011 +0100 @@ -13,6 +13,7 @@ #ifdef SUPPORT_MAILDIR @@ -135,9 +135,9 @@ #ifdef SUPPORT_MBX if (mbx_lockfd >= 0) -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 +diff -r 52fd74447005 src/transports/appendfile.h +--- a/src/transports/appendfile.h Thu Feb 24 17:19:04 2011 +0100 ++++ b/src/transports/appendfile.h Thu Feb 24 17:20:54 2011 +0100 @@ -95,5 +95,8 @@ /* Function that is shared with tf_maildir.c */ @@ -147,9 +147,9 @@ + /* End of transports/appendfile.h */ -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 +diff -r 52fd74447005 src/transports/tf_maildir.c +--- a/src/transports/tf_maildir.c Thu Feb 24 17:19:04 2011 +0100 ++++ b/src/transports/tf_maildir.c Thu Feb 24 17:20:54 2011 +0100 @@ -367,13 +367,16 @@ Returns: >=0 a file descriptor for an open maildirsize file @@ -274,3 +274,15 @@ DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT " filecount=%d\n", size, filecount); *returned_size = size; +diff -r 52fd74447005 src/transports/tf_maildir.h +--- a/src/transports/tf_maildir.h Thu Feb 24 17:19:04 2011 +0100 ++++ b/src/transports/tf_maildir.h Thu Feb 24 17:20:54 2011 +0100 +@@ -16,7 +16,7 @@ + uschar *); + extern int maildir_ensure_sizefile(uschar *, + appendfile_transport_options_block *, const pcre *, +- const pcre *, off_t *, int *); ++ const pcre *, off_t *, int *, uschar **); + extern void maildir_record_length(int, int); + + /* End of tf_maildir.h */