From nobody Tue Feb 10 15:27:53 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 4f9QRt4FJQz6RVmx for ; Tue, 10 Feb 2026 15:27:54 +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 4f9QRs4HmNz46s2 for ; Tue, 10 Feb 2026 15:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737273; 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=PLz/zJNh6TwWgMADxUm3aqXPK9xjbYafgX+6j7250Yw=; b=g8U6VqPXws9hQpLJDsolfpsMIHW+iz/hZabLj0RHRwuBQPbRDLmhxLekUzfOw2Jq5Al65a VbZZ8zXei52UeSN/tQaYhNz2JvbAZIkSxxgucJBsMPCcsS3I/YqxDxqTat53cmfFWHhKQy g2I2l7Ens6eONtQcEnvTyKrw1jemlEytn8Im25lNp3FcHyAd/CqCde8E0H8gbT7IpRiLby xW+Vy0Rgp2A45QvLKdFmnNlz3IL51URyaR+STfYAJoa6KCBuMpHIGeJ4RjMmZR3pffK9f1 bepIok/8obTViVaLNkRmrwPyIBnYiNdVBk51gHnJXbbiGgX9wtuhmiK8Nz1XfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737273; a=rsa-sha256; cv=none; b=plZvIMAOrADJk0bp95XpvfgSjswwlHPFACaK9YE9XOLNNHdsEFPqPY/zZFNYvpkM6gAhMs uOVpoqO6nmShkrmzVg/C6UZErks6QtcWsYmYutYErFthoM4KQsVIPdWuORoamcHPsC+FoB 32o92jcNzbi6GdNmXXSypiFd1T9V12i3H82lX2YHE+h3BaApJ9KKQl2vEsO2bL/FTENosd CKQOXr9kZte6nilFPSuX+TAWTV/z5XkYBk71HWFHppEo3wDagX/OGaKpHQ3u1+n3bFmusN W58hBx39IQluzq67oIAyEuOqgj4DhtgcWWjS5BuujqvemPUCbNasng5IqtrwXA== 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=1770737273; 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=PLz/zJNh6TwWgMADxUm3aqXPK9xjbYafgX+6j7250Yw=; b=WG7VOIfq/WzCuRAKnu6PfPHmPFleSQ8hO5UfIRsIw+ECnyE8ELtIhXvPoRSOkpPSkTzlme F5+zNWutcTqzazSQeOHJU+PO3vPnsQX1ZNCgyMwFpqON7wfZDNumHBZutf5se2OXH3Ry6o 9H64HpFqWmO6E8YESWcn9LPNnW+m7USqOEWLo+tyYSmiZJMDEDmnc/Vu1tQ3Nr2T1E/jwr E9qyP8f6/a1f1EtLjU59doQepnQvUpGk4P4xtDJIxsLuePNc2u/y14cvMDosyhI1POiuxj b5pp+9Vt90h8Txiouo0ePWFgqWsVICSc0blen0tK87MDtYYXyOD0M9RSEA65+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QRs2xJGz1N1r for ; Tue, 10 Feb 2026 15:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44e1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:27:53 +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: 7f412c6f88ed - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 7f412c6f88edc3aafb53a83f1743ad49da4679a9 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:27:53 +0000 Message-Id: <698b4e79.44e1b.4f933b3e@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7f412c6f88edc3aafb53a83f1743ad49da4679a9 commit 7f412c6f88edc3aafb53a83f1743ad49da4679a9 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:24:19 +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 | 16 ++++++++-------- usr.bin/diff/diffreg.c | 3 +++ usr.bin/diff/tests/diff_test.sh | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 9ca9b5e1774e..7ea07645d751 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -42,8 +42,6 @@ static void diffit(struct dirent *, char *, size_t, struct dirent *, char *, size_t, int); static void print_only(const char *, size_t, const char *); -#define d_status d_type /* we need to store status for -l */ - struct inode { dev_t dev; ino_t ino; @@ -238,6 +236,8 @@ static void diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, char *path2, size_t plen2, int flags) { + int rc; + flags |= D_HEADER; strlcpy(path1 + plen1, dp->d_name, PATH_MAX - plen1); @@ -259,7 +259,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, flags |= D_EMPTY1; memset(&stb1, 0, sizeof(stb1)); } - if (lstat(path2, &stb2) != 0) { if (!Nflag || errno != ENOENT) { warn("%s", path2); @@ -316,7 +315,6 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, flags |= D_EMPTY1; memset(&stb1, 0, sizeof(stb1)); } - if (stat(path2, &stb2) != 0) { if (!Nflag || errno != ENOENT) { warn("%s", path2); @@ -329,6 +327,8 @@ diffit(struct dirent *dp, char *path1, size_t plen1, struct dirent *dp2, 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); @@ -338,12 +338,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 = 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 d4d7d6e1c9d7..954e0542b576 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -347,6 +347,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 b499bb709cdd..d28eeba9604d 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -423,6 +423,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 @@ -453,4 +471,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 }