src/usr.bin/diff3/diff3.c, branch releng/13.4FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F13.42023-08-23T17:43:26ZRemove $FreeBSD$: one-line .c pattern2023-08-23T17:43:26ZWarner Loshimp@FreeBSD.org2023-08-22T01:31:41Zurn:sha1:3d497e17ebd33fe0f58d773e35ab994d750258d6
Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
Similar commit in main:
(cherry picked from commit 1d386b48a555)
diff3: implement --strip-trailing-cr2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-21T00:28:58Zurn:sha1:dbabfd7e26763ac295ed0ee8bc77f3f3b58b6d03
(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
diff3: improve style2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-20T21:50:20Zurn:sha1:216bf478e24702ddfb310f27da0a51a81c822ed6
(cherry picked from commit 702dda4368dc2d07e8898fcfdddb12d730e6c174)
diff3: sync with upstream2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-20T21:35:24Zurn:sha1:4bfbc5fbc93bec4f1098b7c7174411ec92404cb0
* replace realloc calls with reallocarray calls
* fix merging of files that lack newlines
Obtained from: OpenBSD
(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7359cc206ba61)
Replace homemade getline(3) by actual getline(3)2019-12-17T11:03:32ZBaptiste Daroussinbapt@FreeBSD.org2019-12-17T11:03:32Zurn:sha1:94678ee678338db8b61218a847d43e902f7e5311Use strtoimax.2019-12-17T09:13:48ZBaptiste Daroussinbapt@FreeBSD.org2019-12-17T09:13:48Zurn:sha1:9520071f7e2e3eb910dfe08a1f46e50a96c403c4
Use existing strtoimax instead of reinventing it
capsicum: use a new capsicum helpers in tools2018-11-04T19:24:49ZMariusz Zaborskioshogbo@FreeBSD.org2018-11-04T19:24:49Zurn:sha1:377421df9690cddad7f0c8cba84bd392e62a3b6c
Use caph_{rights,ioctls,fcntls}_limit to simplify the code.
Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.2018-06-19T23:43:14ZMariusz Zaborskioshogbo@FreeBSD.org2018-06-19T23:43:14Zurn:sha1:7672a0148f79063eac8f8e0beb0db5350d02d5d4
No functional change intended.
Remove the MAX_CHECK macro, it was initially used to test if a file was a2017-05-25T17:55:40ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T17:55:40Zurn:sha1:433115a0a49e9f26ef51c1906ca0c04bc8270248
text file or not.
The check is not done by diff3 but by diff (the argument -a is directly passed
to diff(1))
Import working progress BSD diff32017-05-25T17:45:50ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T17:45:50Zurn:sha1:e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f
import bsd diff3 from OpenBSD.
Differences with OpenBSD:
- lots of warning fixed
- no shell wrapper with diff3 actually living in libexec
- capsicumized
Keep it disconnected as it is not yet good enough to replace GNU diff
The motivation to import it now it to allow other people to jump in and also to
have an open development on it
Obtained from: OpenBSD