summaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.c
Commit message (Collapse)AuthorAgeFilesLines
* diff3: implement --strip-trailing-crPiotr Pawel Stefaniak2021-09-251-1/+8
| | | | (cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
* diff3: improve stylePiotr Pawel Stefaniak2021-09-251-17/+19
| | | | (cherry picked from commit 702dda4368dc2d07e8898fcfdddb12d730e6c174)
* diff3: sync with upstreamPiotr Pawel Stefaniak2021-09-251-6/+15
| | | | | | | | | * 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)Baptiste Daroussin2019-12-171-17/+5
| | | | Notes: svn path=/head/; revision=355854
* Use strtoimax.Baptiste Daroussin2019-12-171-16/+6
| | | | | | | Use existing strtoimax instead of reinventing it Notes: svn path=/head/; revision=355847
* capsicum: use a new capsicum helpers in toolsMariusz Zaborski2018-11-041-3/+3
| | | | | | | Use caph_{rights,ioctls,fcntls}_limit to simplify the code. Notes: svn path=/head/; revision=340138
* Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.Mariusz Zaborski2018-06-191-1/+1
| | | | | | | No functional change intended. Notes: svn path=/head/; revision=335395
* Remove the MAX_CHECK macro, it was initially used to test if a file was aBaptiste Daroussin2017-05-251-2/+0
| | | | | | | | | | text file or not. The check is not done by diff3 but by diff (the argument -a is directly passed to diff(1)) Notes: svn path=/head/; revision=318889
* Import working progress BSD diff3Baptiste Daroussin2017-05-251-0/+787
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 Notes: svn path=/head/; revision=318888