X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8de9db65575ccd8013753bb3d23426f0da2a669a..4226691b79845d9b41041e2f64a3a241dcb99f4d:/src/src/expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index 1da858997..a064e34e4 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1554,11 +1554,9 @@ for (i = 0; i < 2; i++)
   int size = 0;
   header_line *h;
 
-  for (h = header_list; size < header_insert_maxlen && h != NULL; h = h->next)
-    {
-    if (h->type != htype_old && h->text != NULL)  /* NULL => Received: placeholder */
-      {
-      if (name == NULL || (len <= h->slen && strncmpic(name, h->text, len) == 0))
+  for (h = header_list; size < header_insert_maxlen && h; h = h->next)
+    if (h->type != htype_old && h->text)  /* NULL => Received: placeholder */
+      if (!name || (len <= h->slen && strncmpic(name, h->text, len) == 0))
         {
         int ilen;
         uschar *t;
@@ -1580,7 +1578,7 @@ for (i = 0; i < 2; i++)
         that contains an address list, except when asked for raw headers. Only
         need to do this once. */
 
-        if (!want_raw && name != NULL && comma == 0 &&
+        if (!want_raw && name && comma == 0 &&
             Ustrchr("BCFRST", h->type) != NULL)
           comma = 1;
 
@@ -1613,8 +1611,6 @@ for (i = 0; i < 2; i++)
             }
           }
         }
-      }
-    }
 
   /* At end of first pass, return NULL if no header found. Then truncate size
   if necessary, and get the buffer to hold the data, returning the buffer size.
@@ -1632,9 +1628,7 @@ for (i = 0; i < 2; i++)
 /* That's all we do for raw header expansion. */
 
 if (want_raw)
-  {
   *ptr = 0;
-  }
 
 /* Otherwise, remove a final newline and a redundant added comma. Then we do
 RFC 2047 decoding, translating the charset if requested. The rfc2047_decode2()
@@ -1838,7 +1832,7 @@ switch (vp->type)
   case vtype_msgbody:                        /* Pointer to msgbody string */
   case vtype_msgbody_end:                    /* Ditto, the end of the msg */
     ss = (uschar **)(val);
-    if (*ss == NULL && deliver_datafile >= 0)  /* Read body when needed */
+    if (!*ss && deliver_datafile >= 0)  /* Read body when needed */
       {
       uschar *body;
       off_t start_offset = SPOOL_DATA_START_OFFSET;
@@ -1871,7 +1865,7 @@ switch (vp->type)
 	    { if (body[--len] == '\n' || body[len] == 0) body[len] = ' '; }
 	}
       }
-    return (*ss == NULL)? US"" : *ss;
+    return *ss ? *ss : US"";
 
   case vtype_todbsdin:                       /* BSD inbox time of day */
     return tod_stamp(tod_bsdin);
@@ -3872,7 +3866,11 @@ BOOL resetok = TRUE;
 
 expand_level++;
 DEBUG(D_expand)
-  debug_printf_indent("/%s: %s\n", skipping ? "   scanning" : "considering", string);
+  debug_printf_indent(UTF8_DOWN_RIGHT "%s: %s\n",
+    skipping
+    ? UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ "scanning"
+    : "considering",
+    string);
 
 expand_string_forcedfail = FALSE;
 expand_string_message = US"";
@@ -4119,8 +4117,13 @@ while (*s != 0)
 
       DEBUG(D_expand)
 	{
-        debug_printf_indent("|__condition: %.*s\n", (int)(next_s - s), s);
-        debug_printf_indent("|_____result: %s\n", cond ? "true" : "false");
+        debug_printf_indent(UTF8_VERT_RIGHT UTF8_HORIZ UTF8_HORIZ
+	  "condition: %.*s\n",
+	  (int)(next_s - s), s);
+        debug_printf_indent(UTF8_VERT_RIGHT UTF8_HORIZ UTF8_HORIZ
+	  UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
+	  "result: %s\n",
+	  cond ? "true" : "false");
 	}
 
       s = next_s;
