src/usr.bin/diff/diffreg.c, branch releng/12.0

diff(1): Refactor -B a little bit

2018-08-19T04:15:38Z

Instead of doing a second pass to skip empty lines if we've specified -I, go ahead and check both at once. Ignore critera has been split out into its own function to try and keep the logic cleaner.

diff(1): Implement -B/--ignore-blank-lines

2018-08-19T03:57:20Z

As noted by cem in r338035, coccinelle invokes diff(1) with the -B flag. This was not previously implemented here, so one was forced to create a link for GNU diff to /usr/local/bin/diff Implement the -B flag and add some primitive tests for it. It is implemented in the same fashion that -I is implemented; each chunk's lines are scanned, and if a non-blank line is encountered then the chunk will be output. Otherwise, it's skipped. MFC after: 2 weeks

Improve --strip-trailing-cr handling:

2018-07-27T05:21:20Z

- Advance ctold for f1 and ctnew for f2 - ungetc() if the character is unexpected - Don't break early when we hit the combination on one side PR: 230049 Reported by: maskray Reviewed by: bapt, maskray MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D16451

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

2018-06-19T23:43:14Z

No functional change intended.

Isolate the pr(1) related code in its own source files

2018-06-09T20:24:17Z

This keeps diffreg.c closer to what it is supposed to do: diffing regular files. It also allows my code to get a proper license

Replace homemade equivalent of tolower(3) by towlower(3)

2017-12-13T16:09:00Z

This will help in the futur making diff -i works with multibyte

spdx: initial adoption of licensing ID tags.

2017-11-18T14:26:50Z

The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. Special thanks to Wind River for providing access to "The Duke of Highlander" tool: an older (2014) run over FreeBSD tree was useful as a starting point. Initially, only tag files that use BSD 4-Clause "Original" license. RelNotes: yes Differential Revision: https://reviews.freebsd.org/D13133

Don't emit "diff: diff arguments" when diffing files if

2017-07-17T17:36:04Z

-q is specified. This improves compatibility with GNU diff. Found by accident with `diff -Nrq /usr/tests /usr/tests.new | grep Kyuafile`. MFC after: 2 months Relnotes: yes

Fix the following warning from gcc 4.2 in usr.bin/diff:

2017-04-24T20:34:56Z

usr.bin/diff/diffreg.c: In function 'change': usr.bin/diff/diffreg.c:1085: warning: 'i' may be used uninitialized in this function This version of gcc is not smart enough to see that 'i' cannot actually be used unitialized. However, the variable is confusingly re-used, so it is better to give it another name, and clearly initialize it before attempting to use it. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D10484

Implement a basic --changed-group-format

2017-04-20T14:22:33Z

etcupdate(8) requires that option, while GNU diff supports many more variation of that options, their behaviour beside the simple verion implemented here are quite inconsistent as such I do not plan to implement those. The only special keyword supported by this implementation are: %< and %> %= is not implemented as the documentation of GNU diff says: common lines, but it actually when tested print the changes from the first file