X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bfe645c1570343d3adca657ab67998e122ca8792..d7978c0f8af20ff4c3f770589b1bb81568aecff3:/src/src/sieve.c diff --git a/src/src/sieve.c b/src/src/sieve.c index 3d7e99b27..2317f2eeb 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2003 - 2015 */ -/* See the file NOTICE for conditions of use and distribution. */ +/* Copyright (c) Michael Haardt 2003 - 2015 + * Copyright (c) The Exim Maintainers 2016 - 2018 + * See the file NOTICE for conditions of use and distribution. + */ /* This code was contributed by Michael Haardt. */ @@ -19,7 +21,7 @@ #include "exim.h" #if HAVE_ICONV -#include +# include #endif /* Define this for RFC compliant \r\n end-of-line terminators. */ @@ -151,8 +153,10 @@ static uschar str_cc_c[]="Cc"; static const struct String str_cc={ str_cc_c, 2 }; static uschar str_bcc_c[]="Bcc"; static const struct String str_bcc={ str_bcc_c, 3 }; +#ifdef ENVELOPE_AUTH static uschar str_auth_c[]="auth"; static const struct String str_auth={ str_auth_c, 4 }; +#endif static uschar str_sender_c[]="Sender"; static const struct String str_sender={ str_sender_c, 6 }; static uschar str_resent_from_c[]="Resent-From"; @@ -224,15 +228,17 @@ Returns dst */ -static struct String *quoted_printable_encode(const struct String *src, struct String *dst) +static struct String * +quoted_printable_encode(const struct String *src, struct String *dst) { -int pass; -const uschar *start,*end; uschar *new = NULL; uschar ch; size_t line; -for (pass=0; pass<=1; ++pass) +/* Two passes: one to count output allocation size, second +to do the encoding */ + +for (int pass = 0; pass <= 1; pass++) { line=0; if (pass==0) @@ -242,58 +248,51 @@ for (pass=0; pass<=1; ++pass) dst->character=store_get(dst->length+1); /* plus one for \0 */ new=dst->character; } - for (start=src->character,end=start+src->length; startcharacter, * end = start + src->length; + start < end; ++start) { ch=*start; - if (line>=73) + if (line>=73) /* line length limit */ { if (pass==0) dst->length+=2; else { - *new++='='; + *new++='='; /* line split */ *new++='\n'; } line=0; } - if - ( - (ch>=33 && ch<=60) - || (ch>=62 && ch<=126) - || - ( - (ch==9 || ch==32) - && start+2='!' && ch<='<') + || (ch>='>' && ch<='~') + || ( (ch=='\t' || ch==' ') + && start+2length; else - *new++=*start; + *new++=*start; /* copy char */ ++line; } - else if (ch=='\r' && start+1length; - line=0; - } else - *new++='\n'; - line=0; - ++start; + *new++='\n'; /* NL */ + line=0; + ++start; /* consume extra input char */ } else { if (pass==0) dst->length+=3; else - { - sprintf(CS new,"=%02X",ch); - new+=3; + { /* encoded char */ + new += sprintf(CS new,"=%02X",ch); } line+=3; } @@ -360,13 +359,13 @@ Returns */ #ifdef ENOTIFY -static int uri_decode(struct String *str) +static int +uri_decode(struct String *str) { uschar *s,*t,*e; if (str->length==0) return 0; for (s=str->character,t=s,e=s+str->length; scharacter,t=s,e=s+str->length; slength=t-str->character; return 0; @@ -412,11 +411,14 @@ Returns -1 syntax error */ -static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *subject, struct String *body) +static int +parse_mailto_uri(struct Sieve *filter, const uschar *uri, + string_item **recipient, struct String *header, struct String *subject, + struct String *body) { const uschar *start; -struct String to,hname,hvalue; -int capacity; +struct String to, hname; +struct String hvalue = {.character = NULL, .length = 0}; string_item *new; if (Ustrncmp(uri,"mailto:",7)) @@ -424,6 +426,7 @@ if (Ustrncmp(uri,"mailto:",7)) filter->errmsg=US "Unknown URI scheme"; return 0; } + uri+=7; if (*uri && *uri!='?') for (;;) @@ -432,22 +435,21 @@ if (*uri && *uri!='?') for (start=uri; *uri && *uri!='?' && (*uri!='%' || *(uri+1)!='2' || tolower(*(uri+2))!='c'); ++uri); if (uri>start) { - capacity=0; - to.character=(uschar*)0; - to.length=0; - to.character=string_cat(to.character,&capacity,&to.length,start,uri-start); - to.character[to.length]='\0'; + gstring * g = string_catn(NULL, start, uri-start); + + to.character = string_from_gstring(g); + to.length = g->ptr; if (uri_decode(&to)==-1) { filter->errmsg=US"Invalid URI encoding"; return -1; } - new=store_get(sizeof(string_item)); - new->text=store_get(to.length+1); - if (to.length) memcpy(new->text,to.character,to.length); - new->text[to.length]='\0'; - new->next=*recipient; - *recipient=new; + new=store_get(sizeof(string_item)); + new->text=store_get(to.length+1); + if (to.length) memcpy(new->text,to.character,to.length); + new->text[to.length]='\0'; + new->next=*recipient; + *recipient=new; } else { @@ -466,11 +468,10 @@ if (*uri=='?') for (start=uri; *uri && (isalnum(*uri) || strchr("$-_.+!*'(),%",*uri)); ++uri); if (uri>start) { - capacity=0; - hname.character=(uschar*)0; - hname.length=0; - hname.character=string_cat(hname.character,&capacity,&hname.length,start,uri-start); - hname.character[hname.length]='\0'; + gstring * g = string_catn(NULL, start, uri-start); + + hname.character = string_from_gstring(g); + hname.length = g->ptr; if (uri_decode(&hname)==-1) { filter->errmsg=US"Invalid URI encoding"; @@ -489,11 +490,10 @@ if (*uri=='?') for (start=uri; *uri && (isalnum(*uri) || strchr("$-_.+!*'(),%",*uri)); ++uri); if (uri>start) { - capacity=0; - hvalue.character=(uschar*)0; - hvalue.length=0; - hvalue.character=string_cat(hvalue.character,&capacity,&hvalue.length,start,uri-start); - hvalue.character[hvalue.length]='\0'; + gstring * g = string_catn(NULL, start, uri-start); + + hname.character = string_from_gstring(g); + hname.length = g->ptr; if (uri_decode(&hvalue)==-1) { filter->errmsg=US"Invalid URI encoding"; @@ -529,13 +529,18 @@ if (*uri=='?') for (i=ignore; ilength==-1) header->length=0; - capacity=header->length; - header->character=string_cat(header->character,&capacity,&header->length,hname.character,hname.length); - header->character=string_cat(header->character,&capacity,&header->length,CUS ": ",2); - header->character=string_cat(header->character,&capacity,&header->length,hvalue.character,hvalue.length); - header->character=string_cat(header->character,&capacity,&header->length,CUS "\n",1); - header->character[header->length]='\0'; + gstring * g; + + if (header->length==-1) header->length = 0; + + g = string_catn(NULL, header->character, header->length); + g = string_catn(g, hname.character, hname.length); + g = string_catn(g, CUS ": ", 2); + g = string_catn(g, hvalue.character, hvalue.length); + g = string_catn(g, CUS "\n", 1); + + header->character = string_from_gstring(g); + header->length = g->ptr; } } if (*uri=='&') ++uri; @@ -849,21 +854,15 @@ if ((filter_test != FTEST_NONE && debug_selector != 0) || switch (mt) { case MATCH_IS: - { switch (co) { case COMP_OCTET: - { if (eq_octet(needle,haystack,0)) r=1; break; - } case COMP_EN_ASCII_CASEMAP: - { if (eq_asciicase(needle,haystack,0)) r=1; break; - } case COMP_ASCII_NUMERIC: - { if (!filter->require_iascii_numeric) { filter->errmsg=CUS "missing previous require \"comparator-i;ascii-numeric\";"; @@ -871,10 +870,9 @@ switch (mt) } if (eq_asciinumeric(needle,haystack,EQ)) r=1; break; - } } break; - } + case MATCH_CONTAINS: { struct String h; @@ -882,53 +880,42 @@ switch (mt) switch (co) { case COMP_OCTET: - { - for (h=*haystack; h.length; ++h.character,--h.length) if (eq_octet(needle,&h,1)) { r=1; break; } + for (h = *haystack; h.length; ++h.character,--h.length) + if (eq_octet(needle,&h,1)) { r=1; break; } break; - } case COMP_EN_ASCII_CASEMAP: - { - for (h=*haystack; h.length; ++h.character,--h.length) if (eq_asciicase(needle,&h,1)) { r=1; break; } + for (h = *haystack; h.length; ++h.character, --h.length) + if (eq_asciicase(needle,&h,1)) { r=1; break; } break; - } default: - { filter->errmsg=CUS "comparator does not offer specified matchtype"; return -1; - } } break; } + case MATCH_MATCHES: - { switch (co) { case COMP_OCTET: - { if ((r=eq_glob(needle,haystack,0,1))==-1) { filter->errmsg=CUS "syntactically invalid pattern"; return -1; } break; - } case COMP_EN_ASCII_CASEMAP: - { if ((r=eq_glob(needle,haystack,1,1))==-1) { filter->errmsg=CUS "syntactically invalid pattern"; return -1; } break; - } default: - { filter->errmsg=CUS "comparator does not offer specified matchtype"; return -1; - } } break; - } } if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) @@ -993,10 +980,10 @@ Arguments: Returns: quoted string */ -static const uschar *quote(const struct String *header) +static const uschar * +quote(const struct String *header) { -uschar *quoted=NULL; -int size=0,ptr=0; +gstring * quoted = NULL; size_t l; const uschar *h; @@ -1007,26 +994,20 @@ while (l) switch (*h) { case '\0': - { - quoted=string_cat(quoted,&size,&ptr,CUS "\\0",2); + quoted = string_catn(quoted, CUS "\\0", 2); break; - } case '$': case '{': case '}': - { - quoted=string_cat(quoted,&size,&ptr,CUS "\\",1); - } + quoted = string_catn(quoted, CUS "\\", 1); default: - { - quoted=string_cat(quoted,&size,&ptr,h,1); - } + quoted = string_catn(quoted, h, 1); } ++h; --l; } -quoted=string_cat(quoted,&size,&ptr,CUS "",1); -return quoted; +quoted = string_catn(quoted, CUS "", 1); +return string_from_gstring(quoted); } @@ -1046,30 +1027,33 @@ Arguments: Returns: nothing */ -static void add_addr(address_item **generated, uschar *addr, int file, int maxage, int maxmessages, int maxstorage) +static void +add_addr(address_item **generated, uschar *addr, int file, int maxage, int maxmessages, int maxstorage) { address_item *new_addr; -for (new_addr=*generated; new_addr; new_addr=new_addr->next) - { - if (Ustrcmp(new_addr->address,addr)==0 && (file ? testflag(new_addr, af_pfr|af_file) : 1)) +for (new_addr = *generated; new_addr; new_addr = new_addr->next) + if ( Ustrcmp(new_addr->address,addr) == 0 + && ( !file + || testflag(new_addr, af_pfr) + || testflag(new_addr, af_file) + ) + ) { if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) - { debug_printf("Repeated %s `%s' ignored.\n",file ? "fileinto" : "redirect", addr); - } + return; } - } if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) - { debug_printf("%s `%s'\n",file ? "fileinto" : "redirect", addr); - } -new_addr=deliver_make_addr(addr,TRUE); + +new_addr = deliver_make_addr(addr,TRUE); if (file) { - setflag(new_addr, af_pfr|af_file); + setflag(new_addr, af_pfr); + setflag(new_addr, af_file); new_addr->mode = 0; } new_addr->prop.errors_address = NULL; @@ -1268,7 +1252,9 @@ do { int x,d,n; - for (x=0,d=0; d<2 && src='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src); + for (x = 0, d = 0; + d<2 && src='0' && n<='9' ? n-'0' : 10+(n-'a')) ,++d, ++src) ; if (d==0) return -1; if (dst) *dst++=x; ++decoded; @@ -1310,7 +1296,8 @@ Returns: >=0 number of decoded octets -2 semantic error (character range violation) */ -static int unicode_decode(uschar *src, uschar *end, uschar *dst) +static int +unicode_decode(uschar *src, uschar *end, uschar *dst) { int decoded=0; @@ -1321,9 +1308,11 @@ do int c,d,n; unicode_hex: - for (hex_seq=src; src='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src); - if (src==hex_seq) return -1; + for (hex_seq = src; src < end && *src=='0'; ) src++; + for (c = 0, d = 0; + d < 7 && src < end && isxdigit(n=tolower(*src)); + c=(c<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')), ++d, ++src) ; + if (src == hex_seq) return -1; if (d==7 || (!((c>=0 && c<=0xd7ff) || (c>=0xe000 && c<=0x10ffff)))) return -2; if (c<128) { @@ -1472,12 +1461,14 @@ Returns: 1 success 0 identifier not matched */ -static int parse_string(struct Sieve *filter, struct String *data) +static int +parse_string(struct Sieve *filter, struct String *data) { -int dataCapacity=0; +gstring * g = NULL; + +data->length = 0; +data->character = NULL; -data->length=0; -data->character=(uschar*)0; if (*filter->pc=='"') /* quoted string */ { ++filter->pc; @@ -1485,11 +1476,17 @@ if (*filter->pc=='"') /* quoted string */ { if (*filter->pc=='"') /* end of string */ { - int foo=data->length; - ++filter->pc; + + if (g) + { + data->character = string_from_gstring(g); + data->length = g->ptr; + } + else + data->character = US"\0"; /* that way, there will be at least one character allocated */ - data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); + #ifdef ENCODED_CHARACTER if (filter->require_encoded_character && string_decode(filter,data)==-1) @@ -1499,7 +1496,7 @@ if (*filter->pc=='"') /* quoted string */ } else if (*filter->pc=='\\' && *(filter->pc+1)) /* quoted character */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc+1,1); + g = string_catn(g, filter->pc+1, 1); filter->pc+=2; } else /* regular character */ @@ -1509,11 +1506,11 @@ if (*filter->pc=='"') /* quoted string */ #else if (*filter->pc=='\n') { - data->character=string_cat(data->character,&dataCapacity,&data->length,US"\r",1); + g = string_catn(g, US"\r", 1); ++filter->line; } #endif - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); + g = string_catn(g, filter->pc, 1); filter->pc++; } } @@ -1555,7 +1552,7 @@ else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */ if (*filter->pc=='\n') /* end of line */ #endif { - data->character=string_cat(data->character,&dataCapacity,&data->length,CUS "\r\n",2); + g = string_catn(g, CUS "\r\n", 2); #ifdef RFC_EOL filter->pc+=2; #else @@ -1568,10 +1565,15 @@ else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */ if (*filter->pc=='.' && *(filter->pc+1)=='\n') /* end of string */ #endif { - int foo=data->length; + if (g) + { + data->character = string_from_gstring(g); + data->length = g->ptr; + } + else + data->character = US"\0"; + /* that way, there will be at least one character allocated */ - /* that way, there will be at least one character allocated */ - data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); #ifdef RFC_EOL filter->pc+=3; #else @@ -1587,13 +1589,13 @@ else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */ } else if (*filter->pc=='.' && *(filter->pc+1)=='.') /* remove dot stuffing */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,CUS ".",1); + g = string_catn(g, CUS ".", 1); filter->pc+=2; } } else /* regular character */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); + g = string_catn(g, filter->pc, 1); filter->pc++; } } @@ -1706,12 +1708,13 @@ Returns: 1 success -1 no string list found */ -static int parse_stringlist(struct Sieve *filter, struct String **data) +static int +parse_stringlist(struct Sieve *filter, struct String **data) { const uschar *orig=filter->pc; -int dataCapacity=0; -int dataLength=0; -struct String *d=(struct String*)0; +int dataCapacity = 0; +int dataLength = 0; +struct String *d = NULL; int m; if (*filter->pc=='[') /* string list */ @@ -1720,20 +1723,17 @@ if (*filter->pc=='[') /* string list */ for (;;) { if (parse_white(filter)==-1) goto error; - if ((dataLength+1)>=dataCapacity) /* increase buffer */ + if (dataLength+1 >= dataCapacity) /* increase buffer */ { struct String *new; - int newCapacity; /* Don't amalgamate with next line; some compilers grumble */ - newCapacity=dataCapacity?(dataCapacity*=2):(dataCapacity=4); - if ((new=(struct String*)store_get(sizeof(struct String)*newCapacity))==(struct String*)0) - { - filter->errmsg=CUstrerror(errno); - goto error; - } + + dataCapacity = dataCapacity ? dataCapacity * 2 : 4; + new = store_get(sizeof(struct String) * dataCapacity); + if (d) memcpy(new,d,sizeof(struct String)*dataLength); - d=new; - dataCapacity=newCapacity; + d = new; } + m=parse_string(filter,&d[dataLength]); if (m==0) { @@ -2030,7 +2030,8 @@ Returns: 1 success -1 syntax or execution error */ -static int parse_test(struct Sieve *filter, int *cond, int exec) +static int +parse_test(struct Sieve *filter, int *cond, int exec) { if (parse_white(filter)==-1) return -1; if (parse_identifier(filter,CUS "address")) @@ -2045,7 +2046,7 @@ if (parse_identifier(filter,CUS "address")) enum AddressPart addressPart=ADDRPART_ALL; enum Comparator comparator=COMP_EN_ASCII_CASEMAP; enum MatchType matchType=MATCH_IS; - struct String *hdr,*h,*key,*k; + struct String *hdr,*key; int m; int ap=0,co=0,mt=0; @@ -2097,7 +2098,7 @@ if (parse_identifier(filter,CUS "address")) return -1; } *cond=0; - for (h=hdr; h->length!=-1 && !*cond; ++h) + for (struct String * h = hdr; h->length!=-1 && !*cond; ++h) { uschar *header_value=(uschar*)0,*extracted_addr,*end_addr; @@ -2124,7 +2125,7 @@ if (parse_identifier(filter,CUS "address")) filter->errmsg=CUS "header string expansion failed"; return -1; } - parse_allow_group = TRUE; + f.parse_allow_group = TRUE; while (*header_value && !*cond) { uschar *error; @@ -2153,12 +2154,10 @@ if (parse_identifier(filter,CUS "address")) *end_addr = saveend; if (part) { - for (k=key; k->length!=-1; ++k) + for (struct String * k = key; k->length !=- 1; ++k) { - struct String partStr; + struct String partStr = {.character = part, .length = Ustrlen(part)}; - partStr.character=part; - partStr.length=Ustrlen(part); if (extracted_addr) { *cond=compare(filter,k,&partStr,comparator,matchType); @@ -2170,8 +2169,8 @@ if (parse_identifier(filter,CUS "address")) if (saveend == 0) break; header_value = end_addr + 1; } - parse_allow_group = FALSE; - parse_found_group = FALSE; + f.parse_allow_group = FALSE; + f.parse_found_group = FALSE; } } return 1; @@ -2212,7 +2211,7 @@ else if (parse_identifier(filter,CUS "exists")) exists-test = "exists" */ - struct String *hdr,*h; + struct String *hdr; int m; if (parse_white(filter)==-1) return -1; @@ -2224,7 +2223,7 @@ else if (parse_identifier(filter,CUS "exists")) if (exec) { *cond=1; - for (h=hdr; h->length!=-1 && *cond; ++h) + for (struct String * h = hdr; h->length != -1 && *cond; ++h) { uschar *header_def; @@ -2257,7 +2256,7 @@ else if (parse_identifier(filter,CUS "header")) enum Comparator comparator=COMP_EN_ASCII_CASEMAP; enum MatchType matchType=MATCH_IS; - struct String *hdr,*h,*key,*k; + struct String *hdr,*key; int m; int co=0,mt=0; @@ -2299,7 +2298,7 @@ else if (parse_identifier(filter,CUS "header")) return -1; } *cond=0; - for (h=hdr; h->length!=-1 && !*cond; ++h) + for (struct String * h = hdr; h->length != -1 && !*cond; ++h) { if (!is_header(h)) { @@ -2318,15 +2317,13 @@ else if (parse_identifier(filter,CUS "header")) filter->errmsg=CUS "header string expansion failed"; return -1; } - for (k=key; k->length!=-1; ++k) - { + for (struct String * k = key; k->length != -1; ++k) if (Ustrcmp(header_def,"true")==0) { *cond=compare(filter,k,&header_value,comparator,matchType); if (*cond==-1) return -1; if (*cond) break; } - } } } return 1; @@ -2384,7 +2381,7 @@ else if (parse_identifier(filter,CUS "envelope")) enum Comparator comparator=COMP_EN_ASCII_CASEMAP; enum AddressPart addressPart=ADDRPART_ALL; enum MatchType matchType=MATCH_IS; - struct String *env,*e,*key,*k; + struct String *env,*key; int m; int co=0,ap=0,mt=0; @@ -2441,7 +2438,7 @@ else if (parse_identifier(filter,CUS "envelope")) return -1; } *cond=0; - for (e=env; e->length!=-1 && !*cond; ++e) + for (struct String * e = env; e->length != -1 && !*cond; ++e) { const uschar *envelopeExpr=CUS 0; uschar *envelope=US 0; @@ -2503,12 +2500,10 @@ else if (parse_identifier(filter,CUS "envelope")) filter->errmsg=CUS "header string expansion failed"; return -1; } - for (k=key; k->length!=-1; ++k) + for (struct String * k = key; k->length != -1; ++k) { - struct String envelopeStr; + struct String envelopeStr = {.character = envelope, .length = Ustrlen(envelope)}; - envelopeStr.character=envelope; - envelopeStr.length=Ustrlen(envelope); *cond=compare(filter,k,&envelopeStr,comparator,matchType); if (*cond==-1) return -1; if (*cond) break; @@ -2525,7 +2520,7 @@ else if (parse_identifier(filter,CUS "valid_notify_method")) */ - struct String *uris,*u; + struct String *uris; int m; if (!filter->require_enotify) @@ -2542,7 +2537,7 @@ else if (parse_identifier(filter,CUS "valid_notify_method")) if (exec) { *cond=1; - for (u=uris; u->length!=-1 && *cond; ++u) + for (struct String * u = uris; u->length != -1 && *cond; ++u) { string_item *recipient; struct String header,subject,body; @@ -2574,7 +2569,7 @@ else if (parse_identifier(filter,CUS "notify_method_capability")) enum Comparator comparator=COMP_EN_ASCII_CASEMAP; enum MatchType matchType=MATCH_IS; - struct String uri,capa,*keys,*k; + struct String uri,capa,*keys; if (!filter->require_enotify) { @@ -2637,15 +2632,13 @@ else if (parse_identifier(filter,CUS "notify_method_capability")) body.length=-1; body.character=(uschar*)0; if (parse_mailto_uri(filter,uri.character,&recipient,&header,&subject,&body)==1) - { if (eq_asciicase(&capa,&str_online,0)==1) - for (k=keys; k->length!=-1; ++k) + for (struct String * k = keys; k->length != -1; ++k) { *cond=compare(filter,k,&str_maybe,comparator,matchType); if (*cond==-1) return -1; if (*cond) break; } - } } return 1; } @@ -3073,7 +3066,7 @@ while (*filter->pc) && (message.length==-1 || Ustrcmp(already->message.character,message.character)==0)) break; } - if (already==(struct Notification*)0) + if (!already) /* New notification, process it */ { struct Notification *sent; @@ -3086,8 +3079,7 @@ while (*filter->pc) #ifndef COMPILE_SYNTAX_CHECKER if (filter_test == FTEST_NONE) { - string_item *p; - int pid,fd; + int pid, fd; if ((pid = child_open_exim2(&fd,envelope_from,envelope_from))>=1) { @@ -3097,7 +3089,8 @@ while (*filter->pc) f = fdopen(fd, "wb"); fprintf(f,"From: %s\n",from.length==-1 ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : from.character); - for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text); + for (string_item * p = recipient; p; p=p->next) + fprintf(f,"To: %s\n",p->text); fprintf(f,"Auto-Submitted: auto-notified; %s\n",filter->enotify_mailto_owner); if (header.length>0) fprintf(f,"%s",header.character); if (message.length==-1) @@ -3105,7 +3098,7 @@ while (*filter->pc) message.character=US"Notification"; message.length=Ustrlen(message.character); } - /* Allocation is larger than neccessary, but enough even for split MIME words */ + /* Allocation is larger than necessary, but enough even for split MIME words */ buffer_capacity=32+4*message.length; buffer=store_get(buffer_capacity); if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE)); @@ -3219,19 +3212,16 @@ while (*filter->pc) } else if (parse_identifier(filter,CUS ":addresses")==1) { - struct String *a; - if (parse_white(filter)==-1) return -1; if ((m=parse_stringlist(filter,&addresses))!=1) { if (m==0) filter->errmsg=CUS "addresses string list expected"; return -1; } - for (a=addresses; a->length!=-1; ++a) + for (struct String * a = addresses; a->length != -1; ++a) { - string_item *new; + string_item * new = store_get(sizeof(string_item)); - new=store_get(sizeof(string_item)); new->text=store_get(a->length+1); if (a->length) memcpy(new->text,a->character,a->length); new->text[a->length]='\0'; @@ -3262,7 +3252,8 @@ while (*filter->pc) { uschar *s,*end; - for (s=reason.character,end=reason.character+reason.length; serrmsg=CUS "MIME reason string contains 8bit text"; @@ -3274,15 +3265,12 @@ while (*filter->pc) if (exec) { address_item *addr; - int capacity,start; uschar *buffer; int buffer_capacity; - struct String key; md5 base; uschar digest[16]; uschar hexdigest[33]; - int i; - uschar *once; + gstring * once; if (filter_personal(aliases,TRUE)) { @@ -3294,32 +3282,30 @@ while (*filter->pc) } /* build oncelog filename */ - key.character=(uschar*)0; - key.length=0; - capacity=0; + md5_start(&base); + if (handle.length==-1) { - if (subject.length!=-1) key.character=string_cat(key.character,&capacity,&key.length,subject.character,subject.length); - if (from.length!=-1) key.character=string_cat(key.character,&capacity,&key.length,from.character,from.length); - key.character=string_cat(key.character,&capacity,&key.length,reason_is_mime?US"1":US"0",1); - key.character=string_cat(key.character,&capacity,&key.length,reason.character,reason.length); + gstring * key = NULL; + if (subject.length!=-1) key =string_catn(key, subject.character, subject.length); + if (from.length!=-1) key = string_catn(key, from.character, from.length); + key = string_catn(key, reason_is_mime?US"1":US"0", 1); + key = string_catn(key, reason.character, reason.length); + md5_end(&base, key->s, key->ptr, digest); } else - key=handle; - md5_start(&base); - md5_end(&base, key.character, key.length, digest); - for (i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]); + md5_end(&base, handle.character, handle.length, digest); + + for (int i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]); + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) - { debug_printf("Sieve: mail was personal, vacation file basename: %s\n", hexdigest); - } + if (filter_test == FTEST_NONE) { - capacity=Ustrlen(filter->vacation_directory); - start=capacity; - once=string_cat(filter->vacation_directory,&capacity,&start,US"/",1); - once=string_cat(once,&capacity,&start,hexdigest,33); - once[start] = '\0'; + once = string_cat (NULL, filter->vacation_directory); + once = string_catn(once, US"/", 1); + once = string_catn(once, hexdigest, 33); /* process subject */ @@ -3330,11 +3316,12 @@ while (*filter->pc) subject_def=expand_string(US"${if def:header_subject {true}{false}}"); if (Ustrcmp(subject_def,"true")==0) { + gstring * g = string_catn(NULL, US"Auto: ", 6); + expand_header(&subject,&str_subject); - capacity=6; - start=6; - subject.character=string_cat(US"Auto: ",&capacity,&start,subject.character,subject.length); - subject.length=start; + g = string_catn(g, subject.character, subject.length); + subject.character = string_from_gstring(g); + subject.length = g->ptr; } else { @@ -3347,7 +3334,7 @@ while (*filter->pc) addr = deliver_make_addr(string_sprintf(">%.256s", sender_address), FALSE); setflag(addr, af_pfr); - setflag(addr, af_ignore_error); + addr->prop.ignore_error = TRUE; addr->next = *generated; *generated = addr; addr->reply = store_get(sizeof(reply_item)); @@ -3357,12 +3344,12 @@ while (*filter->pc) addr->reply->from = expand_string(US"$local_part@$domain"); else addr->reply->from = from.character; - /* Allocation is larger than neccessary, but enough even for split MIME words */ + /* Allocation is larger than necessary, but enough even for split MIME words */ buffer_capacity=32+4*subject.length; buffer=store_get(buffer_capacity); /* deconst cast safe as we pass in a non-const item */ addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE); - addr->reply->oncelog=once; + addr->reply->oncelog = string_from_gstring(once); addr->reply->once_repeat=days*86400; /* build body and MIME headers */ @@ -3374,27 +3361,20 @@ while (*filter->pc) for ( - mime_body=reason.character,reason_end=reason.character+reason.length; - mime_body<(reason_end-(sizeof(nlnl)-1)) && memcmp(mime_body,nlnl,(sizeof(nlnl)-1)); - ++mime_body - ); - capacity = 0; - start = 0; - addr->reply->headers = string_cat(NULL,&capacity,&start,reason.character,mime_body-reason.character); - addr->reply->headers[start] = '\0'; - capacity = 0; - start = 0; + mime_body = reason.character, reason_end = reason.character + reason.length; + mime_body < (reason_end-(sizeof(nlnl)-1)) && memcmp(mime_body, nlnl, (sizeof(nlnl)-1)); + ) mime_body++; + + addr->reply->headers = string_copyn(reason.character, mime_body-reason.character); + if (mime_body+(sizeof(nlnl)-1)reply->text = string_cat(NULL,&capacity,&start,mime_body,reason_end-mime_body); - addr->reply->text[start] = '\0'; + addr->reply->text = string_copyn(mime_body, reason_end-mime_body); } else { - struct String qp = { NULL, 0 }; /* Keep compiler happy (PH) */ + struct String qp = { .character = NULL, .length = 0 }; /* Keep compiler happy (PH) */ - capacity = 0; - start = reason.length; addr->reply->headers = US"MIME-Version: 1.0\n" "Content-Type: text/plain;\n" "\tcharset=\"utf-8\"\n" @@ -3404,9 +3384,7 @@ while (*filter->pc) } } else if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) - { debug_printf("Sieve: mail was not personal, vacation would ignore it\n"); - } } } else break; @@ -3500,7 +3478,7 @@ while (parse_identifier(filter,CUS "require")) require-command = "require" */ - struct String *cap,*check; + struct String *cap; int m; if (parse_white(filter)==-1) return -1; @@ -3509,7 +3487,7 @@ while (parse_identifier(filter,CUS "require")) if (m==0) filter->errmsg=CUS "capability string list expected"; return -1; } - for (check=cap; check->character; ++check) + for (struct String * check = cap; check->character; ++check) { if (eq_octet(check,&str_envelope,0)) filter->require_envelope=1; else if (eq_octet(check,&str_fileinto,0)) filter->require_fileinto=1;