From nobody Tue Feb 10 15:36:44 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 4f9Qf52S8vz6RWcS for ; Tue, 10 Feb 2026 15:36:45 +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 4f9Qf50cMpz3HXP for ; Tue, 10 Feb 2026 15:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737805; 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=ikEf3f2YNeojv/N6bWdCHOsvuuEBEHTOw6YciwxHu2g=; b=ADsQYAEO8FvqNLZ6Wn+z/OBALlHXJUibfHC3TRlRlj5eVhH2WYJJwsX5OlyOtZTAyQwX1Q TOqY365+jlVwuLJl9cAOX5KFeOqqcGjwSSrokRYxjaMw1koPuwOILD38+X4IDCL2CDRks3 tsZW2x/var4DOdGDvXlG7Zs+Q214d/jIPERdd8wJu8CwGa09ab9l0vcBOl+TmfetZcXWzY 4/3qDU+6obPynqimECmKyd4V0gc882qdjZktbj53M3fcOGYUa8Ez2rfcHaY2pj7F81DRYL 2msMb5LfIAQ8s46wRv9Q4o/1Odg72f/cYeEon2+WsLoDPiPDH0eNipkUBU7xHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737805; a=rsa-sha256; cv=none; b=xWP07aIVt1hpDLUvlMZ1DcTMUi6tbWtW48se4Ny3ZP7ggI7C3qaWsOuunH4tuSH/Q5x3oN ++lWpc1clpBlhzmL3VNNN9l3SJyFlNtdpenT4NFhI/YELI8/eLabZOWi86WixkrjWw8dOf s7Y/Jj9vkdSmEXQLig6RXVsyJKPJIpx+hFTkyJOiBcZTxNNCXCiEgyL7uojPcABE+d0u8V lkaSd48YbB8H6O1Yt0xEiGDsxLoE2G4BNMw2pW3V66FATSgOjZgCBPtT689yLa+K7lsL/s IxelAk8XR/WoPIBj4n3Q654LDD0O8FgCCPYjRtt7xTRSfKo8ySsLSFVBhUrImQ== 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=1770737805; 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=ikEf3f2YNeojv/N6bWdCHOsvuuEBEHTOw6YciwxHu2g=; b=uPsLhF7a92BNdy6B/0oF3hZcIsddSxIJSgQ8FS0Umfbu/ugZxLiEz8HgHvjRE3JiUfJAPD cbis2uo5rfPwk7nOts9zqyo5PMndbGvetrqEMsJuquicJVLBZ/Qu4rMR+fqlsDq/BNjr// VCVbRnlNh5luIrbm5wNlFfg3OyGJBcpLH/YtOeCV/vgMzNb2Ph8kDlwsRCv/TzPPuPCQYj N2Y01p/mXnysNyUdVeUG7dva2icd1flLIf7CKhVqYMIaUc5dBqsOvafnF/xNLsK9ke5B86 t3Mak/ETQT1AfXviTOixiN1ao89Ik+/koFV5kwbCEehMR9+iLyWE1DV+XHboFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Qf46cM1z1Nbd for ; Tue, 10 Feb 2026 15:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43cff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:36:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 9c99eacbc33b - stable/13 - diff: Don't compare a file or directory to itself 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/13 X-Git-Reftype: branch X-Git-Commit: 9c99eacbc33b357a0f80603b2e17c927a689fa78 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:36:44 +0000 Message-Id: <698b508c.43cff.637d5fb4@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9c99eacbc33b357a0f80603b2e17c927a689fa78 commit 9c99eacbc33b357a0f80603b2e17c927a689fa78 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 15:36:24 +0000 diff: Don't compare a file or directory to itself While here, stop abusing struct dirent for something we don't even need to store. PR: 254455 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55113 (cherry picked from commit 590126789c841d80655869bc075c8980c173dd1c) diff: Fix build rc must be defined first. Fixes: 590126789c84 MFC after: 1 week X-MFC with: 590126789c84 (cherry picked from commit ee44ab936e84bacaa49847d36aabdf280f9fecce) --- usr.bin/diff/diffdir.c | 14 ++++++++------ usr.bin/diff/diffreg.c | 3 +++ usr.bin/diff/tests/diff_test.sh | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 627e5dd9b983..200613927715 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -40,8 +40,6 @@ static int selectfile(const struct dirent *); static void diffit(struct dirent *, char *, size_t, char *, size_t, int); -#define d_status d_type /* we need to store status for -l */ - struct inode { dev_t dev; ino_t ino; @@ -236,6 +234,8 @@ static void diffit(struct dirent *dp, char *path1, size_t plen1, char *path2, size_t plen2, int flags) { + int rc; + flags |= D_HEADER; strlcpy(path1 + plen1, dp->d_name, PATH_MAX - plen1); if (stat(path1, &stb1) != 0) { @@ -260,6 +260,8 @@ diffit(struct dirent *dp, char *path1, size_t plen1, char *path2, size_t plen2, if (stb1.st_mode == 0) stb1.st_mode = stb2.st_mode; + if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino) + return; if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { if (rflag) diffdir(path1, path2, flags); @@ -269,12 +271,12 @@ diffit(struct dirent *dp, char *path1, size_t plen1, char *path2, size_t plen2, return; } if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode)) - dp->d_status = D_SKIPPED1; + rc = D_SKIPPED1; else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode)) - dp->d_status = D_SKIPPED2; + rc = D_SKIPPED2; else - dp->d_status = diffreg(path1, path2, flags, 0); - print_status(dp->d_status, path1, path2, ""); + rc = diffreg(path1, path2, flags, 0); + print_status(rc, path1, path2, ""); } /* diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 78f3569a0ecc..a44c504304e6 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -338,6 +338,9 @@ diffreg(char *file1, char *file2, int flags, int capsicum) goto closem; } + if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino) + goto closem; + if (lflag) pr = start_pr(file1, file2); diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 181463ca9be7..5e1c36d14ed2 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -348,6 +348,24 @@ prleak_body() atf_check diff -rul a b } +same_head() +{ + atf_set "descr" "Don't diff a file or directory with itself" +} +same_body() +{ + local n=256 + 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 @@ -374,4 +392,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 }