system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-14 20:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dma: use canonical getline() loop

Browse source 
getline() returns -1 on erorr or EOF, so use that condition instead of
feof() and check that there was no error after the loop exits.

Reviewed by:	bapt, kevans (both earlier)
MFC after:	3 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D34159

(cherry picked from commit d21e71efce)
This commit is contained in:
Ed Maste 2022-02-03 13:51:06 -05:00
parent 7b8bb67135
commit 2e8403e021
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/dma/mail.c
View file

@ -405,10 +405,8 @@ readmail(struct queue *queue, int nodot, int recp_from_header)
if ((ssize_t)error < 0)
return (-1);
while (!feof(stdin)) {
while ((linelen = getline(&line, &linecap, stdin)) > 0) {
newline[0] = '\0';
if ((linelen = getline(&line, &linecap, stdin)) <= 0)
break;
if (had_last_line)
errlogx(EX_DATAERR, "bad mail input format:"
" from %s (uid %d) (envelope-from %s)",
@ -510,8 +508,8 @@ readmail(struct queue *queue, int nodot, int recp_from_header)
}
}
}
ret = 0;
if (ferror(stdin) == 0)
ret = 0;
fail:
free(line);
return (ret);