wireguard-openbsd/usr.bin/diff3, branch master WireGuard implementation for the OpenBSD kernel https://git.zx2c4.com/wireguard-openbsd/atom/usr.bin/diff3?h=master 2020-06-26T07:28:46Z Fix merging of files that lack newlines for diff(3), OpenRCS, and OpenCVS. 2020-06-26T07:28:46Z stsp stsp@openbsd.org 2020-06-26T07:28:46Z urn:sha1:c0c93af82c3cd03bb5d4a2c82b9679eb6f329afe Merges with a file that lacks newlines (\n) were triggering a fatal error. This could be easily reproduced with merge(1) and diff3(1): $ echo foo > foo $ echo bar > bar $ echo -n baz > baz $ merge -p foo bar baz merge: failed to merge $ diff3 -E foo bar baz 1a ======= diff3prog: logic error $ Fix this by properly handling short reads from the third file argument. Only the third file argument triggered the problem. The other input files were already handled correctly. ok millert@ Add where missing and harmonize PATH to be _PATH_DEFPATH (without local nor 2019-09-28T17:30:07Z ajacoutot ajacoutot@openbsd.org 2019-09-28T17:30:07Z urn:sha1:1a49fa34ae3de435d3bc8be7cc75d47be4a71074 X11R6). Suggested by tb@ ok deraadt@ tb@ millert@ I am retiring my old email address; replace it with my OpenBSD one. 2019-01-25T00:19:25Z millert millert@openbsd.org 2019-01-25T00:19:25Z urn:sha1:bf198cc6eba0ca1f6d79f71e8e2243d386241fa8 Using bitwise OR along with two assignments in the conditional of 2016-10-18T21:06:52Z millert millert@openbsd.org 2016-10-18T21:06:52Z urn:sha1:1c690bec2f8d115b6b179bfdda6bafd69d74f740 a while() loop is a trap for the unwary programmer (albeit a clever trap). Break this up into two separate assignments and using boolean OR for clarity. OK otto@ Remove useless n=n assignment in the first parse of a for(). 2016-10-16T13:03:40Z millert millert@openbsd.org 2016-10-16T13:03:40Z urn:sha1:bd1f19946165c11b292eb6916f7c95ca4bd8758d It was already removed from the rcs version by nicm@. Change all tame callers to namechange to pledge(2). 2015-10-09T01:37:06Z deraadt deraadt@openbsd.org 2015-10-09T01:37:06Z urn:sha1:0bd1216cbfac4316d823b5f086842b66ddea2018 tame "stdio rpath" or tame "stdio" suffices for all of these programs. 2015-10-05T13:30:30Z deraadt deraadt@openbsd.org 2015-10-05T13:30:30Z urn:sha1:18cdc26982103640b171cb7ffc6bb8b153c21dc1 fairly easy to audit by running nm and noticing nothing beyond base stdio except for fopen/freopen. Then review all callpaths to those functions, and place the tame() calls. ok sthen Add brackets to clarify assignments that are the result of a test operator. 2015-09-05T09:47:08Z jsg jsg@openbsd.org 2015-09-05T09:47:08Z urn:sha1:d927f21f9c49cae2570fbd60317d0bf7ded5b7dc ok deraadt@ looks correct millert@ jung@ trivial reallocarray() use 2014-12-01T06:36:32Z deraadt deraadt@openbsd.org 2014-12-01T06:36:32Z urn:sha1:5302ee64421bdd32315e1a968606050d16544e0e Include unistd.h as it is the standard location for getopt(). 2013-11-15T22:20:04Z millert millert@openbsd.org 2013-11-15T22:20:04Z urn:sha1:8929f197a799c6eb8f7d836041ad0e26b4b34bc6