From nobody Tue Feb 10 15:27:40 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 4f9QRd2YlKz6RVNQ for ; Tue, 10 Feb 2026 15:27:41 +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 4f9QRc2xWFz46PF for ; Tue, 10 Feb 2026 15:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737260; 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=xMpwIH/wpLgqFTHfzxM2WLrv9LVXqwBCHb9KeyqI/yc=; b=UzKDzgC5DyelDTuCNPJHILEu5J9jScC+BZrHjlOovAm2XsPC0MKE3rFVZxMew+yoKxgZ+3 fD4TXiUKTfCye+ohk8POsPYWQDmIklvFzlpdaXsDcCmBYFFG78aaDBA53sjuuNBZmQvLgO XsGKz4iCsDjRqq+JiECKBH/SF47nD5ZIIKyT5xjxqsGglkkhmtboIfICi2tk2Gmh6IoXd9 tIJm2ixDZwEX2v4bMU6EV7+DByMmE+KXGXnUxZh/gbVrPC1AEiW9s4oATQrCNAuSnV35FD sxTQRc7XMrOcUKbco3Szv87dl682ncUuT9Xkz9QVicwBVIZCvPBRBYpcqfqgsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737260; a=rsa-sha256; cv=none; b=gNnTWIL46WioIRr8RmhB2LtGlZ8Q5eZFLWnPO9tp/6p76vp+L81LuUUOZ/rdSqwFTmtJDP uPfOR7dmYynCkZS4Ci2AiYdILlBfm8ECUTZVbV2s57mlCNO4NafoC4VRHVvkJ4Cuy/jwdR n5zTBUSCMB3UYvCXspeVnTAOrd+/AU5ZXM2HoEkCkCIC8XMmitROavai1sBf1fJLuXhuhd t1NrL3R+h+6xszbytSZjfg7ZLHPhCkgnjFDih0gN8ns92cB48eN/zxN/smR1RArXr615k+ BVJwE4FJX+y8gxAi/LxZebGr1epjcHnqIXVl7B3V1WPthRYAh2nzMTP9ya0VIg== 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=1770737260; 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=xMpwIH/wpLgqFTHfzxM2WLrv9LVXqwBCHb9KeyqI/yc=; b=xqvCivH9XF3xG7UNq6bNaMmwfWOKp8frfdX6PhnFMSMsE7LIOgGhIzULiI36ct+HoUr4Pp sUt+6yBt/MZMPEq0SPaxX0xLXOfQIYf4JRdY7I364QOepw9fxQH4kOW+0Ygs2RIl/GNc2T wOh8MK9PYycMrpLi0/y3BaGqwCck+Cz2R9V+b4Z33ZUm8ifdq5AHSyCTZR5HEG1SCetnny Zrf3IFOxjgDweqd2QGZSWBI2oUn43Ywl2LY+fWVaOJiclSbcjriBle9V8lJ6OAQVzauhcO stQIXk/ivb4+CfH4vPF4IVzPfUXFVltM5N09FByUkYnQAq9VyHaSxoGslYj/QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QRc1zFJz1NTm for ; Tue, 10 Feb 2026 15:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43cd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:27:40 +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: 5fdcdf4a7ed5 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 5fdcdf4a7ed53bb1e49cd627a0ebeaf3751a7f0b Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:27:40 +0000 Message-Id: <698b4e6c.43cd7.7013c43e@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5fdcdf4a7ed53bb1e49cd627a0ebeaf3751a7f0b commit 5fdcdf4a7ed53bb1e49cd627a0ebeaf3751a7f0b Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:24:08 +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 a55a2bec70ee..0e9beb80e6a1 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; @@ -237,6 +235,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); @@ -258,7 +258,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 +314,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 +326,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 +337,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 }