From nobody Thu Feb 5 14:10:49 2026 X-Original-To: dev-commits-src-all@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 4f6JzG1FnRz6QZhf for ; Thu, 05 Feb 2026 14:10:50 +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 4f6JzF6L6gz49V6 for ; Thu, 05 Feb 2026 14:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770300649; 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=o09/Yq3IhBV5SP12uS6xTHvQpiXSlhRGcbF7cyz+DKQ=; b=cF0X3lN1P3NXX5h9mxWpdSzF5XfWPfjn5zloRaPQGcqBuMmqXsrJ1OqlC2vAnY+AqHQURz y/T7HG+Jdt3S5ikJEvKyvFqSQBEd+5nvVK2zRCEACs00nUFEZO+NM7hc1p+FDLGv+m1fUd iAG532EvcbSVl5yLY3aFFzxvIdsGB0JXiWcu++2BpZY+9W/0ZcYYTDdfIBiPNmMckkX4yh aQI8xv2AcWb5fddcoC62P38Y4Vh4t3Z9FPA3eUTmriTDJ56aj9DqjvAtlRZjCmtS9WvQqP EYZWRBm0qqDoo+63hNa3ihYC8/WgxQPIldsO+7TIQWkZlOmV2Ki2O86fJB04lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770300649; a=rsa-sha256; cv=none; b=xqdHmsZyrDCp5ckA9QvWYii+dfBwFUSnAkpRhPUIFvtBLYA8VzUx3vkQSaUDDeY0s1qq2I ei0S+phhTcNuEG+Zj1Q7H1AzshkLmCKTIu4792ThM22sMvLCuZjBOmH3B561M+ErO/VyzS 2bVoVSoqzG3x/MjHEX097KeGJGyVkzTqkrdP0VN9NHYHDCV3qjTo2gs/b0MHnWrTMYPWnf GvdvuwoIdDIZLYO/VDVJf6BDFXuiHxXr7vaSpY13M04cTQssKjjwvikTxKFU63lDTlQsNx 4Ou00W/AjSg5r3y1VAu+sBnyaCpg4j/m0r9LJB4rUM9Yso1XEdHfSpIkWom/0A== 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=1770300649; 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=o09/Yq3IhBV5SP12uS6xTHvQpiXSlhRGcbF7cyz+DKQ=; b=ln7WNh1Fb/MPeMM1rqJRa0xwaxfwKoD4AZZjSUKS3iyAmHSQyZE6vsIvUEOnOMEjYR+MLi /ciK7+0yB0k37NMr8LtVMcTWWz8zzJgt1x+e9f17liwMGllqx/SH/z7smGEKlo1BrPeKfT MeE5T+o32CTiU5MRakd+2U8Xo7SGeLse8E/xZYbTfoxh/i3ZV6HVl8SN+jC9/OAtEj8t/p c1X1MVq8c4u2OomlQO2i7BtvO0mofCe4ook3arQcIJYE2qJV/wP1Uy1d43yOwNtw1dVXyz hnWDJS4hOR6pEw7Ifi/qagJVYxUVz7RY/h5GeiqOuEkYKQRaK6fMqJKDSPajzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6JzF5bFXzYsS for ; Thu, 05 Feb 2026 14:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3914f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:10:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c47b4439da80 - stable/15 - diff: fix support for -l with new diff algorithm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c47b4439da8072390bafd0f58e38bce85c91e2af Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:10:49 +0000 Message-Id: <6984a4e9.3914f.711daaac@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c47b4439da8072390bafd0f58e38bce85c91e2af commit c47b4439da8072390bafd0f58e38bce85c91e2af Author: Baptiste Daroussin AuthorDate: 2026-02-02 15:43:29 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-05 14:10:44 +0000 diff: fix support for -l with new diff algorithm MFC After: 3 days Reviewed by: des Differential Revision: https://reviews.freebsd.org/D55052 (cherry picked from commit 4d73b07d02d12cdff0558d3ca6c4b3224cae831f) --- usr.bin/diff/diff.c | 1 + usr.bin/diff/diff.h | 1 + usr.bin/diff/diffreg_new.c | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 83aa20c52cf3..1aba09f7a5f7 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -249,6 +249,7 @@ main(int argc, char **argv) usage(); break; case 'l': + dflags |= D_PAGINATION; lflag = true; break; case 'N': diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 74be55db8a33..4bea23db1ab8 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -80,6 +80,7 @@ #define D_STRIPCR 0x400 /* Strip trailing cr */ #define D_SKIPBLANKLINES 0x800 /* Skip blank lines */ #define D_MATCHLAST 0x1000 /* Display last line matching provided regex */ +#define D_PAGINATION 0x2000 /* Paginate via pr(1) */ /* Features supported by new algorithms */ #define D_NEWALGO_FLAGS (D_FORCEASCII | D_PROTOTYPE | D_IGNOREBLANKS) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index f54cd554ccad..d932764bb6da 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -33,6 +33,7 @@ #include #include +#include "pr.h" #include "diff.h" #include #include @@ -146,6 +147,7 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) { char *str1, *str2; FILE *f1, *f2; + struct pr *pr = NULL; struct stat st1, st2; struct diff_input_info info; struct diff_data left = {}, right = {}; @@ -178,6 +180,9 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) f1 = openfile(file1, &str1, &st1); f2 = openfile(file2, &str2, &st2); + if (flags & D_PAGINATION) + pr = start_pr(file1, file2); + if (capsicum) { cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); if (caph_rights_limit(fileno(f1), &rights_ro) < 0) @@ -271,6 +276,8 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) status |= 1; } done: + if (pr != NULL) + stop_pr(pr); diff_result_free(result); diff_data_free(&left); diff_data_free(&right);