Clear previous message results before continued-delivery

[exim.git] / src / OS / os.c-FreeBSD

diff --git a/src/OS/os.c-FreeBSD b/src/OS/os.c-FreeBSD
index c0fd48df8432f3530878514efabe38f7a5b0602d..d65a789c05f1f445e4203f5db842cf0648693dc5 100644 (file)
--- a/src/OS/os.c-FreeBSD
+++ b/src/OS/os.c-FreeBSD
@@ -2,7 +2,9 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) Jeremy Harris 1995 - 2019 */
+/* Copyright (c) Jeremy Harris 1995 - 2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* FreeBSD-specific code. This is concatenated onto the generic
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* FreeBSD-specific code. This is concatenated onto the generic


@@ -16,10 +18,11 @@ Sendfile shim
 ssize_t
 os_sendfile(int out, int in, off_t * offp, size_t cnt)
 {
 ssize_t
 os_sendfile(int out, int in, off_t * offp, size_t cnt)
 {

-off_t loff = *offp, written;
+off_t loff = offp ? *offp : 0;
+off_t written;

 
 if (sendfile(in, out, loff, cnt, NULL, &written, 0) < 0) return (ssize_t)-1;
 
 if (sendfile(in, out, loff, cnt, NULL, &written, 0) < 0) return (ssize_t)-1;

-*offp = loff + written;
+if (offp) *offp = loff + written;

 return (ssize_t)written;
 }
 
 return (ssize_t)written;
 }