From nobody Thu Mar 26 07:37:00 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 4fhFwL5nx8z6WR03 for ; Thu, 26 Mar 2026 07:37:06 +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 4fhFwL2yRMz3lHW for ; Thu, 26 Mar 2026 07:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774510626; 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=FN7BwbwCU8fnHFktuei8bB4JwqAtybaGLwjuhwqpiCQ=; b=jNtnBOfYTpCyFRCR0eECuS6HKiln+EaZkFa/BzIKWe02S3SQEDJJckqzAT+8chyksNIrXF 4zuZH1+jq7pg1Fayk0kpfTlKHUBESUngudIOymbRFJPMwU7IBXNvorohjTYLt4Ieccghwd GVCPwWOvz3Z0orpKdLg+4KBwZdUAXENHSy3Jx39wvP/dVIM8mKE7bhkWLHdtzrgJpHMv3H PYrEGQKzkU1pE9EKAnAGjFeztz8ENLr/9r/8r4d+Q8NiCiUa4Bpg/t3WMx8lQNh7+lpgcp ctIRjo3tSvacj77vSbXN9JCHrc5ADbcIrWO/tVRc5DBKCSEVXHD1usZ+H7oZYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774510626; a=rsa-sha256; cv=none; b=nmnkLJ1RYJEy06wwCtDVg3U0VSkBhEQ0P+WlDB6CNRf0IpSq2t7PDD0qReQD6vamdSBHto fmClhORyrEcHOX9Bg7SpA3NsggH5oeeMxOgLVatgdG4fkhYupPSNkE/7kvutMxzokA/T50 9A7I2MrNj6pLixAIXDO998ao0mH67RrEXa1z8XYyiF4n1LIH1C7mTqXMUPoXpYnXDIO58i OfOvK3pV7i+O2AkFqdKm/VLhM/Q/4KhgFSkMOtouOcx61OThzhyHhZCGiQb46+y0stktiP w6T3Hy8LMiUFLeQzKsvIeREE7KN/galHY+A7v30WdI9ipyM9OPj9nDBZAUcxbQ== 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=1774510626; 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=FN7BwbwCU8fnHFktuei8bB4JwqAtybaGLwjuhwqpiCQ=; b=JRn3Mf7acR92oHMBcFrgzjnL6Aj3QPfzY5p5tDByvSW9HbRrf18i8a5FsYtiae5o+xRQaS ELHku5mnuXDiEpOoNkgZu4C2W97GgQ/xbbQgulRC/8KrI3BbeMDbnRDNYtwsMsDV11irJ9 Ho5MYC3Q4amlNAgHU+OYVWqZf6sOSWbroixF71vSpcOJ9ymgKY5TQsuwarmHjxT/XVIUBz pwFRQEGL2gs7LPOaOoYhZSFhHWLmhxvF4zKvV8+xp8jPiNK+/2qaJB8k/BU5FxOUou4avR JHD1/elOJ0EFwaUAsA3P0bQmQDuYSXMEedVLzh8g+YOR5vQ6rTLhsEgjFoqu1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhFwL1ybXzjlH for ; Thu, 26 Mar 2026 07:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47ed5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 07:37:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5f7f0efe8e13 - main - diff3: prefer posix_spawn over pdfork/execlp 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: 5f7f0efe8e13247fc80a2a739e757f73a5d7ebda Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 07:37:00 +0000 Message-Id: <69c4e21c.47ed5.35a98634@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7f0efe8e13247fc80a2a739e757f73a5d7ebda commit 5f7f0efe8e13247fc80a2a739e757f73a5d7ebda Author: Baptiste Daroussin AuthorDate: 2026-03-25 10:08:58 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-26 07:36:55 +0000 diff3: prefer posix_spawn over pdfork/execlp MFC After: 1 week Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56075 --- usr.bin/diff3/diff3.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index d85a5da94b10..75e8c6297855 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -73,14 +73,17 @@ #include #include #include +#include #include #include #include +#include #include #include #include #include +extern char **environ; /* * "from" is first in range of changed lines; "to" is last+1 * from=to=line after point of insertion for added lines. @@ -301,23 +304,30 @@ readin(int fd, struct diff **dd) } static int -diffexec(const char *diffprog, char **diffargv, int fd[]) +diffexec(char **diffargv, int fd[]) { - int pd; - - switch (pdfork(&pd, PD_CLOEXEC)) { - case 0: - close(fd[0]); - if (dup2(fd[1], STDOUT_FILENO) == -1) - err(2, "child could not duplicate descriptor"); - close(fd[1]); - execvp(diffprog, diffargv); - err(2, "could not execute diff: %s", diffprog); - break; - case -1: - err(2, "could not fork"); - break; - } + posix_spawnattr_t sa; + posix_spawn_file_actions_t fa; + pid_t pid; + int pd, error; + + 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, &pd, 0); + + posix_spawn_file_actions_addclose(&fa, fd[0]); + posix_spawn_file_actions_adddup2(&fa, fd[1], STDOUT_FILENO); + posix_spawn_file_actions_addclose(&fa, fd[1]); + + error = posix_spawn(&pid, diffargv[0], &fa, &sa, diffargv, environ); + if (error != 0) + errc(2, error, "could not spawn diff"); + + posix_spawn_file_actions_destroy(&fa); + posix_spawnattr_destroy(&sa); close(fd[1]); return (pd); } @@ -1004,7 +1014,7 @@ main(int argc, char **argv) eflag = EFLAG_OVERLAP; break; case DIFFPROG_OPT: - diffprog = optarg; + diffargv[0] = optarg; break; case STRIPCR_OPT: strip_cr = 1; @@ -1079,13 +1089,14 @@ main(int argc, char **argv) if (pipe(fd23)) err(2, "pipe"); + diffargv[diffargc] = file1; diffargv[diffargc + 1] = file3; diffargv[diffargc + 2] = NULL; - pd13 = diffexec(diffprog, diffargv, fd13); + pd13 = diffexec(diffargv, fd13); diffargv[diffargc] = file2; - pd23 = diffexec(diffprog, diffargv, fd23); + pd23 = diffexec(diffargv, fd23); caph_cache_catpages(); if (caph_enter() < 0)