diff options
Diffstat (limited to 'src/collect.c')
| -rw-r--r-- | src/collect.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/collect.c b/src/collect.c index 5f090b23a0428..526519050ca66 100644 --- a/src/collect.c +++ b/src/collect.c @@ -303,7 +303,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize) char bufbuf[MAXLINE]; #if _FFR_REJECT_NUL_BYTE bool hasNUL; /* has at least one NUL input byte */ -#endif /* _FFR_REJECT_NUL_BYTE */ +#endif df = NULL; ignrdot = smtpmode ? false : IgnrDot; @@ -321,7 +321,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize) HasEightBits = false; #if _FFR_REJECT_NUL_BYTE hasNUL = false; -#endif /* _FFR_REJECT_NUL_BYTE */ +#endif buf = bp = bufbuf; buflen = sizeof(bufbuf); pbp = peekbuf; @@ -413,7 +413,7 @@ collect(fp, smtpmode, hdrp, e, rsetsize) #if _FFR_REJECT_NUL_BYTE if (c == '\0') hasNUL = true; -#endif /* _FFR_REJECT_NUL_BYTE */ +#endif if (c == SM_IO_EOF) goto readerr; if (SevenBitInput) @@ -435,11 +435,9 @@ collect(fp, smtpmode, hdrp, e, rsetsize) break; case IS_DOT: - if (c == '\n' && !ignrdot && - !bitset(EF_NL_NOT_EOL, e->e_flags)) + if (c == '\n' && !ignrdot) goto readerr; - else if (c == '\r' && - !bitset(EF_CRLF_NOT_EOL, e->e_flags)) + else if (c == '\r') { istate = IS_DOTCR; continue; @@ -494,13 +492,12 @@ collect(fp, smtpmode, hdrp, e, rsetsize) goto bufferchar; } - if (c == '\r' && !bitset(EF_CRLF_NOT_EOL, e->e_flags)) + if (c == '\r') { istate = IS_CR; continue; } - else if (c == '\n' && !bitset(EF_NL_NOT_EOL, - e->e_flags)) + else if (c == '\n') istate = IS_BOL; else istate = IS_NORM; @@ -683,10 +680,8 @@ nextstate: bp = buf; /* toss blank line */ - if ((!bitset(EF_CRLF_NOT_EOL, e->e_flags) && - bp[0] == '\r' && bp[1] == '\n') || - (!bitset(EF_NL_NOT_EOL, e->e_flags) && - bp[0] == '\n')) + if ((bp[0] == '\r' && bp[1] == '\n') || + (bp[0] == '\n')) { break; } @@ -981,9 +976,9 @@ dferror(df, msg, e) { #if STAT64 > 0 struct stat64 st; -#else /* STAT64 > 0 */ +#else struct stat st; -#endif /* STAT64 > 0 */ +#endif long avail; long bsize; @@ -992,9 +987,9 @@ dferror(df, msg, e) if ( #if STAT64 > 0 fstat64(sm_io_getinfo(df, SM_IO_WHAT_FD, NULL), &st) -#else /* STAT64 > 0 */ +#else fstat(sm_io_getinfo(df, SM_IO_WHAT_FD, NULL), &st) -#endif /* STAT64 > 0 */ +#endif < 0) st.st_size = 0; (void) sm_io_reopen(SmFtStdio, SM_TIME_DEFAULT, dfname, |