From nobody Thu Feb 5 14:45:49 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 4f6Kld5vYTz6QdwT for ; Thu, 05 Feb 2026 14:45:49 +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 4f6Kld3T5Wz3KNT for ; Thu, 05 Feb 2026 14:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302749; 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=S8NdRrQILqi4j8laRASa7van+ZWac740HhPdis+nE6g=; b=oMi63j4x02pEhQGKD40QHb63XuGR+a9PZRlSaJ38k+2fRhPX/6gw9Ccxr/3tkz5/MroX40 zJwDg06NSmNvAll/puzDcgTjXA9idhPI203F0dfoUWCfsFvLlPFL+Bo3iefWETFIeVxv3n aBj8QEVK9FO2GLA4eIZ++9qxcu55HtB3Z2xNyhNbV96T72X7IIHqOwfAkWuDWGZsmfp+OS Pi5aIU51H1OEqiH3HG3J4b4KpZ2PEnD3zJZYFn5YXnc/sDyOQuiHitJUb4biFPo/cflvq6 vKmvuDILr9e+NRsTP7Dq4grdrXEH6K1h7L0r/AH2ffsjuFuip4jDZmiZWGyqtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302749; a=rsa-sha256; cv=none; b=qMMqUUgMB3HdQXtlLVSSthF/MTPLZe7m4YY1fDMHEqY/XESizjQhACHdhJstpwYPAlsBkw XpCsIsjkIj06bXRb61GxYEw5t/oF/yNENpIbtXacChYhxLTbRh0W2v3JtAM9bisNegkh2H yAZHJ50tMzCWNpYat8gZtqdGja9H7fdG+SIYkRXQA0dlMAy604eA7xKiKeZlUTSnOjm2oX TPj9lPtZLpS3wxDJb+/g4Z/hsAVudWuXfR2sjjMdzQbfItv7Ry3HFbh96hny69jjsuH4HX XArGe4X3r6aGgIouf69X9E7FNBwUGFbsrn9TAo+fKVfhUGxPHwJ7qpT9DgaLEA== 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=1770302749; 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=S8NdRrQILqi4j8laRASa7van+ZWac740HhPdis+nE6g=; b=CBXCjFuPhpEz2BfSZMHDl4fw8aFCPf+ZjTjUQy2WKTuO7Xx059Io8m4tc7Y3bcqw9WBYAr GMpAXTZ2jqq0daYNh+RaqU52utdeQzq382wnZroc1xQEDEW5t9/2VcAi7prDInuduFwl/S C8f39AJf1bEwK8vOdvIHq5Jss7UxEfvc+dVnYNNUav9/yRHUWrPYSxenEm6l0e2S31Of8J /IG5/HvM6H9XnpRGxouSvVAJul78DoI7NNl99cNaIHUDHa7YNP8GKgknFUvyzTfP7LsGlt LBgASJkEm6loS8KR7TZkatboStlDJ2Gc8E9KS38WELnJLrdXcxAQEJo8HUe4nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Kld2nfxzZtM for ; Thu, 05 Feb 2026 14:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39760 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 590126789c84 - main - diff: Don't compare a file or directory to itself 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 590126789c841d80655869bc075c8980c173dd1c Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:49 +0000 Message-Id: <6984ad1d.39760.188296e8@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=590126789c841d80655869bc075c8980c173dd1c commit 590126789c841d80655869bc075c8980c173dd1c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:57 +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 --- 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(-) 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, 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; @@ -258,7 +256,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); @@ -315,7 +312,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); @@ -328,6 +324,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); @@ -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 = 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 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, 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 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 } +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 @@ -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 }