X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/46fa6b8a21e141c73c95300537d7e71d545d6e25..4a7dca52352d0976f200b89a50825433b7551554:/src/src/match.c diff --git a/src/src/match.c b/src/src/match.c index 65d44198e..45537413d 100644 --- a/src/src/match.c +++ b/src/src/match.c @@ -286,22 +286,7 @@ if (!cb->use_partial) partial = -1; /* Set the parameters for the three different kinds of lookup. */ -keyquery = semicolon + 1; -Uskip_whitespace(&keyquery); - -if (mac_islookup(search_type, lookup_absfilequery)) - { - filename = keyquery; - while (*keyquery && !isspace(*keyquery)) keyquery++; - filename = string_copyn(filename, keyquery - filename); - Uskip_whitespace(&keyquery); - } - -else if (!mac_islookup(search_type, lookup_querystyle)) - { - filename = keyquery; - keyquery = s; - } +keyquery = search_args(search_type, s, semicolon+1, &filename); /* Now do the actual lookup; throw away the data returned unless it was asked for; partial matching is all handled inside search_find(). Note that there is