*************************************************/
/* Copyright (c) Michael Haardt 2003 - 2015
- * Copyright (c) The Exim Maintainers 2017
+ * Copyright (c) The Exim Maintainers 2016 - 2018
* See the file NOTICE for conditions of use and distribution.
*/
#include "exim.h"
#if HAVE_ICONV
-#include <iconv.h>
+# include <iconv.h>
#endif
/* Define this for RFC compliant \r\n end-of-line terminators. */
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";
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;
/* Two passes: one to count output allocation size, second
to do the encoding */
-for (pass=0; pass<=1; ++pass)
+for (int pass = 0; pass <= 1; pass++)
{
line=0;
if (pass==0)
dst->character=store_get(dst->length+1); /* plus one for \0 */
new=dst->character;
}
- for (start=src->character,end=start+src->length; start<end; ++start)
+ for (const uschar * start = src->character, * end = start + src->length;
+ start < end; ++start)
{
ch=*start;
if (line>=73) /* line length limit */
*/
#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; s<e; )
- {
if (*s=='%')
{
if (s+2<e && isxdigit(*(s+1)) && isxdigit(*(s+2)))
}
else
*t++=*s++;
- }
+
*t='\0';
str->length=t-str->character;
return 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\";";
}
if (eq_asciinumeric(needle,haystack,EQ)) r=1;
break;
- }
}
break;
- }
+
case MATCH_CONTAINS:
{
struct String h;
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)
{
address_item *new_addr;
-for (new_addr=*generated; new_addr; new_addr=new_addr->next)
+for (new_addr = *generated; new_addr; new_addr = new_addr->next)
if ( Ustrcmp(new_addr->address,addr) == 0
&& ( !file
|| testflag(new_addr, af_pfr)
{
int x,d,n;
- for (x=0,d=0; d<2 && src<end && isxdigit(n=tolower(*src)); x=(x<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src);
+ for (x = 0, d = 0;
+ d<2 && src<end && isxdigit(n=tolower(*src));
+ x=(x<<4)|(n>='0' && n<='9' ? n-'0' : 10+(n-'a')) ,++d, ++src) ;
if (d==0) return -1;
if (dst) *dst++=x;
++decoded;
-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;
int c,d,n;
unicode_hex:
- 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;
+ 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)
{
0 identifier not matched
*/
-static int parse_string(struct Sieve *filter, struct String *data)
+static int
+parse_string(struct Sieve *filter, struct String *data)
{
gstring * g = NULL;
-int dataCapacity=0;
data->length = 0;
data->character = NULL;
if (dataLength+1 >= dataCapacity) /* increase buffer */
{
struct String *new;
- int newCapacity; /* Don't amalgamate with next line; some compilers grumble */
dataCapacity = dataCapacity ? dataCapacity * 2 : 4;
new = store_get(sizeof(struct String) * dataCapacity);
-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"))
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;
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;
filter->errmsg=CUS "header string expansion failed";
return -1;
}
- parse_allow_group = TRUE;
+ f.parse_allow_group = TRUE;
while (*header_value && !*cond)
{
uschar *error;
*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);
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;
exists-test = "exists" <header-names: string-list>
*/
- struct String *hdr,*h;
+ struct String *hdr;
int m;
if (parse_white(filter)==-1) return -1;
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;
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;
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))
{
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;
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;
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;
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;
<notification-uris: string-list>
*/
- struct String *uris,*u;
+ struct String *uris;
int m;
if (!filter->require_enotify)
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;
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)
{
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;
}
&& (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;
#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)
{
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)
}
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';
{
uschar *s,*end;
- for (s=reason.character,end=reason.character+reason.length; s<end && (*s&0x80)==0; ++s);
+ for (s = reason.character, end = reason.character + reason.length;
+ s<end && (*s&0x80)==0; ) s++;
if (s<end)
{
filter->errmsg=CUS "MIME reason string contains 8bit text";
if (exec)
{
address_item *addr;
- int start;
uschar *buffer;
int buffer_capacity;
md5 base;
uschar digest[16];
uschar hexdigest[33];
- int i;
gstring * once;
if (filter_personal(aliases,TRUE))
else
md5_end(&base, handle.character, handle.length, digest);
- for (i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]);
+ 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);
{
uschar *mime_body,*reason_end;
static const uschar nlnl[]="\r\n\r\n";
- gstring * g;
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
- );
+ 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);
{
struct String qp = { .character = NULL, .length = 0 }; /* Keep compiler happy (PH) */
- start = reason.length;
addr->reply->headers = US"MIME-Version: 1.0\n"
"Content-Type: text/plain;\n"
"\tcharset=\"utf-8\"\n"
require-command = "require" <capabilities: string-list>
*/
- struct String *cap,*check;
+ struct String *cap;
int m;
if (parse_white(filter)==-1) return -1;
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;
git://git.exim.org / exim.git / blobdiff