git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix debug_print_socket()
[exim.git]
/
src
/
src
/
filter.c
diff --git
a/src/src/filter.c
b/src/src/filter.c
index 90e83e6b0608ee8cba8c640226b7bbb8f69b6adb..59c08f882ea224bb8d125fc30bbfc7860c3c254b 100644
(file)
--- a/
src/src/filter.c
+++ b/
src/src/filter.c
@@
-3,6
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-1951,7
+1952,7
@@
while (commands)
(long int)geteuid());
if (log_fd < 0)
{
(long int)geteuid());
if (log_fd < 0)
{
- if (
log_filename == NULL
)
+ if (
!log_filename
)
{
*error_pointer = US"attempt to obey \"logwrite\" command "
"without a previous \"logfile\"";
{
*error_pointer = US"attempt to obey \"logwrite\" command "
"without a previous \"logfile\"";
@@
-1960,7
+1961,7
@@
while (commands)
log_fd = Uopen(log_filename, O_CREAT|O_APPEND|O_WRONLY, log_mode);
if (log_fd < 0)
{
log_fd = Uopen(log_filename, O_CREAT|O_APPEND|O_WRONLY, log_mode);
if (log_fd < 0)
{
- *error_pointer = string_open_failed(
errno,
"filter log file \"%s\"",
+ *error_pointer = string_open_failed("filter log file \"%s\"",
log_filename);
return FF_ERROR;
}
log_filename);
return FF_ERROR;
}
@@
-1974,9
+1975,8
@@
while (commands)
}
}
else
}
}
else
- {
- DEBUG(D_filter) debug_printf_indent("skipping logwrite (verifying or testing)\n");
- }
+ DEBUG(D_filter)
+ debug_printf_indent("skipping logwrite (verifying or testing)\n");
break;
/* Header addition and removal is available only in the system filter. The
break;
/* Header addition and removal is available only in the system filter. The
@@
-2386,12
+2386,11
@@
Previously the test was for "auto-". */
for (h = header_list; h; h = h->next)
{
for (h = header_list; h; h = h->next)
{
- uschar *s;
if (h->type == htype_old) continue;
if (strncmpic(h->text, US"List-", 5) == 0)
{
if (h->type == htype_old) continue;
if (strncmpic(h->text, US"List-", 5) == 0)
{
- s = h->text + 5;
+
uschar *
s = h->text + 5;
if (strncmpic(s, US"Id:", 3) == 0 ||
strncmpic(s, US"Help:", 5) == 0 ||
strncmpic(s, US"Subscribe:", 10) == 0 ||
if (strncmpic(s, US"Id:", 3) == 0 ||
strncmpic(s, US"Help:", 5) == 0 ||
strncmpic(s, US"Subscribe:", 10) == 0 ||
@@
-2404,12
+2403,12
@@
for (h = header_list; h; h = h->next)
else if (strncmpic(h->text, US"Auto-submitted:", 15) == 0)
{
else if (strncmpic(h->text, US"Auto-submitted:", 15) == 0)
{
- s = h->text + 15;
-
while (isspace(*s)) s++
;
+
uschar *
s = h->text + 15;
+
Uskip_whitespace(&s)
;
if (strncmpic(s, US"no", 2) != 0) return FALSE;
s += 2;
if (strncmpic(s, US"no", 2) != 0) return FALSE;
s += 2;
-
while (isspace(*s)) s++
;
- if (*s
!= 0
) return FALSE;
+
Uskip_whitespace(&s)
;
+ if (*s) return FALSE;
}
}
}
}
@@
-2422,18
+2421,18
@@
self_to = rewrite_one(self, rewrite_to, NULL, FALSE, US"",
global_rewrite_rules);
global_rewrite_rules);
-if (
self_from == NULL
) self_from = self;
-if (self_to
== NULL
) self_to = self;
+if (
!self_from
) self_from = self;
+if (self_to) self_to = self;
/* If there's a prefix or suffix set, we must include the prefixed/
suffixed version of the local part in the tests. */
/* If there's a prefix or suffix set, we must include the prefixed/
suffixed version of the local part in the tests. */
-if (deliver_localpart_prefix
!= NULL || deliver_localpart_suffix != NULL
)
+if (deliver_localpart_prefix
|| deliver_localpart_suffix
)
{
psself = string_sprintf("%s%s%s@%s",
{
psself = string_sprintf("%s%s%s@%s",
-
(deliver_localpart_prefix == NULL)? US"" : deliver_localpart_prefix
,
+
deliver_localpart_prefix ? deliver_localpart_prefix : US""
,
deliver_localpart,
deliver_localpart,
-
(deliver_localpart_suffix == NULL)? US"" : deliver_localpart_suffix
,
+
deliver_localpart_suffix ? deliver_localpart_suffix : US""
,
deliver_domain);
psself_from = rewrite_one(psself, rewrite_from, NULL, FALSE, US"",
global_rewrite_rules);
deliver_domain);
psself_from = rewrite_one(psself, rewrite_from, NULL, FALSE, US"",
global_rewrite_rules);