Docs: Remove GNUmake idioms from Makefile, give power to "mv"

[exim.git] / src / src / transport.c

diff --git a/src/src/transport.c b/src/src/transport.c
index 47da45fdfedd4d379df115b18d935b74c09a23d9..a069b883364bc44522e6bd4f51ab5579982dcb13 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2017 */
+/* 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
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* General functions concerned with transportation, and generic options for all


@@ -242,10 +242,11 @@ for (i = 0; i < 100; i++)
     {
     rc =
 #ifdef SUPPORT_TLS
     {
     rc =
 #ifdef SUPPORT_TLS

-       tls_out.active == fd ? tls_write(FALSE, block, len, more) :
+       tls_out.active.sock == fd ? tls_write(tls_out.active.tls_ctx, block, len, more) :

 #endif
 #ifdef MSG_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;
 #endif
        write(fd, block, len);
     save_errno = errno;


@@ -255,19 +256,20 @@ for (i = 0; i < 100; i++)
 
   else
     {
 
   else
     {

-    alarm(local_timeout);
+    ALARM(local_timeout);

 
     rc =
 #ifdef SUPPORT_TLS
 
     rc =
 #ifdef SUPPORT_TLS

-       tls_out.active == fd ? tls_write(FALSE, block, len, more) :
+       tls_out.active.sock == fd ? tls_write(tls_out.active.tls_ctx, block, len, more) :

 #endif
 #ifdef MSG_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;
 #endif
        write(fd, block, len);
 
     save_errno = errno;

-    local_timeout = alarm(0);
+    local_timeout = ALARM_CLR(0);

     if (sigalrm_seen)
       {
       errno = ETIMEDOUT;
     if (sigalrm_seen)
       {
       errno = ETIMEDOUT;


@@ -373,13 +375,15 @@ BOOL
 transport_write_string(int fd, const char *format, ...)
 {
 transport_ctx tctx = {{0}};
 transport_write_string(int fd, const char *format, ...)
 {
 transport_ctx tctx = {{0}};

+gstring gs = { .size = big_buffer_size, .ptr = 0, .s = big_buffer };

 va_list ap;
 va_list ap;

+

 va_start(ap, format);
 va_start(ap, format);

-if (!string_vformat(big_buffer, big_buffer_size, format, ap))
+if (!string_vformat(&gs, FALSE, format, ap))

   log_write(0, LOG_MAIN|LOG_PANIC_DIE, "overlong formatted string in transport");
 va_end(ap);
 tctx.u.fd = fd;
   log_write(0, LOG_MAIN|LOG_PANIC_DIE, "overlong formatted string in transport");
 va_end(ap);
 tctx.u.fd = fd;

-return transport_write_block(&tctx, big_buffer, Ustrlen(big_buffer), FALSE);
+return transport_write_block(&tctx, gs.s, gs.ptr, FALSE);

 }
 
 
 }
 
 


@@ -493,7 +497,7 @@ for (ptr = start; ptr < end; ptr++)
 
   if (  *ptr == '\r' && ptr[1] == '\n'
      && !(tctx->options & topt_use_crlf)
 
   if (  *ptr == '\r' && ptr[1] == '\n'
      && !(tctx->options & topt_use_crlf)

-     && spool_file_wireformat
+     && f.spool_file_wireformat

      )
     ptr++;
 
      )
     ptr++;
 


@@ -503,7 +507,7 @@ for (ptr = start; ptr < end; ptr++)
 
     /* Insert CR before NL if required */
 
 
     /* Insert CR before NL if required */
 

-    if (tctx->options & topt_use_crlf && !spool_file_wireformat)
+    if (tctx->options & topt_use_crlf && !f.spool_file_wireformat)

       *chunk_ptr++ = '\r';
     *chunk_ptr++ = '\n';
     transport_newlines++;
       *chunk_ptr++ = '\r';
     *chunk_ptr++ = '\n';
     transport_newlines++;


@@ -721,7 +725,7 @@ for (h = header_list; h; h = h->next) if (h->type != htype_old)
        int len;
 
        if (i == 0)
        int len;
 
        if (i == 0)

-         if (!(s = expand_string(s)) && !expand_string_forcedfail)
+         if (!(s = expand_string(s)) && !f.expand_string_forcedfail)

            {
            errno = ERRNO_CHHEADER_FAIL;
            return FALSE;
            {
            errno = ERRNO_CHHEADER_FAIL;
            return FALSE;


@@ -827,7 +831,7 @@ if (tblock && (list = CUS tblock->add_headers))
          }
        }
       }
          }
        }
       }

