src/usr.bin/diff3, branch mainFreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=main2026-03-28T08:51:48Zdiff3: set O_CLOEXEC on pipes2026-03-28T08:51:48ZBaptiste Daroussinbapt@FreeBSD.org2026-03-28T08:41:47Zurn:sha1:945e60e018c287f8097f3ee4a30ccf4921845aa1
This avoid leaking pipe fd in children and simplifies the code
MFC After: 1 week
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D56120
diff3: plug fd leak2026-03-26T07:40:29ZBaptiste Daroussinbapt@FreeBSD.org2026-03-26T07:40:29Zurn:sha1:33424fd50ee0333bc6f70b5b14a270b85e5b5de1
MFC After: 1 week
Reported by: kib
diff3: prefer posix_spawn over pdfork/execlp2026-03-26T07:36:55ZBaptiste Daroussinbapt@FreeBSD.org2026-03-25T10:08:58Zurn:sha1:5f7f0efe8e13247fc80a2a739e757f73a5d7ebda
MFC After: 1 week
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D56075
diff3: Add SPDX-License-Identifier tag2026-03-03T19:43:21ZTuukka Pasanentuukka.pasanen@ilmi.fi2026-02-12T09:27:34Zurn:sha1:5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9
Reviewed by: bapt
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D55462
diff3: Produce correct exit status2026-03-02T08:52:06ZDag-Erling Smørgravdes@FreeBSD.org2026-03-02T08:52:06Zurn:sha1:fe5341287c6c9bacc18879b25ed72ceb42e1c811
Use exit status 2 for errors, 1 only to indicate that differences were
found between the inputs (in some operating modes).
MFC after: 1 week
Sponsored by: Klara, Inc.
Reviewed by: ngie, bapt
Differential Revision: https://reviews.freebsd.org/D55608
diff3: bump version to the date when the GNU diff3 compat was reached2026-03-01T11:37:24ZBaptiste Daroussinbapt@FreeBSD.org2026-03-01T11:37:24Zurn:sha1:5ddfd1db271cc675997a942da599c342ccb53afadiff3: Code cleanup2026-02-28T18:15:23ZDag-Erling Smørgravdes@FreeBSD.org2026-02-28T18:15:23Zurn:sha1:c2dee7786bf32cb66cedec226e42e79e06457c51
* Order includes.
* Turn the diff type into an enum.
* Turn an unreachable error message into an assertion.
* Remove unused debugging code.
* Remove some dead assignments.
* Consistently use 1 instead of EXIT_FAILURE.
* Turn a return from main() into an exit().
MFC after: 1 week
Sponsored by: Klara, Inc.
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D55517
diff3: add 3 missing files from the testsuite2026-02-13T19:26:02ZBaptiste Daroussinbapt@FreeBSD.org2026-02-13T17:45:39Zurn:sha1:284a0aa96eb63f12831a9e06514a50b2cd80957f
Fixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b
diff3: fix merge mode2026-02-13T17:36:42ZBaptiste Daroussinbapt@FreeBSD.org2026-02-13T16:10:44Zurn:sha1:2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b
Make the merge mode compatible with GNU diff3
Add tests for all the changes, those tests are extracted from the
etcupdate testsuite.
This version passes the etcupdate testsuite and the diffutils diff3
test suite.
MFC After: 1 week
diff3: fix diff3 -A2026-02-13T09:34:15ZBaptiste Daroussinbapt@FreeBSD.org2026-02-13T08:33:17Zurn:sha1:8d442cf32e4fb29fbb85090ac29d32d1e30fd824
for cases where file2 differs but file1 and file3 agrees, the code
stored the file2 and file3 line numbers in the de[] editing script
entries but used them as if they were file1 line numbers.
Reviewed by: thj
Differential Revision: https://reviews.freebsd.org/D55276