src/contrib/diff, branch main

Retire GNU diff3

2026-02-22T01:53:19Z

We added the option to build BSD diff3 in commit 2201f7c49f11 ("Build BSD diff3 if GNU diff3 is disabled.") and made it the default in 4d5c434ed16e ("diff3: use bsd diff3 by default") after resolving deficiencies relative to GNU diff3. Thus, we can now remove the GNU diff3 build infrastructure and source. Reviewed by: bapt, ziaee Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46878

diff3: Use a format string to quiet a compiler warning

2026-02-13T20:19:58Z

And bump WARNS to 2

diff3: Use logical-not, not bitwise for booleans

2025-11-18T18:53:24Z

And compare impcompat != 0 as it's actually an integer incremented on each use of one of the AeExX3 options. Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53808

diff3: Remove bespoke getopt.h

2025-11-18T13:42:36Z

diff3's getopt.h included a function declaration without a prototype, which produces a compiler warning. Just remove the bespoke getopt.h and use the system header. Reported by: Mark Millard Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53802

contrib: Remove various $FreeBSD$ tags not upstream

2024-05-31T19:49:17Z

gnu diff3: apply patch to committed src, rather than at build time

2022-11-14T02:33:40Z

This appears to be a leftover from the time we used a less-capable VCS. Reviewed by: delphij MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37368

Fix macro-redefined warning in gnu/diff for fputc_unlocked

2021-01-19T21:23:25Z

While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update the other macros that are defined in stdio.h.

Fix the wrong format, format specifies type 'int' but the argument has type

2015-06-01T06:14:17Z

'long', it was spotted by clang. Differential Revision: D2663 Reviewed by: imp, rodrigc

Convert texinfo to mdoc(7) using texi2mdoc

2015-03-02T11:48:00Z

Fix a cut and paste error.

2014-01-05T23:28:03Z

PR: docs/184791 Submitted by: Jamie Landeg Jones MFC after: 3 days