From nobody Thu Mar 26 07:37:02 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 4fhFwG24w6z6WR1y for ; Thu, 26 Mar 2026 07:37:02 +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 4fhFwG0zj0z3lMd for ; Thu, 26 Mar 2026 07:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774510622; 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=xahODKAxpECmOolYndky8tGzX6wGf0xoXldYfFDRq4U=; b=MGTk0HlMLmScPXBhsV7UWdnrNtdnl5CT0dLO96MTEBRS7uX4fp+1QPupNs9QuQpfu2ey78 1+KIux66zJBcKoR+mjnn1K3d/aeS8xcPBYkS6PwoQJNxwsM1UKguVhJcNUULjSp0BWTEmk 7XMGyRW+wSl+cwjNM5eArr5DR1crltNk0grDT7Mizvo9JTfiVVcH1EOIgR3NwMZ0J5duA8 PjvhxxGFYfcXND4G3cMeyJ67W0c1CUNO6XvDqvaTWGn+pGNas2GV4KtDewcvFG3kSRJPIq Ska2Tpd1TzMx+7LFSvy7IYsvVeY30LQG8F4tsD79C6Yk4CDn9582U6kfPY2aVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774510622; a=rsa-sha256; cv=none; b=UwBSbSvZ9m3sw7MoqWI0bsnkfpgMt3wIwLHSJCBjWHFWDvz+wXcECOtMmGY6pc0934u3BR ZZhhgWKEyWVW0oa/mVhadOLMENVOGv8ndeLuqNPi4Yjj0aeCJPWar3A8WNI17zH3hixKsA vtHQXzJAfR2sSzhOswjXAJlH5b9UMs76vyIX/E9+pq38fYnN0FV/1j5bHkD1iaaTojYjwJ gf3xWaBtuiwUL5zpB9Cnv3aWKStZrJbZkXlQQmNKGg8Darlo3YqR9X/RtJxW+RRwN14wZg T6nAj1eTCpIiiVaHj2K27CVCJLxSVie0deMl1YWBtfbQwKimnIqtlxGt8T65Hg== 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=1774510622; 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=xahODKAxpECmOolYndky8tGzX6wGf0xoXldYfFDRq4U=; b=haGt4ircfBptANgbw5QLqNFrqu77G6AB4+S5xBVaqLV07dkVaSx28YelVsoHQ+kdGmWUPN KDYib53hJfTy5yblX6+8MM3kCa1WmTkrnRXkYkvnvLExP1t409Tg7lmb2sDmNmeSDRtoNi pHVCFgqCV9O6ioIbocFol5cNoWk4MPdqC4IanN/RsG4WWvUHBFFE4Tqi3fIsMIeDvXZnAo W10w4WKT6t9fqyJfr3OW6KFvIRFEKm+eLz8A3w00UxufAH0+XFFbfeaEDhjlLOl19CCSEq lDkwrj7w/H/tpB19i7NIVqZ1oLl5dxUV8XEc07NTxjQts8sKfTu6mv9SXHuUIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhFwG0X2YzjlG for ; Thu, 26 Mar 2026 07:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 07:37:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 6d8b2ac449f3 - main - diff: prefer posix_spawn over pdfork/execl 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d8b2ac449f34423be9d56492022421db61d920e Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 07:37:02 +0000 Message-Id: <69c4e21e.19d87.5319cf6c@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6d8b2ac449f34423be9d56492022421db61d920e commit 6d8b2ac449f34423be9d56492022421db61d920e Author: Baptiste Daroussin AuthorDate: 2026-03-25 10:22:02 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-26 07:36:55 +0000 diff: prefer posix_spawn over pdfork/execl MFC After: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56076 --- usr.bin/diff/pr.c | 62 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index 189e6b34649e..51cf2c765283 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -29,8 +29,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -41,6 +43,8 @@ #define _PATH_PR "/usr/bin/pr" +extern char **environ; + struct pr * start_pr(char *file1, char *file2) { @@ -48,6 +52,9 @@ start_pr(char *file1, char *file2) pid_t pid; char *header; struct pr *pr; + posix_spawn_file_actions_t fa; + posix_spawnattr_t sa; + int error; pr = xcalloc(1, sizeof(*pr)); @@ -56,32 +63,41 @@ start_pr(char *file1, char *file2) fflush(stdout); if (pipe(pfd) == -1) err(2, "pipe"); - switch ((pid = pdfork(&pr->procd, PD_CLOEXEC))) { - case -1: - err(2, "No more processes"); - case 0: - /* child */ - if (pfd[0] != STDIN_FILENO) { - dup2(pfd[0], STDIN_FILENO); - close(pfd[0]); + + if ((error = posix_spawnattr_init(&sa)) != 0) + errc(2, error, "posix_spawnattr_init"); + if ((error = posix_spawn_file_actions_init(&fa)) != 0) + errc(2, error, "posix_spawn_file_actions_init"); + + posix_spawnattr_setprocdescp_np(&sa, &pr->procd, 0); + + if (pfd[0] != STDIN_FILENO) { + posix_spawn_file_actions_adddup2(&fa, pfd[0], STDIN_FILENO); + posix_spawn_file_actions_addclose(&fa, pfd[0]); + } + posix_spawn_file_actions_addclose(&fa, pfd[1]); + + char *argv[] = { __DECONST(char *, _PATH_PR), + __DECONST(char *, "-h"), header, NULL }; + error = posix_spawn(&pid, _PATH_PR, &fa, &sa, argv, environ); + if (error != 0) + errc(2, error, "could not spawn pr"); + + posix_spawn_file_actions_destroy(&fa); + posix_spawnattr_destroy(&sa); + + /* parent */ + if (pfd[1] == STDOUT_FILENO) { + pr->ostdout = STDOUT_FILENO; + } else { + if ((pr->ostdout = dup(STDOUT_FILENO)) < 0 || + dup2(pfd[1], STDOUT_FILENO) < 0) { + err(2, "stdout"); } close(pfd[1]); - execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); - _exit(127); - default: - /* parent */ - if (pfd[1] == STDOUT_FILENO) { - pr->ostdout = STDOUT_FILENO; - } else { - if ((pr->ostdout = dup(STDOUT_FILENO)) < 0 || - dup2(pfd[1], STDOUT_FILENO) < 0) { - err(2, "stdout"); - } - close(pfd[1]); - } - close(pfd[0]); - free(header); } + close(pfd[0]); + free(header); return (pr); }