History log of /freebsd-13.1/usr.bin/diff3/diff3.c (Results 1 – 9 of 9)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: release/12.4.0, release/13.1.0, release/12.3.0
# dbabfd7e 21-Aug-2021 Piotr Pawel Stefaniak <[email protected]>

diff3: implement --strip-trailing-cr

(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)


# 216bf478 20-Aug-2021 Piotr Pawel Stefaniak <[email protected]>

diff3: improve style

(cherry picked from commit 702dda4368dc2d07e8898fcfdddb12d730e6c174)


# 4bfbc5fb 20-Aug-2021 Piotr Pawel Stefaniak <[email protected]>

diff3: sync with upstream

* replace realloc calls with reallocarray calls
* fix merging of files that lack newlines

Obtained from: OpenBSD

(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7

diff3: sync with upstream

* replace realloc calls with reallocarray calls
* fix merging of files that lack newlines

Obtained from: OpenBSD

(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7359cc206ba61)

show more ...


Revision tags: release/13.0.0, release/12.2.0, release/11.4.0
# 94678ee6 17-Dec-2019 Baptiste Daroussin <[email protected]>

Replace homemade getline(3) by actual getline(3)


# 9520071f 17-Dec-2019 Baptiste Daroussin <[email protected]>

Use strtoimax.

Use existing strtoimax instead of reinventing it


Revision tags: release/12.1.0, release/11.3.0, release/12.0.0
# 377421df 04-Nov-2018 Mariusz Zaborski <[email protected]>

capsicum: use a new capsicum helpers in tools

Use caph_{rights,ioctls,fcntls}_limit to simplify the code.


Revision tags: release/11.2.0
# 7672a014 19-Jun-2018 Mariusz Zaborski <[email protected]>

Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.

No functional change intended.


Revision tags: release/10.4.0, release/11.1.0
# 433115a0 25-May-2017 Baptiste Daroussin <[email protected]>

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))


# e1910ebd 25-May-2017 Baptiste Daroussin <[email protected]>

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 di

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

show more ...