Update README.UPDATING; fix typos in ChangeLog/NewStuff

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

diff --git a/src/src/expand.c b/src/src/expand.c
index 0da2105692922ba19f03d4c388f6a5354cadbfa9..cfde23610acafb6d200cfd3934179e802f45ac67 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4112,7 +4112,7 @@ while (*s != 0)
         save_expand_strings(save_expand_nstring, save_expand_nlength);
 
       while (isspace(*s)) s++;
-      next_s = eval_condition(s, &resetok, skipping? NULL : &cond);
+      next_s = eval_condition(s, &resetok, skipping ? NULL : &cond);
       if (next_s == NULL) goto EXPAND_FAILED;  /* message already set */
 
       DEBUG(D_expand)
@@ -4176,11 +4176,13 @@ while (*s != 0)
        goto EXPAND_FAILED;
        }
 
-      if (!(encoded = imap_utf7_encode(sub_arg[0], headers_charset,
-                         sub_arg[1][0], sub_arg[2], &expand_string_message)))
-       goto EXPAND_FAILED;
       if (!skipping)
+       {
+       if (!(encoded = imap_utf7_encode(sub_arg[0], headers_charset,
+                           sub_arg[1][0], sub_arg[2], &expand_string_message)))
+         goto EXPAND_FAILED;
        yield = string_cat(yield, &size, &ptr, encoded);
+       }
       continue;
       }
 #endif
@@ -4658,7 +4660,6 @@ while (*s != 0)
         prvscheck_keynum = NULL;
         }
       else
-        {
         /* Does not look like a prvs encoded address, return the empty string.
            We need to make sure all subs are expanded first, so as to skip over
            the entire item. */
@@ -4669,7 +4670,6 @@ while (*s != 0)
           case 2:
           case 3: goto EXPAND_FAILED;
           }
-        }
 
       continue;
       }
@@ -7123,7 +7123,7 @@ while (*s != 0)
        const uschar * s = sub;
        uschar c;
 
-       for (s = sub; c = *s; s++)
+       for (s = sub; (c = *s); s++)
          yield = c < 127 && c != '\\'
            ? string_catn(yield, &size, &ptr, s, 1)
            : string_catn(yield, &size, &ptr, string_sprintf("\\%03o", c), 4);