X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Frda.c;h=aed8abc246b54b5e1a764f0e13171c827f958542;hb=a63442492d25b3ab12d0bce2a8b879e32855aa72;hp=85791c2f73dc7d5cc59b01965e126ae90fec0364;hpb=8e9fdd6369f0a7a81f0ca195e24edd372f7ca3ef;p=exim.git diff --git a/src/src/rda.c b/src/src/rda.c index 85791c2f7..aed8abc24 100644 --- a/src/src/rda.c +++ b/src/src/rda.c @@ -42,7 +42,7 @@ Returns: FILTER_EXIM if it starts with "# Exim filter" static BOOL match_tag(const uschar *s, const uschar *tag) { -for (; *tag != 0; s++, tag++) +for (; *tag; s++, tag++) if (*tag == ' ') { while (*s == ' ' || *s == '\t') s++; @@ -60,10 +60,10 @@ tags for other types of filter. */ int rda_is_filter(const uschar *s) { -while (isspace(*s)) s++; /* Skips initial blank lines */ -if (match_tag(s, CUS"# exim filter")) return FILTER_EXIM; - else if (match_tag(s, CUS"# sieve filter")) return FILTER_SIEVE; - else return FILTER_FORWARD; +Uskip_whitespace(&s); /* Skips initial blank lines */ +if (match_tag(s, CUS"# exim filter")) return FILTER_EXIM; +else if (match_tag(s, CUS"# sieve filter")) return FILTER_SIEVE; +else return FILTER_FORWARD; } @@ -615,7 +615,7 @@ with the parent process. */ oldsignal = signal(SIGCHLD, SIG_DFL); search_tidyup(); -if ((pid = exim_fork(US"router interpret")) == 0) +if ((pid = exim_fork(US"router-interpret")) == 0) { header_line *waslast = header_last; /* Save last header */ @@ -768,7 +768,7 @@ if ((pid = exim_fork(US"router interpret")) == 0) out: (void)close(fd); search_tidyup(); - exim_underbar_exit(0, US"rda"); + exim_underbar_exit(EXIT_SUCCESS); bad: DEBUG(D_rewrite) debug_printf("rda_interpret: failed write to pipe\n");