From nobody Thu Feb 5 14:10:48 2026 X-Original-To: dev-commits-src-branches@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 4f6JzD5phFz6QbYr for ; Thu, 05 Feb 2026 14:10:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6JzD5G86z49Nw for ; Thu, 05 Feb 2026 14:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770300648; 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=U+SFf6oW7TJaSmLMHxWwvU6XKMYPRVQO76LaYdSdcnc=; b=DrDeVgtIWv/U9OmOv7i3oFd47G/7Vs29/rvVxe2mpjwVZbve5PdUsbyO5/OeZPBNJmeWb2 uXhCqV+teFxQcX9oHE0oJkfMmDEYy48455XaiQd/P9Moa2xP0XDVK1fU1e3dI7Xrn1GcZ1 bSQDb1EfuU8R3XIwGdYrt4qs/ba58Ljn3MZeL0mzdUCm4rReYHBQ8NIZoDMbLVgCRK7UV/ 55uBEtxYPUwj/iDWI9Cu8nipToHdyZgnwTHwYhIJx5lF3G7lKfW0JeRnAJH9tIIVPgAD1r GgbHdLql72CYbOt6+qqf2kpemq08BYStf7W4dfBEmB5lvQ/uuz5dGMii4z05VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770300648; a=rsa-sha256; cv=none; b=i7qvFWuKwRJ6Yw2nxrqdLyP1s8FO8//mBUmfmEnoVUAGyrgrFbF++epMc8i6DHPB0whQpU 8kgZt1FSYZuWuczbMK1MLd+r35zcSevTsm/2JdHG0vLmSsHBZ/P1/e7ns/HuOfmS0S51ir hLPfUcmkfKF5hLthPLBJ8Uh+1H445zRFu3jRwVcQdcQI+h7Hv+EUmRUeplLFBp7SCpyaFL 0zPlpyVQifdOe7PA3UY+BJ2GTdj+4GjqKhxZDUA3VLxbgBgs43LQP/qNSRfraYJhPLKB8P gEHKW+xLYYhNqRDPy8a9eGeP5+22/3l1IvV/tuQdqS7tOYsv2YlpvogkF95BHQ== 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=1770300648; 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=U+SFf6oW7TJaSmLMHxWwvU6XKMYPRVQO76LaYdSdcnc=; b=ItQQ5bvGKM6FTnggmxspVuO6vgGACd1x5CyWf5XlRyGJFNW9v6yerI7Ldp08QGMuG78F/A tx8uY4BxG3//dbL2GxcYIJM4sBMebIkxoKOz70gi4plTNEKf72SotNZ5a/EHx5LS0+k0RF 6dz4eiLErTKE+t7cN/0IFwCDF++U9aEzCEFPpESmh2aSIfv20EQJxbCiyHvw5ia0gupNLr ssN+oogHYA6tsCr1dpgiCnV3GAzCSFW6CdIfziakAjemUdcNrFPZIEqmQw6+kTWh3jcLQr 5LEvSPcye/w/GC4oSMGb8tgDZYuK4l53LsPTZSltt8T50mrPX0koFJw0XKLubA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6JzD4pd8zZ1l for ; Thu, 05 Feb 2026 14:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38f25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:10:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a3cb42ca632d - stable/15 - diff: use pdwait(2) instead of homemade one List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: a3cb42ca632d674b76dc6c880d57d4980746477e Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:10:48 +0000 Message-Id: <6984a4e8.38f25.18aebd92@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a3cb42ca632d674b76dc6c880d57d4980746477e commit a3cb42ca632d674b76dc6c880d57d4980746477e Author: Baptiste Daroussin AuthorDate: 2026-02-02 15:44:34 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-05 14:10:44 +0000 diff: use pdwait(2) instead of homemade one MFC After: 3 days Reviewed by: des Differential Revision: https://reviews.freebsd.org/D55053 (cherry picked from commit 0ec58e7c2e533a15eabfe8dca4a14e9ae93de4b5) --- usr.bin/diff/pr.c | 19 ++++++------------- usr.bin/diff/pr.h | 3 +-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index c3ea280073af..f254fbab28b7 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include @@ -72,7 +73,7 @@ start_pr(char *file1, char *file2) execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); _exit(127); default: - + pr->pidfd = pr_pd; /* parent */ if (pfd[1] != STDOUT_FILENO) { pr->ostdout = dup(STDOUT_FILENO); @@ -82,14 +83,6 @@ start_pr(char *file1, char *file2) close(pfd[0]); rewind(stdout); free(header); - pr->kq = kqueue(); - if (pr->kq == -1) - err(2, "kqueue"); - pr->e = xmalloc(sizeof(struct kevent)); - EV_SET(pr->e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, - NULL); - if (kevent(pr->kq, pr->e, 1, NULL, 0, NULL) == -1) - err(2, "kevent"); } return (pr); } @@ -109,10 +102,10 @@ stop_pr(struct pr *pr) dup2(pr->ostdout, STDOUT_FILENO); close(pr->ostdout); } - if (kevent(pr->kq, NULL, 0, pr->e, 1, NULL) == -1) - err(2, "kevent"); - wstatus = pr->e[0].data; - close(pr->kq); + while (pdwait(pr->pidfd, &wstatus, WEXITED, NULL, NULL) == -1) { + if (errno != EINTR) + err(2, "pdwait"); + } free(pr); if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) errx(2, "pr exited abnormally"); diff --git a/usr.bin/diff/pr.h b/usr.bin/diff/pr.h index 2ff5949f282f..80f20ca7c329 100644 --- a/usr.bin/diff/pr.h +++ b/usr.bin/diff/pr.h @@ -28,8 +28,7 @@ struct pr { int ostdout; - int kq; - struct kevent *e; + int pidfd; }; struct pr *start_pr(char *file1, char *file2);