X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9f6b3bf5187562bac4c96e3ed6a17740d01489fa..46a36afae41f63de654269c8a0b7cf5852a85a14:/src/exim_monitor/em_queue.c diff --git a/src/exim_monitor/em_queue.c b/src/exim_monitor/em_queue.c index 9badd2451..accc93652 100644 --- a/src/exim_monitor/em_queue.c +++ b/src/exim_monitor/em_queue.c @@ -5,6 +5,7 @@ /* Copyright (c) University of Cambridge 1995 - 2018 */ /* Copyright (c) The Exim Maintainers 2020 - 2022 */ /* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include "em_hdr.h" @@ -153,7 +154,7 @@ return node; *************************************************/ static queue_item * -set_up(uschar *name, int dir_char) +set_up(uschar * name, int dir_char) { int i, rc, save_errno; struct stat statdata; @@ -270,15 +271,15 @@ sender_address = NULL; snprintf(CS buffer, sizeof(buffer), "%s/input/%s/%s/%s-D", spool_directory, queue_name, message_subdir, name); if (Ustat(buffer, &statdata) == 0) - q->size = message_size + statdata.st_size - SPOOL_DATA_START_OFFSET + 1; + q->size = message_size + statdata.st_size - spool_data_start_offset(name) + 1; /* Scan and process the recipients list, skipping any that have already been delivered, and removing visible names. */ -if (recipients_list != NULL) +if (recipients_list) for (i = 0; i < recipients_count; i++) { - uschar *r = recipients_list[i].address; + uschar * r = recipients_list[i].address; if (tree_search(tree_nonrecipients, r) == NULL) { if ((p = strstric(r+1, qualify_domain, FALSE)) != NULL &&