projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change misleading debugging wording "lookup deferred" -> "list match
[exim.git]
/
src
/
src
/
filtertest.c
diff --git
a/src/src/filtertest.c
b/src/src/filtertest.c
index 4c80b6f77b2fcc33ec73c2bd53c6cd7eb967c351..3275cd0d49be629d1ce4b8d4963fccc4b28e5274 100644
(file)
--- a/
src/src/filtertest.c
+++ b/
src/src/filtertest.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/filtertest.c,v 1.
3 2005/01/04 10:00:42
ph10 Exp $ */
+/* $Cambridge: exim/src/src/filtertest.c,v 1.
8 2006/02/07 11:19:00
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
6
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-26,15
+26,15
@@
keep that function as efficient as possible. Handling message_body_end is
somewhat more tedious. Pile it all into a circular buffer and sort out at the
end.
somewhat more tedious. Pile it all into a circular buffer and sort out at the
end.
-Arguments:
+Arguments:
dot_ended TRUE if message already terminated by '.'
Returns: nothing
*/
dot_ended TRUE if message already terminated by '.'
Returns: nothing
*/
-
+
static void
static void
-read_message_body(dot_ended)
-{
+read_message_body(
BOOL
dot_ended)
+{
register int ch;
int body_len, body_end_len, header_size;
uschar *s;
register int ch;
int body_len, body_end_len, header_size;
uschar *s;
@@
-154,7
+154,7
@@
twice if both system and user filters are being tested.
Argument:
fd an fd containing the filter file
Argument:
fd an fd containing the filter file
- filename the name of the filter file
+ filename the name of the filter file
is_system TRUE if testing is to be as a system filter
dot_ended TRUE if message already terminated by '.'
is_system TRUE if testing is to be as a system filter
dot_ended TRUE if message already terminated by '.'
@@
-181,7
+181,7
@@
if (fstat(fd, &statbuf) != 0)
filebuf = store_get(statbuf.st_size + 1);
rc = read(fd, filebuf, statbuf.st_size);
filebuf = store_get(statbuf.st_size + 1);
rc = read(fd, filebuf, statbuf.st_size);
-close(fd);
+
(void)
close(fd);
if (rc != statbuf.st_size)
{
if (rc != statbuf.st_size)
{
@@
-248,7
+248,7
@@
if (filter_type == FILTER_FORWARD)
return TRUE;
}
return TRUE;
}
-/* For a filter, set up the message_body variables and the message size if this
+/* For a filter, set up the message_body variables and the message size if this
is the first time this function has been called. */
if (message_body == NULL) read_message_body(dot_ended);
is the first time this function has been called. */
if (message_body == NULL) read_message_body(dot_ended);
@@
-271,7
+271,7
@@
if (is_system)
else
{
yield = (filter_type == FILTER_SIEVE)?
else
{
yield = (filter_type == FILTER_SIEVE)?
- sieve_interpret(filebuf, RDO_REWRITE, NULL, &generated, &error)
+ sieve_interpret(filebuf, RDO_REWRITE, NULL,
NULL, NULL,
&generated, &error)
:
filter_interpret(filebuf, RDO_REWRITE, &generated, &error);
}
:
filter_interpret(filebuf, RDO_REWRITE, &generated, &error);
}