ARC: add independent-source testcase. Fix signatures by not line-terminating

[user/henk/code/exim.git] / src / src / transport.c

diff --git a/src/src/transport.c b/src/src/transport.c
index 6caeeecc9775b383d265a0d11751537d58c3d074..f24b7794b9f1e20ff8fabcb461d5da9ebce47b16 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2016 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* General functions concerned with transportation, and generic options for all
@@ -90,7 +90,7 @@ int optionlist_transports_size = nelem(optionlist_transports);
 
 #ifdef MACRO_PREDEF
 
-# include "predef.h"
+# include "macro_predef.h"
 
 void
 options_transports(void)
@@ -245,7 +245,8 @@ for (i = 0; i < 100; i++)
        tls_out.active == fd ? tls_write(FALSE, block, len, more) :
 #endif
 #ifdef MSG_MORE
-       more ? send(fd, block, len, MSG_MORE) :
+       more && !(tctx->options & topt_not_socket)
+         ? send(fd, block, len, MSG_MORE) :
 #endif
        write(fd, block, len);
     save_errno = errno;
@@ -262,7 +263,8 @@ for (i = 0; i < 100; i++)
        tls_out.active == fd ? tls_write(FALSE, block, len, more) :
 #endif
 #ifdef MSG_MORE
-       more ? send(fd, block, len, MSG_MORE) :
+       more && !(tctx->options & topt_not_socket)
+         ? send(fd, block, len, MSG_MORE) :
 #endif
        write(fd, block, len);