X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/14702f5b13007409b29615f2a2ad1b141a4b9561..b2f5a03200c914f601bc9d28c6e069316a3b20eb:/src/src/parse.c diff --git a/src/src/parse.c b/src/src/parse.c index e1a1a259c..252628e1a 100644 --- a/src/src/parse.c +++ b/src/src/parse.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/parse.c,v 1.2 2004/11/17 15:21:10 ph10 Exp $ */ +/* $Cambridge: exim/src/src/parse.c,v 1.5 2005/06/27 14:29:43 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2005 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for parsing addresses */ @@ -847,9 +847,9 @@ If the only characters that strictly need quoting are spaces, we return the original string, unmodified. If a quoted string is too long for the buffer, it is truncated. (This shouldn't happen: this is normally handling short strings.) -Hmmph. As always, things get perverted for other uses. This function was -originally for the "phrase" part of addresses. Now it is being used for much -longer texts in ACLs and via the ${rfc2047: expansion item. This means we have +Hmmph. As always, things get perverted for other uses. This function was +originally for the "phrase" part of addresses. Now it is being used for much +longer texts in ACLs and via the ${rfc2047: expansion item. This means we have to check for overlong "encoded-word"s and split them. November 2004. Arguments: @@ -890,7 +890,7 @@ for (; len > 0; len--) { int ch = *s++; if (t > buffer + buffer_size - hlen - 8) break; - + if (t - p > 70) { *t++ = '?'; @@ -899,8 +899,8 @@ for (; len > 0; len--) p = t; Ustrncpy(p, buffer, hlen); t += hlen; - } - + } + if (ch < 33 || ch > 126 || Ustrchr("?=()<>@,;:\\\".[]_", ch) != NULL) { @@ -913,11 +913,11 @@ for (; len > 0; len--) } else *t++ = ch; } - + *t++ = '?'; -*t++ = '='; +*t++ = '='; *t = 0; - + return coded? buffer : string; } @@ -1475,7 +1475,7 @@ for (;;) { *error = string_sprintf("failed to stat included file %s: %s", filename, strerror(errno)); - fclose(f); + (void)fclose(f); return FF_INCLUDEFAIL; } @@ -1502,11 +1502,11 @@ for (;;) { *error = string_sprintf("error while reading included file %s: %s", filename, strerror(errno)); - fclose(f); + (void)fclose(f); return FF_ERROR; } filebuf[statbuf.st_size] = 0; - fclose(f); + (void)fclose(f); addr = NULL; frc = parse_forward_list(filebuf, options, &addr,