X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finternet_addressing.c;h=fffd9c7e001ccf32ea09c8a55203f176198789af;hb=f338fe3df988f4c9384e817237526325a31b6971;hp=416586bedeb0e9bd35503e1715aca1dc661737c9;hpb=9ffea7c3315046ddcea2589656c13da5f5e0c076;p=citadel.git diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 416586bed..fffd9c7e0 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -2,7 +2,7 @@ * This file contains functions which handle the mapping of Internet addresses * to users on the Citadel system. * - * Copyright (c) 1987-2019 by the citadel.org team + * Copyright (c) 1987-2020 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -353,7 +353,7 @@ int CtdlIsMe(char *addr, int addr_buf_len) /* If the last item in a list of recipients was truncated to a partial address, - * remove it completely in order to avoid choking libSieve + * remove it completely in order to avoid choking library functions. */ void sanitize_truncated_recipient(char *str) { @@ -884,13 +884,11 @@ void unfold_rfc822_field(char **field, char **FieldEnd) { if ((*sField=='\r') || (*sField=='\n')) { - int Offset = 1; - while (((*(sField + Offset) == '\r') || - (*(sField + Offset) == '\n') || - (isspace(*(sField + Offset)))) && - (sField + Offset < pFieldEnd)) - Offset ++; - sField += Offset; + int offset = 1; + while ( ( (*(sField + offset) == '\r') || (*(sField + offset) == '\n' )) && (sField + offset < pFieldEnd) ) { + offset ++; + } + sField += offset; *pField = *sField; } else {