-    else if (!expand_string_forcedfail)
+    else if (!f.expand_string_forcedfail)

       { errno = ERRNO_CHHEADER_FAIL; return FALSE; }
   }
 
       { errno = ERRNO_CHHEADER_FAIL; return FALSE; }
   }
 


@@ -932,8 +936,8 @@ so temporarily hide the global that adjusts for its format. */
 
 if (!(tctx->options & topt_no_headers))
   {
 
 if (!(tctx->options & topt_no_headers))
   {

-  BOOL save_wireformat = spool_file_wireformat;
-  spool_file_wireformat = FALSE;
+  BOOL save_wireformat = f.spool_file_wireformat;
+  f.spool_file_wireformat = FALSE;

 
   /* Add return-path: if requested. */
 
 
   /* Add return-path: if requested. */
 


@@ -990,11 +994,11 @@ if (!(tctx->options & topt_no_headers))
   if (!transport_headers_send(tctx, &write_chunk))
     {
 bad:
   if (!transport_headers_send(tctx, &write_chunk))
     {
 bad:

-    spool_file_wireformat = save_wireformat;
+    f.spool_file_wireformat = save_wireformat;

     return FALSE;
     }
 
     return FALSE;
     }
 

-  spool_file_wireformat = save_wireformat;
+  f.spool_file_wireformat = save_wireformat;

   }
 
 /* When doing RFC3030 CHUNKING output, work out how much data would be in a
   }
 
 /* When doing RFC3030 CHUNKING output, work out how much data would be in a


@@ -1023,7 +1027,7 @@ if (tctx->options & topt_use_bdat)
     if (size_limit > 0  &&  fsize > size_limit)
       fsize = size_limit;
     size = hsize + fsize;
     if (size_limit > 0  &&  fsize > size_limit)
       fsize = size_limit;
     size = hsize + fsize;

-    if (tctx->options & topt_use_crlf  &&  !spool_file_wireformat)
+    if (tctx->options & topt_use_crlf  &&  !f.spool_file_wireformat)

       size += body_linecount;  /* account for CRLF-expansion */
 
     /* With topt_use_bdat we never do dot-stuffing; no need to
       size += body_linecount;  /* account for CRLF-expansion */
 
     /* With topt_use_bdat we never do dot-stuffing; no need to


@@ -1070,10 +1074,10 @@ This should get used for CHUNKING output and also for writing the -K file for
 dkim signing,  when we had CHUNKING input.  */
 
 #ifdef OS_SENDFILE
 dkim signing,  when we had CHUNKING input.  */
 
 #ifdef OS_SENDFILE

-if (  spool_file_wireformat
+if (  f.spool_file_wireformat

    && !(tctx->options & (topt_no_body | topt_end_dot))
    && !nl_check_length
    && !(tctx->options & (topt_no_body | topt_end_dot))
    && !nl_check_length

-   && tls_out.active != tctx->u.fd
+   && tls_out.active.sock != tctx->u.fd

    )
   {
   ssize_t copied = 0;
    )
   {
   ssize_t copied = 0;


@@ -1104,20 +1108,20 @@ DEBUG(D_transport) debug_printf("cannot use sendfile for body: no support\n");
 DEBUG(D_transport)
   if (!(tctx->options & topt_no_body))
     debug_printf("cannot use sendfile for body: %s\n",
 DEBUG(D_transport)
   if (!(tctx->options & topt_no_body))
     debug_printf("cannot use sendfile for body: %s\n",

-      !spool_file_wireformat ? "spoolfile not wireformat"
+      !f.spool_file_wireformat ? "spoolfile not wireformat"

       : tctx->options & topt_end_dot ? "terminating dot wanted"
       : nl_check_length ? "dot- or From-stuffing wanted"
       : "TLS output wanted");
 
 if (!(tctx->options & topt_no_body))
   {
       : tctx->options & topt_end_dot ? "terminating dot wanted"
       : nl_check_length ? "dot- or From-stuffing wanted"
       : "TLS output wanted");
 
 if (!(tctx->options & topt_no_body))
   {

-  int size = size_limit;
+  unsigned long size = size_limit > 0 ? size_limit : ULONG_MAX;

 
   nl_check_length = abs(nl_check_length);
   nl_partial_match = 0;
   if (lseek(deliver_datafile, SPOOL_DATA_START_OFFSET, SEEK_SET) < 0)
     return FALSE;
 
   nl_check_length = abs(nl_check_length);
   nl_partial_match = 0;
   if (lseek(deliver_datafile, SPOOL_DATA_START_OFFSET, SEEK_SET) < 0)
     return FALSE;

-  while (  (len = MAX(DELIVER_IN_BUFFER_SIZE, size)) > 0
+  while (  (len = MIN(DELIVER_IN_BUFFER_SIZE, size)) > 0

        && (len = read(deliver_datafile, deliver_in_buffer, len)) > 0)
     {
     if (!write_chunk(tctx, deliver_in_buffer, len))
        && (len = read(deliver_datafile, deliver_in_buffer, len)) > 0)
     {
     if (!write_chunk(tctx, deliver_in_buffer, len))


@@ -1130,9 +1134,10 @@ if (!(tctx->options & topt_no_body))
   if (len != 0) return FALSE;
   }
 
   if (len != 0) return FALSE;
   }
 

-/* Finished with the check string */
+/* Finished with the check string, and spool-format consideration */

 
 nl_check_length = nl_escape_length = 0;
 
 nl_check_length = nl_escape_length = 0;

+f.spool_file_wireformat = FALSE;

 
 /* If requested, add a terminating "." line (SMTP output). */
 
 
 /* If requested, add a terminating "." line (SMTP output). */
 


@@ -1169,12 +1174,12 @@ BOOL
 transport_write_message(transport_ctx * tctx, int size_limit)
 {
 BOOL last_filter_was_NL = TRUE;
 transport_write_message(transport_ctx * tctx, int size_limit)
 {
 BOOL last_filter_was_NL = TRUE;

-BOOL save_spool_file_wireformat = spool_file_wireformat;
+BOOL save_spool_file_wireformat = f.spool_file_wireformat;

 int rc, len, yield, fd_read, fd_write, save_errno;
 int pfd[2] = {-1, -1};
 pid_t filter_pid, write_pid;
 
 int rc, len, yield, fd_read, fd_write, save_errno;
 int pfd[2] = {-1, -1};
 pid_t filter_pid, write_pid;
 

-transport_filter_timed_out = FALSE;
+f.transport_filter_timed_out = FALSE;

 
 /* If there is no filter command set up, call the internal function that does
 the actual work, passing it the incoming fd, and return its result. */
 
 /* If there is no filter command set up, call the internal function that does
 the actual work, passing it the incoming fd, and return its result. */


@@ -1274,7 +1279,7 @@ if (write_pid < 0)
 
 /* When testing, let the subprocess get going */
 
 
 /* When testing, let the subprocess get going */
 

-if (running_in_test_harness) millisleep(250);
+if (f.running_in_test_harness) millisleep(250);

 
 DEBUG(D_transport)
   debug_printf("process %d writing to transport filter\n", (int)write_pid);
 
 DEBUG(D_transport)
   debug_printf("process %d writing to transport filter\n", (int)write_pid);


@@ -1291,19 +1296,19 @@ no data is returned, that counts as "ended with NL" (default setting of the
 variable is TRUE).  The output should always be unix-format as we converted
 any wireformat source on writing input to the filter. */
 
 variable is TRUE).  The output should always be unix-format as we converted
 any wireformat source on writing input to the filter. */
 

-spool_file_wireformat = FALSE;
+f.spool_file_wireformat = FALSE;

 chunk_ptr = deliver_out_buffer;
 
 for (;;)
   {
   sigalrm_seen = FALSE;
 chunk_ptr = deliver_out_buffer;
 
 for (;;)
   {
   sigalrm_seen = FALSE;

-  alarm(transport_filter_timeout);
+  ALARM(transport_filter_timeout);

   len = read(fd_read, deliver_in_buffer, DELIVER_IN_BUFFER_SIZE);
   len = read(fd_read, deliver_in_buffer, DELIVER_IN_BUFFER_SIZE);

-  alarm(0);
+  ALARM_CLR(0);

   if (sigalrm_seen)
     {
     errno = ETIMEDOUT;
   if (sigalrm_seen)
     {
     errno = ETIMEDOUT;

-    transport_filter_timed_out = TRUE;
+    f.transport_filter_timed_out = TRUE;

     goto TIDY_UP;
     }
 
     goto TIDY_UP;
     }
 


@@ -1331,7 +1336,7 @@ there has been an error, kill the processes before waiting for them, just to be
 sure. Also apply a paranoia timeout. */
 
 TIDY_UP:
 sure. Also apply a paranoia timeout. */
 
 TIDY_UP:

-spool_file_wireformat = save_spool_file_wireformat;
+f.spool_file_wireformat = save_spool_file_wireformat;

 save_errno = errno;
 
 (void)close(fd_read);
 save_errno = errno;
 
 (void)close(fd_read);


@@ -1399,6 +1404,7 @@ filter was not NL, insert a NL to make the SMTP protocol work. */
 if (yield)
   {
   nl_check_length = nl_escape_length = 0;
 if (yield)
   {
   nl_check_length = nl_escape_length = 0;

+  f.spool_file_wireformat = FALSE;

   if (  tctx->options & topt_end_dot
      && ( last_filter_was_NL
         ? !write_chunk(tctx, US".\n", 2)
   if (  tctx->options & topt_end_dot
      && ( last_filter_was_NL
         ? !write_chunk(tctx, US".\n", 2)


@@ -1866,19 +1872,19 @@ but we have a number of extras that may be added. */
 
 argv = CUSS child_exec_exim(CEE_RETURN_ARGV, TRUE, &i, FALSE, 0);
 
 
 argv = CUSS child_exec_exim(CEE_RETURN_ARGV, TRUE, &i, FALSE, 0);
 

-if (smtp_authenticated)                                argv[i++] = US"-MCA";
+if (f.smtp_authenticated)                      argv[i++] = US"-MCA";

 if (smtp_peer_options & OPTION_CHUNKING)       argv[i++] = US"-MCK";
 if (smtp_peer_options & OPTION_DSN)            argv[i++] = US"-MCD";
 if (smtp_peer_options & OPTION_PIPE)           argv[i++] = US"-MCP";
 if (smtp_peer_options & OPTION_SIZE)           argv[i++] = US"-MCS";
 #ifdef SUPPORT_TLS
 if (smtp_peer_options & OPTION_TLS)
 if (smtp_peer_options & OPTION_CHUNKING)       argv[i++] = US"-MCK";
 if (smtp_peer_options & OPTION_DSN)            argv[i++] = US"-MCD";
 if (smtp_peer_options & OPTION_PIPE)           argv[i++] = US"-MCP";
 if (smtp_peer_options & OPTION_SIZE)           argv[i++] = US"-MCS";
 #ifdef SUPPORT_TLS
 if (smtp_peer_options & OPTION_TLS)

-  if (tls_out.active >= 0 || continue_proxy_cipher)
+  if (tls_out.active.sock >= 0 || continue_proxy_cipher)

     {
     argv[i++] = US"-MCt";
     argv[i++] = sending_ip_address;
     argv[i++] = string_sprintf("%d", sending_port);
     {
     argv[i++] = US"-MCt";
     argv[i++] = sending_ip_address;
     argv[i++] = string_sprintf("%d", sending_port);

-    argv[i++] = tls_out.active >= 0 ? tls_out.cipher : continue_proxy_cipher;
+    argv[i++] = tls_out.active.sock >= 0 ? tls_out.cipher : continue_proxy_cipher;

     }
   else
     argv[i++] = US"-MCT";
     }
   else
     argv[i++] = US"-MCT";


@@ -1952,7 +1958,7 @@ if ((pid = fork()) == 0)
     DEBUG(D_transport) debug_printf("transport_pass_socket succeeded (final-pid %d)\n", pid);
     _exit(EXIT_SUCCESS);
     }
     DEBUG(D_transport) debug_printf("transport_pass_socket succeeded (final-pid %d)\n", pid);
     _exit(EXIT_SUCCESS);
     }

-  if (running_in_test_harness) sleep(1);
+  if (f.running_in_test_harness) sleep(1);

 
   transport_do_pass_socket(transport_name, hostname, hostaddress,
     id, socket_fd);
 
   transport_do_pass_socket(transport_name, hostname, hostaddress,
     id, socket_fd);


@@ -2243,9 +2249,9 @@ if (expand_arguments)
     else
       {
       const uschar *expanded_arg;
     else
       {
       const uschar *expanded_arg;

-      enable_dollar_recipients = allow_dollar_recipients;
+      f.enable_dollar_recipients = allow_dollar_recipients;

       expanded_arg = expand_cstring(argv[i]);
       expanded_arg = expand_cstring(argv[i]);

-      enable_dollar_recipients = FALSE;
+      f.enable_dollar_recipients = FALSE;

 
       if (expanded_arg == NULL)
         {
 
       if (expanded_arg == NULL)
         {