1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent d54ee7005f7f7b5970ce45caf7487a9fd929e55f |
2 # Parent d54ee7005f7f7b5970ce45caf7487a9fd929e55f |
3 |
3 |
4 diff -r d54ee7005f7f Local/Makefile |
4 diff -r d54ee7005f7f Local/Makefile |
5 --- a/Local/Makefile Mon Feb 21 22:52:42 2011 +0100 |
5 --- a/Local/Makefile Mon Feb 21 22:52:42 2011 +0100 |
6 +++ b/Local/Makefile Wed Feb 23 00:53:29 2011 +0100 |
6 +++ b/Local/Makefile Wed Feb 23 00:53:43 2011 +0100 |
7 @@ -1,4 +1,5 @@ |
7 @@ -1,4 +1,5 @@ |
8 # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ |
8 # $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ |
9 +EXTRALIBS_EXIM=-lrt |
9 +EXTRALIBS_EXIM=-lrt |
10 |
10 |
11 ################################################## |
11 ################################################## |
12 # The Exim mail transport agent # |
12 # The Exim mail transport agent # |
13 diff -r d54ee7005f7f src/transports/appendfile.c |
13 diff -r d54ee7005f7f src/transports/appendfile.c |
14 --- a/src/transports/appendfile.c Mon Feb 21 22:52:42 2011 +0100 |
14 --- a/src/transports/appendfile.c Mon Feb 21 22:52:42 2011 +0100 |
15 +++ b/src/transports/appendfile.c Wed Feb 23 00:53:29 2011 +0100 |
15 +++ b/src/transports/appendfile.c Wed Feb 23 00:53:43 2011 +0100 |
16 @@ -13,6 +13,7 @@ |
16 @@ -13,6 +13,7 @@ |
17 |
17 |
18 #ifdef SUPPORT_MAILDIR |
18 #ifdef SUPPORT_MAILDIR |
19 #include "tf_maildir.h" |
19 #include "tf_maildir.h" |
20 +extern int lockfd; /* from tf_maildir */ // hs12 |
20 +extern int lockfd; /* from tf_maildir */ // hs12 |
132 |
132 |
133 #ifdef SUPPORT_MBX |
133 #ifdef SUPPORT_MBX |
134 if (mbx_lockfd >= 0) |
134 if (mbx_lockfd >= 0) |
135 diff -r d54ee7005f7f src/transports/appendfile.h |
135 diff -r d54ee7005f7f src/transports/appendfile.h |
136 --- a/src/transports/appendfile.h Mon Feb 21 22:52:42 2011 +0100 |
136 --- a/src/transports/appendfile.h Mon Feb 21 22:52:42 2011 +0100 |
137 +++ b/src/transports/appendfile.h Wed Feb 23 00:53:29 2011 +0100 |
137 +++ b/src/transports/appendfile.h Wed Feb 23 00:53:43 2011 +0100 |
138 @@ -95,5 +95,8 @@ |
138 @@ -95,5 +95,8 @@ |
139 /* Function that is shared with tf_maildir.c */ |
139 /* Function that is shared with tf_maildir.c */ |
140 |
140 |
141 extern off_t check_dir_size(uschar *, int *, const pcre *); |
141 extern off_t check_dir_size(uschar *, int *, const pcre *); |
142 +extern int apply_lock(int fd, int fcntltype, BOOL dofcntl, int fcntltime, BOOL doflock, |
142 +extern int apply_lock(int fd, int fcntltype, BOOL dofcntl, int fcntltime, BOOL doflock, |
144 + |
144 + |
145 |
145 |
146 /* End of transports/appendfile.h */ |
146 /* End of transports/appendfile.h */ |
147 diff -r d54ee7005f7f src/transports/tf_maildir.c |
147 diff -r d54ee7005f7f src/transports/tf_maildir.c |
148 --- a/src/transports/tf_maildir.c Mon Feb 21 22:52:42 2011 +0100 |
148 --- a/src/transports/tf_maildir.c Mon Feb 21 22:52:42 2011 +0100 |
149 +++ b/src/transports/tf_maildir.c Wed Feb 23 00:53:29 2011 +0100 |
149 +++ b/src/transports/tf_maildir.c Wed Feb 23 00:53:43 2011 +0100 |
150 @@ -367,13 +367,16 @@ |
150 @@ -367,13 +367,16 @@ |
151 |
151 |
152 Returns: >=0 a file descriptor for an open maildirsize file |
152 Returns: >=0 a file descriptor for an open maildirsize file |
153 -1 there was an error opening or accessing the file |
153 -1 there was an error opening or accessing the file |
154 + or locking |
154 + or locking |
271 DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT |
271 DEBUG(D_transport) debug_printf("returning maildir size=" OFF_T_FMT |
272 " filecount=%d\n", size, filecount); |
272 " filecount=%d\n", size, filecount); |
273 *returned_size = size; |
273 *returned_size = size; |
274 diff -r d54ee7005f7f src/transports/tf_maildir.h |
274 diff -r d54ee7005f7f src/transports/tf_maildir.h |
275 --- a/src/transports/tf_maildir.h Mon Feb 21 22:52:42 2011 +0100 |
275 --- a/src/transports/tf_maildir.h Mon Feb 21 22:52:42 2011 +0100 |
276 +++ b/src/transports/tf_maildir.h Wed Feb 23 00:53:29 2011 +0100 |
276 +++ b/src/transports/tf_maildir.h Wed Feb 23 00:53:43 2011 +0100 |
277 @@ -16,7 +16,7 @@ |
277 @@ -16,7 +16,7 @@ |
278 uschar *); |
278 uschar *); |
279 extern int maildir_ensure_sizefile(uschar *, |
279 extern int maildir_ensure_sizefile(uschar *, |
280 appendfile_transport_options_block *, const pcre *, |
280 appendfile_transport_options_block *, const pcre *, |
281 - const pcre *, off_t *, int *); |
281 - const pcre *, off_t *, int *); |