From nobody Thu Feb 5 15:42:56 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 4f6M1c0t3kz6Qlrc; Thu, 05 Feb 2026 15:43:00 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6M1b5Rsfz3gxD; Thu, 05 Feb 2026 15:42:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003b.ext.cloudfilter.net ([10.228.9.157]) by cmsmtp with ESMTPS id nuD1vmhD6APFJo1VSvWQiR; Thu, 05 Feb 2026 15:42:58 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id o1VRvMmghRXCAo1VRvDpup; Thu, 05 Feb 2026 15:42:58 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=CNonnBrD c=1 sm=1 tr=0 ts=6984ba82 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=HzLeVaNsDn8A:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=vURbuoDfOrpi-_PoOWEA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A76EFE89; Thu, 05 Feb 2026 07:42:56 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A1B2C715; Thu, 05 Feb 2026 07:42:56 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: A FreeBSD User cc: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 590126789c84 - main - diff: Don't compare a file or directory to itself In-reply-to: <20260205162739.132689b5@thor.sb211.local> References: <6984ad1d.39760.188296e8@gitrepo.freebsd.org> <20260205162739.132689b5@thor.sb211.local> Comments: In-reply-to A FreeBSD User message dated "Thu, 05 Feb 2026 16:38:50 +0100." 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=us-ascii Date: Thu, 05 Feb 2026 07:42:56 -0800 Message-Id: <20260205154256.A1B2C715@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOwH5NYKxsgQ1xe65b00TelEtDU1N5aPK9AG7NqV/YZvbDiz8UhMZAm44Q6zKN2s8kySUF7F+7AswJ2pfQtkBsldnG4o5/I0WZO2Wrst15vEhQdlAnQr AiR9/6DWigTWnYQtUhJEihmRqRVtddRuZE+rxvIdd3E5etCbmEwnE25f6s424bh1FfsFOuwNGu5JjYvlEku/D/ydU8Jt/pt64pRwlXJQo4xWSLebZ+oP3LY+ dUvnTzSQO6Z65SLh2tdLbwHkLyq5410/CRc1Ak/vJcJ5IVjns0EbIg/exsbHx7C6hhouwtxVAd0ErklBO+FwzvgRRl3LSHtw/DD4CmHofIuklK59DOJedmt8 myd66hZr X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4f6M1b5Rsfz3gxD X-Spamd-Bar: ---- In message <20260205162739.132689b5@thor.sb211.local>, A FreeBSD User writes: > --Sig_/1e1plY84Qqzw2sr1atKsDpr > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: quoted-printable > > Am Tage des Herren Thu, 05 Feb 2026 14:45:49 +0000 > Dag-Erling Sm=C3=B8rgrav schrieb: > > > The branch main has been updated by des: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D590126789c841d80655869bc07= > 5c8980c173dd1c > >=20 > > commit 590126789c841d80655869bc075c8980c173dd1c > > Author: Dag-Erling Sm=C3=B8rgrav > > AuthorDate: 2026-02-05 14:39:57 +0000 > > Commit: Dag-Erling Sm=C3=B8rgrav > > CommitDate: 2026-02-05 14:39:57 +0000 > >=20 > > diff: Don't compare a file or directory to itself > > =20 > > While here, stop abusing struct dirent for something we don't even ne= > ed > > to store. > > =20 > > PR: 254455 > > MFC after: 1 week > > Sponsored by: Klara, Inc. > > Reviewed by: thj, kevans > > Differential Revision: https://reviews.freebsd.org/D55113 > > --- > > usr.bin/diff/diffdir.c | 14 ++++++-------- > > usr.bin/diff/diffreg.c | 3 +++ > > usr.bin/diff/tests/diff_test.sh | 19 +++++++++++++++++++ > > 3 files changed, 28 insertions(+), 8 deletions(-) > >=20 > > diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c > > index a55a2bec70ee..bd8ef73e785a 100644 > > --- a/usr.bin/diff/diffdir.c > > +++ b/usr.bin/diff/diffdir.c > > @@ -41,8 +41,6 @@ static void diffit(struct dirent *, char *, size_t, str= > uct dirent *, > > char *, size_t, int); > > static void print_only(const char *, size_t, const char *); > > =20 > > -#define d_status d_type /* we need to store status for -l */ > > - > > struct inode { > > dev_t dev; > > ino_t ino; > > @@ -258,7 +256,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = > struct dirent *dp2, > > flags |=3D D_EMPTY1; > > memset(&stb1, 0, sizeof(stb1)); > > } > > - > > if (lstat(path2, &stb2) !=3D 0) { > > if (!Nflag || errno !=3D ENOENT) { > > warn("%s", path2); > > @@ -315,7 +312,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = > struct dirent *dp2, > > flags |=3D D_EMPTY1; > > memset(&stb1, 0, sizeof(stb1)); > > } > > - > > if (stat(path2, &stb2) !=3D 0) { > > if (!Nflag || errno !=3D ENOENT) { > > warn("%s", path2); > > @@ -328,6 +324,8 @@ diffit(struct dirent *dp, char *path1, size_t plen1, = > struct dirent *dp2, > > if (stb1.st_mode =3D=3D 0) > > stb1.st_mode =3D stb2.st_mode; > > } > > + if (stb1.st_dev =3D=3D stb2.st_dev && stb1.st_ino =3D=3D stb2.st_ino) > > + return; > > if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { > > if (rflag) > > diffdir(path1, path2, flags); > > @@ -337,12 +335,12 @@ diffit(struct dirent *dp, char *path1, size_t plen1= > , struct dirent > > *dp2, return; > > } > > if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode)) > > - dp->d_status =3D D_SKIPPED1; > > + rc =3D D_SKIPPED1; > > else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode)) > > - dp->d_status =3D D_SKIPPED2; > > + rc =3D D_SKIPPED2; > > else > > - dp->d_status =3D diffreg(path1, path2, flags, 0); > > - print_status(dp->d_status, path1, path2, ""); > > + rc =3D diffreg(path1, path2, flags, 0); > > + print_status(rc, path1, path2, ""); > > } > > =20 > > /* > > diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c > > index 91ae5ee6591a..95c724817ede 100644 > > --- a/usr.bin/diff/diffreg.c > > +++ b/usr.bin/diff/diffreg.c > > @@ -372,6 +372,9 @@ diffreg_stone(char *file1, char *file2, int flags, in= > t capsicum) > > goto closem; > > } > > =20 > > + if (stb1.st_dev =3D=3D stb2.st_dev && stb1.st_ino =3D=3D stb2.st_ino) > > + goto closem; > > + > > if (lflag) > > pr =3D start_pr(file1, file2); > > =20 > > diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_te= > st.sh > > index a3f76602cf37..0c8147c7ed18 100755 > > --- a/usr.bin/diff/tests/diff_test.sh > > +++ b/usr.bin/diff/tests/diff_test.sh > > @@ -432,6 +432,24 @@ prleak_body() > > atf_check diff -Astone -rul a b > > } > > =20 > > +same_head() > > +{ > > + atf_set "descr" "Don't diff a file or directory with itself" > > +} > > +same_body() > > +{ > > + local n=3D256 > > + mkdir a > > + for hi in $(jot -w%02x $n 0) ; do > > + mkdir a/$hi > > + for lo in $(jot -w%02x $n 0) ; do > > + echo "$hi$lo" >a/$hi/$lo > > + done > > + done > > + ln -s a b > > + atf_check timeout 1s diff -rqs a b > > +} > > + > > atf_init_test_cases() > > { > > atf_add_test_case simple > > @@ -462,4 +480,5 @@ atf_init_test_cases() > > atf_add_test_case bigc > > atf_add_test_case bigu > > atf_add_test_case prleak > > + atf_add_test_case same > > } > >=20 > Buildworld seems to fail with newly added diff code: > > [...] > --- all_subdir_usr.bin --- > 342 | rc =3D diffreg(path1, path2, flags, 0); > | ^ > /usr/src/usr.bin/diff/diffdir.c:343:15: error: use of undeclared identifier= > 'rc' > 343 | print_status(rc, path1, path2, ""); ee44ab936e84 just fixed this. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0