upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-10 17:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mail: Exit non-zero on failure to collect mail.

Browse source 
While here, avoid non-portable `pipe2()` in the regression test.

Fixes:		59597032c9
MFC after:	1 week
Sponsored by:	Klara, Inc.
Reviewed by:	kevans
Differential Revision:	https://reviews.freebsd.org/D50069
This commit is contained in:
Dag-Erling Smørgrav 2025-04-29 17:12:17 +02:00
parent 578cbd03f7
commit 09bc6a5d5b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr.bin/mail/send.c
View file

@ -293,8 +293,10 @@ mail1(struct header *hp, int printheaders)
* Collect user's mail from standard input.
* Get the result as mtf.
*/
if ((mtf = collect(hp, printheaders)) == NULL)
if ((mtf = collect(hp, printheaders)) == NULL) {
senderr++;
return;
}
if (value("interactive") != NULL) {
if (value("askcc") != NULL || value("askbcc") != NULL) {
if (value("askcc") != NULL)

5
usr.bin/mail/tests/mail_sigint_test.c
View file

@ -39,7 +39,7 @@ mailx_sigint(bool interactive)
/* input, output, error, sync pipes */
if (pipe(ipd) != 0 || pipe(opd) != 0 || pipe(epd) != 0 ||
pipe2(spd, O_CLOEXEC) != 0)
pipe(spd) != 0 || fcntl(spd[1], F_SETFD, FD_CLOEXEC) != 0)
atf_tc_fail("failed to pipe");
/* fork child */
if ((pid = fork()) < 0)
@ -55,6 +55,7 @@ mailx_sigint(bool interactive)
dup2(epd[1], STDERR_FILENO);
close(epd[0]);
close(epd[1]);
close(spd[0]);
/* force dead.letter to go to cwd */
setenv("HOME", ".", 1);
/* exec mailx */
@ -113,7 +114,7 @@ mailx_sigint(bool interactive)
close(spd[0]);
if (interactive) {
ATF_CHECK(WIFEXITED(status));
ATF_CHECK_INTEQ(0, WEXITSTATUS(status));
ATF_CHECK_INTEQ(1, WEXITSTATUS(status));
ATF_CHECK_INTEQ(2, kc);
ATF_CHECK_STREQ("", obuf);
ATF_CHECK_MATCH("Interrupt -- one more to kill letter", ebuf);