From nobody Tue Apr 29 15:12:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zn3hn5Yldz5v99C; Tue, 29 Apr 2025 15:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn3hn0pjFz3hZs; Tue, 29 Apr 2025 15:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745939561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9H50mz2J9jvWy26Hr92LN87RRs9fQ3ec/omyaaiHgCo=; b=pehAQ7O+eoKARXMGdZWPuxAUccPlnE/5kXNmsKVcZ2bfG30ZPxw+aqyij4h0uwW7JIW1Ux lcan0/NjKkjsZdeWaW52SzE2lXrLhx57ryoj6GglwEhbJkvggbG4ReBrpuRzLnQl0GUh/g KDUYjQk+FjC87EwsOLYzQ+PIAedTxQj1MmOCovclPVoJzRip4o75tCVippm++IBy61Yiyr W0CVUE7gTRBRCulX0D0DUv8nUaD5Hulv++x34X8wrrd0L3JS0H+VmhrIz3gujJcoiDNoIs dhUI6xlzJiwfKw9MScMBNPJeuwbEpnrVnLabDRmTqmT2uB008cnOfEYzfTamOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745939561; a=rsa-sha256; cv=none; b=wHwoyeVtzVULPvEPCz7HQsolfolpE/s+jfXt2g4MBclyE6wyojMSFU+I3gg2RyUKLXcGY5 Oll6hoVkb8VFYAG4Q6qDMzhodAzkFtEhkaWSifb+i08pN4hThCAZJeK3aD68Xh8m2hQ9zy Ao2DMQQg83S6MT3niR7R/rbFH54PoMP2XrSesoxDH2uZRWpw8JZgifD+EErQUQ0k1IHPW7 MH/vbTUc1wG9uzU78vziqnOIryGaOktBmrW+6KYGml1ud2n/Z0pHCayMbM5JAobww91euX c/2mhfFlOkJQVk7Jf9snw9AwwTmobXzKbZsXgaksEqcmzxQCZKcvRc5FJeDx8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745939561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9H50mz2J9jvWy26Hr92LN87RRs9fQ3ec/omyaaiHgCo=; b=dksaI+2/MIoXoy2E3Tk1Lrp9Fp/43mo/KVidI/pIELgUoEl44X84Y2CN3RUGzya6SmE9Cr zYfFUoXMrR2mOO2J5F4Dye+HXJ5Z1siEorTv6DegK+tNixJ9bAtK2EcyX0a0tfQO/uWzUh GgPbUN1J7tYyMiQT+zM3cvZL6CSXaqOSBALQJArPM3zbZQAJGe/YjOSjGCVOXcuJxdc+ol 9azbkpNbLCOGD9myjc/ojyJYr5kfXcanTwHotjkcSunXZzND+y5QnNrhFK/aifZ3xISUYA WFDT9TjITfLgqEgdcUA5060vQm9ThkIdb8xrDAAufapRqZSveSIkFJIvX604AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zn3hn0NlBz9Dc; Tue, 29 Apr 2025 15:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TFCeax053243; Tue, 29 Apr 2025 15:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TFCeYq053240; Tue, 29 Apr 2025 15:12:40 GMT (envelope-from git) Date: Tue, 29 Apr 2025 15:12:40 GMT Message-Id: <202504291512.53TFCeYq053240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 09bc6a5d5b33 - main - mail: Exit non-zero on failure to collect mail. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09bc6a5d5b3333bc91e5f9fdf1e7bb282c4aea5a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=09bc6a5d5b3333bc91e5f9fdf1e7bb282c4aea5a commit 09bc6a5d5b3333bc91e5f9fdf1e7bb282c4aea5a Author: Dag-Erling Smørgrav AuthorDate: 2025-04-29 15:12:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-29 15:12:30 +0000 mail: Exit non-zero on failure to collect mail. While here, avoid non-portable `pipe2()` in the regression test. Fixes: 59597032c948 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D50069 --- usr.bin/mail/send.c | 4 +++- usr.bin/mail/tests/mail_sigint_test.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c index b4fbd4cbfd8a..fe1086264a9c 100644 --- a/usr.bin/mail/send.c +++ b/usr.bin/mail/send.c @@ -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) diff --git a/usr.bin/mail/tests/mail_sigint_test.c b/usr.bin/mail/tests/mail_sigint_test.c index 76bf9b19b7f1..e2889493f3cd 100644 --- a/usr.bin/mail/tests/mail_sigint_test.c +++ b/usr.bin/mail/tests/mail_sigint_test.c @@ -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);