src/usr.bin/diff/diffdir.c, branch releng/14.4FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F14.42026-02-11T06:14:30Zdiff: Don't compare a file or directory to itself2026-02-11T06:14:30ZDag-Erling Smørgravdes@FreeBSD.org2026-02-05T14:39:57Zurn:sha1:b4139147bbb7e368316bee86ffac0fdb79319839
While here, stop abusing struct dirent for something we don't even need
to store.
Approved by: re (cperciva)
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)
(cherry picked from commit 7f412c6f88edc3aafb53a83f1743ad49da4679a9)
libc: Rename fscandir{,_b}() to fdscandir{,_b}().2026-02-05T14:47:46ZDag-Erling Smørgravdes@FreeBSD.org2025-06-23T13:02:53Zurn:sha1:35f8b56a41230f5c0853c2e096af72e9e65fa0e5
This seems to fit the pattern better (e.g. fdopendir()).
I've added weak references to ease the transition, but since it's only
been a few days, we can remove them (and the ObsoleteFiles entries for
the manual pages) before we branch stable/15.
Fixes: deeebfdecab5
Sponsored by: Klara, Inc.
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D50980
(cherry picked from commit 0a5b763d98b921f921243525ff25a70bbe00cfaa)
libc: Finish removing fscandir{,_b}().
These only existed for a few days before being renamed, so there's no
reason to continue to carry compatibility shims for them.
Fixes: deeebfdecab5
Sponsored by: Klara, Inc.
Reviewed by: kevans
Differential Revision: https://reviews.freebsd.org/D50981
(cherry picked from commit ccf937320a1a7383a2c33698007b7244f66dc022)
diff: Fix gcc build.2026-02-05T14:47:46ZDag-Erling Smørgravdes@FreeBSD.org2025-06-20T15:30:03Zurn:sha1:c7582d56d29f072b4b18c90569b596d2b37f6b12
Sponsored by: Klara, Inc.
(cherry picked from commit 28d9586cde8dc783f7b698b10c2b564fde14ae74)
diff: Detect loops when diffing directories.2026-02-05T14:47:46ZDag-Erling Smørgravdes@FreeBSD.org2025-06-20T11:10:35Zurn:sha1:e8009e02e967618c58a033ace838561ba3400d38
Sponsored by: Klara, Inc.
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D50936
(cherry picked from commit 42092e1b6625b8226de5f34d22b9a96c713626cb)
Remove $FreeBSD$: one-line .c pattern2023-08-16T17:54:42ZWarner Loshimp@FreeBSD.org2023-08-16T17:54:42Zurn:sha1:1d386b48a555f61cb7325543adbbb5c3f3407a66
Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
diff: fix failed compare when ignoring file case2022-02-18T15:51:38ZTom Jonesthj@FreeBSD.org2022-02-18T15:21:23Zurn:sha1:3931c072c63d5a51d83157009e7f7510e08da80c
With --ignore-file-name-case we need to compare files regardless of
case. We need to propigate both names down to diffit so we can look up
the correct file when the names differ based on case, otherwise we try
to look up the file using the case from the a tree which might not be
discoverable if its case is different in the b tree.
Reviewed by: bapt
Sponsored by: Klara Inc.
Differential Revision: https://reviews.freebsd.org/D34201
diff: add --no-dereference flag2022-02-18T15:17:13ZTom Jonesthj@FreeBSD.org2022-02-18T15:13:13Zurn:sha1:f4be3645a14d4faa5a51846054318ccf77c9cd5e
When diffing files and directories, don't follow symbolic links, instead
compare where the links point to.
Reviewed by: bapt
Sponsored by: Klara Inc.
Differential Revision: https://reviews.freebsd.org/D34203
diff: move functions around and reduce their visibility2021-09-15T23:36:41ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-09-04T23:50:58Zurn:sha1:e43df07e3725ef6d14a2ca635598c18295b1b481
Most of them become static. There will be more such functions added in
upcoming commits, so they would be inconsistent with existing code.
Improve the existing code instead of reinforcing the unwanted pattern.
diff: Import fixes from OpenBSD2018-06-09T21:09:24ZBaptiste Daroussinbapt@FreeBSD.org2018-06-09T21:09:24Zurn:sha1:e620f7fb56fa741b6e8f196979195f3a14b1dddb
original commit log by miller@OpenBSD r1.46:
Fix exit value when diffing directories with missing files and the -N
or -P options are not used. From Ibrahim Khalifa
Fix exit status with -rq when there is a file in one directory but not another,2017-07-17T18:06:42ZEnji Cooperngie@FreeBSD.org2017-07-17T18:06:42Zurn:sha1:2d920b13cbf3fe93b5ed2c4aa4254d24c0fc95bb
i.e., when print_only is called.
Prior to this change, -rq was always returning 0. After this change it will
return 1 if there is a difference between two directories.
This fixes compatibility with GNU diff and unbreaks backwards compatibility
expectations.
Found when trying to extend diff_test:brief_format_test.
MFC after: 2 months
MFC with: r321076, r321077