summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTony Finch <dot@dot.at>2008-08-07 11:05:03 +0000
committerTony Finch <dot@dot.at>2008-08-07 11:05:03 +0000
commite2803e40f432c44b56967261357dc38a33616a35 (patch)
tree8ff70be2a3ef6ffe7e18ebf03ab076808a7d8f08 /src
parent512314e949e4913a30b3b5d3f66840e6f3ce0584 (diff)
Fix the way ${extract is skipped in the untaken branch of a conditional.
Diffstat (limited to 'src')
-rw-r--r--src/src/expand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src/expand.c b/src/src/expand.c
index fc203ac59..cd84294ae 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/expand.c,v 1.95 2008/05/22 10:56:27 fanf2 Exp $ */
+/* $Cambridge: exim/src/src/expand.c,v 1.96 2008/08/07 11:05:03 fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -4659,7 +4659,7 @@ while (*s != 0)
while (len > 0 && isspace(p[len-1])) len--;
p[len] = 0;
- if (*p == 0)
+ if (*p == 0 && !skipping)
{
expand_string_message = US"first argument of \"extract\" must "
"not be empty";