From nobody Sun Mar 22 08:05:52 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 4fdplN6khJz6W9DK for ; Sun, 22 Mar 2026 08:05:52 +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 4fdplN62Ftz3YfK for ; Sun, 22 Mar 2026 08:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cLEJuZWe2n2QemnkvQHfPYF35uHk2XanJ4RsZBlIcWU=; b=plrOmG+ADnne+wsi1Ou52UjU0g5SihgEcF7EXX0ydZBJDuyZPwAqIqWLleKoYib/ld6b3U /ro2F9IA47naVKAqchfkED9dW7QYKKAIkkuA8Jb/y8XUDNWHhm+DcCChJyZ3BJ0aW93FLn G1UXmE8GT9xRGRlq6+K+kHqLmf/EIK6DlJaTWBu0GWNV1UWRkJ83r8OhdwBaYRUZkQ5uWm VWDokUunjrsuqwWpefyySry1rRDKQni3KogGjKM68pDzu3GYD3aAvopeXOBzE8w0Dh870w hqVo9KDVy47mIuDjHlz5l7W2mlX2mhtKCqUqPqTIewPqzA2tWDZ7bxt6blRrTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166752; a=rsa-sha256; cv=none; b=v08sqqgveF7tFljg/9CU8jpGNnHHb/C5v3ZTq161EI6e9mGHAi3StZ6sGkDqPCQ/0PicA+ 3kthjWjhR0z5RE9iV/94t2q3JMLZi4O0uraeiP/XoWPxGTQNLq5xHjDsIN0SyXsbJ6V7Tw meOrxQOD3rkQDTIc5wC3JjmVFHCrBEmFR5ffC7CudoWqevAosRzZqOTODQmHPcExbz2ADk 2fSu+CFY0cBR7F2p02BeNZ4hbzIDk+PuuSxlTlQ7Dq4ExkdutMrV42H3RcM5DUxLHgOrYA +s9ZCJZKeg1CIwjZEQwZkypotDNv3Hc/RI3aCnxLpXu3ILNlu3ayvBnvGX5Kkw== 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=1774166752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cLEJuZWe2n2QemnkvQHfPYF35uHk2XanJ4RsZBlIcWU=; b=LD6p9gleDz1/VgJxyuJrXvvpeXubSm/ow5HOxUPUbKSVAW+NgYN0XW4db5Yi/TFrVdtok1 5CapohMQZsQInOi4Fn/bWN9iN+7q1xJnEb5nfIePrV+HJm+hmLkKPeca1+nU3BCJ9RikoT QSIPg3LLxeBwkVqvdFjmaz/KFNp4h5RPBEUBM+HO3Zgob77lsyQHG2DdOHd1f4ZisueV++ kwsEmPGfzmxWxNJRcnwh5nryIYwykFS68dGF1k7Uw0ITfMjoowOM6FeTjnXQkUDIgLGkLS +VbEze78VDtDuhc+B/YacMi/6mudQ8PeIJSYQ8Eh85trNL42LkQ7qkOVZBQv/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplN5H02zqvg for ; Sun, 22 Mar 2026 08:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1beeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 898db3e2978b - stable/15 - diff3: fix diff3 -A 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 898db3e2978b154949fb64dee302cbfe4f10d497 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:52 +0000 Message-Id: <69bfa2e0.1beeb.a38f6eb@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=898db3e2978b154949fb64dee302cbfe4f10d497 commit 898db3e2978b154949fb64dee302cbfe4f10d497 Author: Baptiste Daroussin AuthorDate: 2026-02-13 08:33:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:58 +0000 diff3: fix diff3 -A for cases where file2 differs but file1 and file3 agrees, the code stored the file2 and file3 line numbers in the de[] editing script entries but used them as if they were file1 line numbers. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D55276 (cherry picked from commit 8d442cf32e4fb29fbb85090ac29d32d1e30fd824) --- usr.bin/diff3/diff3.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index d010a0b1d067..4f3239b10625 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -118,6 +118,7 @@ static struct diff *d23; */ static struct diff *de; static char *overlap; +static int *de_delta; /* file1-file3 line number delta per edit */ static int overlapcnt; static FILE *fp[3]; static int cline[3]; /* # of the last-read line in each file (0-2) */ @@ -365,6 +366,7 @@ merge(int m1, int m2) d1 = d13; d2 = d23; j = 0; + int f1f3delta = 0; for (;;) { t1 = (d1 < d13 + m1); @@ -383,6 +385,8 @@ merge(int m1, int m2) } else if (eflag == EFLAG_OVERLAP) { j = edit(d2, dup, j, DIFF_TYPE1); } + f1f3delta += (d1->old.to - d1->old.from) - + (d1->new.to - d1->new.from); d1++; continue; } @@ -394,9 +398,10 @@ merge(int m1, int m2) change(3, &d2->new, false); change(2, &d2->old, false); } else if (Aflag || mflag) { - // XXX-THJ: What does it mean for the second file to differ? - if (eflag == EFLAG_UNMERGED) + if (eflag == EFLAG_UNMERGED) { j = edit(d2, dup, j, DIFF_TYPE2); + de_delta[j] = f1f3delta; + } } d2++; continue; @@ -436,6 +441,8 @@ merge(int m1, int m2) j = edit(d1, dup, j, DIFF_TYPE3); } dup = false; + f1f3delta += (d1->old.to - d1->old.from) - + (d1->new.to - d1->new.from); d1++; d2++; continue; @@ -723,7 +730,7 @@ Ascript(int n) prange(old, deletenew); printrange(fp[2], new); } else { - startmark = new->to - 1; + startmark = new->to - 1 + de_delta[n]; printf("%da\n", startmark); printf("%s %s\n", newmark, f3mark); @@ -811,7 +818,9 @@ mergescript(int i) else if (de[n].type == DIFF_TYPE3 && (old->from == old->to)) { r.from = old->from - 1; r.to = new->from; - } else + } else if (de[n].type == DIFF_TYPE2) + r.to = new->from + de_delta[n]; + else r.to = old->from; printrange(fp[0], &r); @@ -859,7 +868,9 @@ mergescript(int i) exit(EXIT_FAILURE); } - if (old->from == old->to) + if (de[n].type == DIFF_TYPE2) + r.from = new->to + de_delta[n]; + else if (old->from == old->to) r.from = new->to; else r.from = old->to; @@ -870,7 +881,7 @@ mergescript(int i) * additions to this file should have been handled by now. * * If the ranges are the same we need to rewind a line. - * If the new range is 0 length (from == to), we need to use the old + * If the new range is 0 length (from == to), we need to use the new * range. */ new = &de[n-1].new; @@ -879,7 +890,7 @@ mergescript(int i) if (old->from == new->from && old->to == new->to) r.from--; else if (new->from == new->to) - r.from = old->from; + r.from = new->from; r.to = INT_MAX; printrange(fp[2], &r); @@ -891,6 +902,7 @@ increase(void) { struct diff *p; char *q; + int *s; size_t newsz, incr; /* are the memset(3) calls needed? */ @@ -917,6 +929,11 @@ increase(void) err(1, NULL); memset(q + szchanges, 0, incr * 1); overlap = q; + s = reallocarray(de_delta, newsz, sizeof(*s)); + if (s == NULL) + err(1, NULL); + memset(s + szchanges, 0, incr * sizeof(*s)); + de_delta = s; szchanges = newsz; }