@@ -5982,7 +5985,9 @@ while (*s != 0)
         {
 	uschar * dstitem;
 	uschar * newlist = NULL;
+	int size = 0, len = 0;
 	uschar * newkeylist = NULL;
+	int ksize = 0, klen = 0;
 	uschar * srcfield;
 
         DEBUG(D_expand) debug_printf_indent("%s: $item = \"%s\"\n", name, srcitem);
@@ -6027,33 +6032,33 @@ while (*s != 0)
 	    /* New-item sorts before this dst-item.  Append new-item,
 	    then dst-item, then remainder of dst list. */
 
-	    newlist = string_append_listele(newlist, sep, srcitem);
-	    newkeylist = string_append_listele(newkeylist, sep, srcfield);
+	    newlist = string_append_listele(newlist, &size, &len, sep, srcitem);
+	    newkeylist = string_append_listele(newkeylist, &ksize, &klen, sep, srcfield);
 	    srcitem = NULL;
 
-	    newlist = string_append_listele(newlist, sep, dstitem);
-	    newkeylist = string_append_listele(newkeylist, sep, dstfield);
+	    newlist = string_append_listele(newlist, &size, &len, sep, dstitem);
+	    newkeylist = string_append_listele(newkeylist, &ksize, &klen, sep, dstfield);
 
 	    while ((dstitem = string_nextinlist(&dstlist, &sep, NULL, 0)))
 	      {
 	      if (!(dstfield = string_nextinlist(&dstkeylist, &sep, NULL, 0)))
 		goto sort_mismatch;
-	      newlist = string_append_listele(newlist, sep, dstitem);
-	      newkeylist = string_append_listele(newkeylist, sep, dstfield);
+	      newlist = string_append_listele(newlist, &size, &len, sep, dstitem);
+	      newkeylist = string_append_listele(newkeylist, &ksize, &klen, sep, dstfield);
 	      }
 
 	    break;
 	    }
 
-	  newlist = string_append_listele(newlist, sep, dstitem);
-	  newkeylist = string_append_listele(newkeylist, sep, dstfield);
+	  newlist = string_append_listele(newlist, &size, &len, sep, dstitem);
+	  newkeylist = string_append_listele(newkeylist, &ksize, &klen, sep, dstfield);
 	  }
 
 	/* If we ran out of dstlist without consuming srcitem, append it */
 	if (srcitem)
 	  {
-	  newlist = string_append_listele(newlist, sep, srcitem);
-	  newkeylist = string_append_listele(newkeylist, sep, srcfield);
+	  newlist = string_append_listele(newlist, &size, &len, sep, srcitem);
+	  newkeylist = string_append_listele(newkeylist, &ksize, &klen, sep, srcfield);
 	  }
 
 	dstlist = newlist;
@@ -7501,9 +7506,17 @@ else if (resetok_p) *resetok_p = FALSE;
 
 DEBUG(D_expand)
   {
-  debug_printf_indent("|__expanding: %.*s\n", (int)(s - string), string);
-  debug_printf_indent("%s_____result: %s\n", skipping ? "|" : "\\", yield);
-  if (skipping) debug_printf_indent("\\___skipping: result is not used\n");
+  debug_printf_indent(UTF8_VERT_RIGHT UTF8_HORIZ UTF8_HORIZ
+    "expanding: %.*s\n",
+    (int)(s - string), string);
+  debug_printf_indent("%s"
+    UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
+    "result: %s\n",
+    skipping ? UTF8_VERT_RIGHT : UTF8_UP_RIGHT,
+    yield);
+  if (skipping)
+    debug_printf_indent(UTF8_UP_RIGHT UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
+      "skipping: result is not used\n");
   }
 expand_level--;
 return yield;
@@ -7527,10 +7540,14 @@ EXPAND_FAILED:
 if (left != NULL) *left = s;
 DEBUG(D_expand)
   {
-  debug_printf_indent("|failed to expand: %s\n", string);
-  debug_printf_indent("%s___error message: %s\n",
-    expand_string_forcedfail ? "|" : "\\", expand_string_message);
-  if (expand_string_forcedfail) debug_printf_indent("\\failure was forced\n");
+  debug_printf_indent(UTF8_VERT_RIGHT "failed to expand: %s\n",
+    string);
+  debug_printf_indent("%s" UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
+    "error message: %s\n",
+    expand_string_forcedfail ? UTF8_VERT_RIGHT : UTF8_UP_RIGHT,
+    expand_string_message);
+  if (expand_string_forcedfail)
+    debug_printf_indent(UTF8_UP_RIGHT "failure was forced\n");
   }
 if (resetok_p) *resetok_p = resetok;
 expand_level--;