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
tidying
[exim.git]
/
src
/
src
/
moan.c
diff --git
a/src/src/moan.c
b/src/src/moan.c
index 51f5da58a28ee723f1c141815251c9e6a4469705..ebfd440f6c6595b33587afdbee9383ca38dabd7a 100644
(file)
--- a/
src/src/moan.c
+++ b/
src/src/moan.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Functions for sending messages to sender or to mailmaster. */
/* Functions for sending messages to sender or to mailmaster. */
@@
-63,7
+65,7
@@
if (!message_id)
if (h->type == htype_id)
{
message_id = Ustrchr(h->text, ':') + 1;
if (h->type == htype_id)
{
message_id = Ustrchr(h->text, ':') + 1;
-
while (isspace(*message_id)) message_id++
;
+
Uskip_whitespace(&message_id)
;
}
for (h = header_list; h; h = h->next)
}
for (h = header_list; h; h = h->next)
@@
-85,7
+87,8
@@
if (h || message_id)
fprintf(fp, "References:");
if (h)
{
fprintf(fp, "References:");
if (h)
{
- uschar * s, * id, * error;
+ const uschar * s;
+ uschar * id, * error;
uschar * referenced_ids[12];
int reference_count = 0;
uschar * referenced_ids[12];
int reference_count = 0;
@@
-384,7
+387,7
@@
if (bounce_return_message)
if (bounce_return_body && message_file)
{
BOOL enddot = f.dot_ends && message_file == stdin;
if (bounce_return_body && message_file)
{
BOOL enddot = f.dot_ends && message_file == stdin;
- uschar * buf = store_get(bounce_return_linesize_limit+2,
TRUE
);
+ uschar * buf = store_get(bounce_return_linesize_limit+2,
GET_TAINTED
);
if (firstline) fprintf(fp, "%s", CS firstline);
if (firstline) fprintf(fp, "%s", CS firstline);
@@
-692,7
+695,7
@@
fprintf(stderr, "%d previous message%s successfully processed.\n",
fprintf(stderr, "The rest of the batch was abandoned.\n");
fprintf(stderr, "The rest of the batch was abandoned.\n");
-exim_exit(yield
, US"batch"
);
+exim_exit(yield);
}
}
@@
-717,7
+720,6
@@
moan_check_errorcopy(uschar *recipient)
uschar *item, *localpart, *domain;
const uschar *listptr = errors_copy;
uschar *yield = NULL;
uschar *item, *localpart, *domain;
const uschar *listptr = errors_copy;
uschar *yield = NULL;
-uschar buffer[256];
int sep = 0;
int llen;
int sep = 0;
int llen;
@@
-733,7
+735,7
@@
llen = domain++ - recipient;
/* Scan through the configured items */
/* Scan through the configured items */
-while ((item = string_nextinlist(&listptr, &sep,
buffer, sizeof(buffer)
)))
+while ((item = string_nextinlist(&listptr, &sep,
NULL, 0
)))
{
const uschar *newaddress = item;
const uschar *pattern = string_dequote(&newaddress);
{
const uschar *newaddress = item;
const uschar *pattern = string_dequote(&newaddress);