diff3: document and test -T(cherry picked from commit 9f7a81b133c715f649136dcd0ad004e4180c56c9)
diff3: implement --strip-trailing-cr(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
diff3.1: update manual page to match code(cherry picked from commit e8ff95356ceaaa941251056e9d0a4211bf428e06)
diff3: improve style(cherry picked from commit 702dda4368dc2d07e8898fcfdddb12d730e6c174)
diff3: sync with upstream * replace realloc calls with reallocarray calls * fix merging of files that lack newlinesObtained from: OpenBSD(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7
diff3: sync with upstream * replace realloc calls with reallocarray calls * fix merging of files that lack newlinesObtained from: OpenBSD(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7359cc206ba61)
show more ...
Replace homemade getline(3) by actual getline(3)
Use strtoimax.Use existing strtoimax instead of reinventing it
capsicum: use a new capsicum helpers in toolsUse caph_{rights,ioctls,fcntls}_limit to simplify the code.
Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.No functional change intended.
DIRDEPS_BUILD: Connect new directories.Sponsored by: Dell EMC Isilon
Add HAS_TESTS to all Makefiles that are currently using the`SUBDIR.${MK_TESTS}+= tests` idiom.This is a follow up to r321912.
Convert traditional ${MK_TESTS} conditional idiom for including testdirectories to SUBDIR.${MK_TESTS} idiomThis is being done to pave the way for future work (and homogenity) in^/projects/make-ch
Convert traditional ${MK_TESTS} conditional idiom for including testdirectories to SUBDIR.${MK_TESTS} idiomThis is being done to pave the way for future work (and homogenity) in^/projects/make-check-sandbox .No functional change intended.MFC after: 1 weeks
Update the diff3 manpage to reflect the fact the version in freebsd doesnot use temporary files nor uses a /usr/libexec/diff3prog
For now comment tests for arguments which are not in par with GNU diff3 yet
Remove the MAX_CHECK macro, it was initially used to test if a file was atext file or not.The check is not done by diff3 but by diff (the argument -a is directly passedto diff(1))
Import working progress BSD diff3import bsd diff3 from OpenBSD.Differences with OpenBSD:- lots of warning fixed- no shell wrapper with diff3 actually living in libexec- capsicumizedKeep it di
Import working progress BSD diff3import bsd diff3 from OpenBSD.Differences with OpenBSD:- lots of warning fixed- no shell wrapper with diff3 actually living in libexec- capsicumizedKeep it disconnected as it is not yet good enough to replace GNU diffThe motivation to import it now it to allow other people to jump in and also tohave an open development on itObtained from: OpenBSD