From nobody Mon Mar 09 21:04:52 2026 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 4fV8fF0rT0z6TwZk for ; Mon, 09 Mar 2026 21:04:53 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV8fF0FPQz3Ly0 for ; Mon, 09 Mar 2026 21:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773090293; 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=hYSSR9bqVIBDN6w+cA7YcB1hBNFSs5ZXdUN8yszSB5g=; b=HNjx973MiI58d0Qn9x1zvRcjn/Mp2Acf0KSTqMk43Oz00ify4JYwbVHbJyg9ALE6D20nzK Kv7I/iflA8oCr5luuygNcaisiljrRrHhtcMhkD1VxRwVy5XG+n5BQ4zSLvcQ+xbh//XNuf 1Pa1xJkh9LZGs4jZu0+UCTB86y2BTErh5kvQ/O7/z+bhYFpwaWirlzCzMrTvJWEpMGkJFL 7YENCZvkvWyRCsQUQctsIuTRHYVTCQRpAnf9jGivPRpXjyXPpYAWyvqDc0EgE3hUDRP/fO rGlWg86T94nuEZNUGWm0wan1YiHthgDmPTja/2jqf7qsf8VhQDBrhtQuPkad+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773090293; a=rsa-sha256; cv=none; b=xbkcMCMyNtrtZqUBItDKUZwiT3dWdnIxgzyaDCUnjYLSMAdqKeAhHfOyG1TrAXDV+xXskz R/rOmnQig210GndQEzW42Sqk1cJwdkN4AobMC2uU7Qedqy8oePWzpEJTXCABkjmanQVdGE cr/sm5xqrMEnwIdIfqXS9uCCFgxjQapDPL+Xw7NX5eLA+ykDRemAE2196h0rim0WjGnYpB 7NU72y4zOs52WXDQG+uAKKGvngliBXALuPKZigXyXj5U7olEmaKUALvuyZQFVTmbp2pdnv M6SWRnfH5PNnn5zkUyRRuyEgQljDw3i7v5ojYoun5ERYejZEWq0epDM6sJpBDg== 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=1773090293; 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=hYSSR9bqVIBDN6w+cA7YcB1hBNFSs5ZXdUN8yszSB5g=; b=hb32cLohGi9ysMo62cif7P6wcoTDa99hYj+T09CKXRu+ODM31LITe1P17rWo2VdmXq5rCl jW/CMJhKAm2TU3I7Ni3nwRXegUAslYprmkbMTkobqiAFBANn2TE6zsDldMqfiayC4P+oPA TdjeWMcZ9C4fBzhfFQgw9436r0DQA7VL1NHKNwrJrHmXXXShCA1A7XieCmMe8/xUjNmqtm LLYjpmX93vab75JMHO9o5dDkAqZu86AWmzfiMvgYxK6miKV3qZaMN0OTHSLuG1YP/VqZW+ WwE7Vf8Ci8D/oCXQL+1l5+zw9C0+cT/+IC+d8iCiG6+klz8ly0xR8x9gGgQ0WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV8fD6BJHzjrx for ; Mon, 09 Mar 2026 21:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 374ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 21:04:52 +0000 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=B8rg?=rav Subject: git: 863b5c137a98 - main - system(3): Fix brain glitch in previous commit 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: 863b5c137a98d29dc6964cba0e0c4fe2a8bebab8 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 21:04:52 +0000 Message-Id: <69af35f4.374ca.7489b814@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=863b5c137a98d29dc6964cba0e0c4fe2a8bebab8 commit 863b5c137a98d29dc6964cba0e0c4fe2a8bebab8 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-09 21:00:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-09 21:01:41 +0000 system(3): Fix brain glitch in previous commit We were saving SIGINT twice instead of SIGINT and SIGQUIT. Also restore original order of operations (SIGINT then SIGQUIT), which matches the order in which they're discussed in the POSIX description of system(3). MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 48368f702423 ("system(3): Address test robustness issue") --- lib/libc/tests/stdlib/system_test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index cb6ecdb28065..9e556f257791 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -128,7 +128,7 @@ ATF_TC_BODY(system_concurrent, tc) /* Save the current signal dispositions */ ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigint)); - ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigquit)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigquit)); ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &normset)); /* Spawn threads which block on these files */ @@ -149,10 +149,10 @@ ATF_TC_BODY(system_concurrent, tc) /* Release the locks */ for (int i = 0; i < N; i++) { /* Check the signal dispositions */ - ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); - ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); #ifndef PROCMASK_IS_THREADMASK ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK(sigismember(&sigset, SIGCHLD)); @@ -167,14 +167,14 @@ ATF_TC_BODY(system_concurrent, tc) } /* Check the signal dispositions */ - ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); - ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); - ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); - ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); ATF_CHECK_EQ(sigint.sa_handler, sigact.sa_handler); ATF_CHECK_EQ(sigint.sa_flags, sigact.sa_flags); ATF_CHECK_EQ(0, sigcmpset(&sigint.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK_EQ(0, sigcmpset(&sigset, &normset)); }