Piotr Pawel Stefaniak
9f7a81b133
diff3: document and test -T
...
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D31650
2021-08-25 18:20:59 +02:00
Piotr Pawel Stefaniak
54a3415cb6
diff3: implement --strip-trailing-cr
...
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D31626
2021-08-23 07:04:28 +02:00
Piotr Pawel Stefaniak
e8ff95356c
diff3.1: update manual page to match code
2021-08-23 07:04:28 +02:00
Piotr Pawel Stefaniak
702dda4368
diff3: improve style
2021-08-23 07:04:28 +02:00
Piotr Pawel Stefaniak
7f7b03f389
diff3: sync with upstream
...
* replace realloc calls with reallocarray calls
* fix merging of files that lack newlines
Obtained from: OpenBSD
2021-08-23 07:04:28 +02:00
Baptiste Daroussin
94678ee678
Replace homemade getline(3) by actual getline(3)
2019-12-17 11:03:32 +00:00
Baptiste Daroussin
9520071f7e
Use strtoimax.
...
Use existing strtoimax instead of reinventing it
2019-12-17 09:13:48 +00:00
Mariusz Zaborski
377421df96
capsicum: use a new capsicum helpers in tools
...
Use caph_{rights,ioctls,fcntls}_limit to simplify the code.
2018-11-04 19:24:49 +00:00
Mariusz Zaborski
7672a0148f
Convert cap_enter() < 0 && errno != ENOSYS to caph_enter() < 0.
...
No functional change intended.
2018-06-19 23:43:14 +00:00
Bryan Drewery
3806950135
DIRDEPS_BUILD: Connect new directories.
...
Sponsored by: Dell EMC Isilon
2017-10-31 00:04:07 +00:00
Enji Cooper
d511b20a69
Add HAS_TESTS to all Makefiles that are currently using the
...
`SUBDIR.${MK_TESTS}+= tests` idiom.
This is a follow up to r321912.
2017-08-02 08:50:42 +00:00
Enji Cooper
4b330699f8
Convert traditional ${MK_TESTS} conditional idiom for including test
...
directories to SUBDIR.${MK_TESTS} idiom
This 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
2017-08-02 08:35:51 +00:00
Baptiste Daroussin
9500abb088
Update the diff3 manpage to reflect the fact the version in freebsd does
...
not use temporary files nor uses a /usr/libexec/diff3prog
2017-05-25 18:46:13 +00:00
Baptiste Daroussin
cb5a670ece
For now comment tests for arguments which are not in par with GNU diff3 yet
2017-05-25 17:58:01 +00:00
Baptiste Daroussin
433115a0a4
Remove the MAX_CHECK macro, it was initially used to test if a file was a
...
text file or not.
The check is not done by diff3 but by diff (the argument -a is directly passed
to diff(1))
2017-05-25 17:55:40 +00:00
Baptiste Daroussin
e1910ebda4
Import working progress BSD diff3
...
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
2017-05-25 17:45:50 +00:00
