<feed xmlns='http://www.w3.org/2005/Atom'>
<title>src/usr.bin/diff/diff.c, branch releng/12.0</title>
<subtitle>FreeBSD source tree</subtitle>
<id>https://cgit-dev.freebsd.org/src/atom?h=releng%2F12.0</id>
<link rel='self' href='https://cgit-dev.freebsd.org/src/atom?h=releng%2F12.0'/>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/'/>
<updated>2018-08-19T03:57:20Z</updated>
<entry>
<title>diff(1): Implement -B/--ignore-blank-lines</title>
<updated>2018-08-19T03:57:20Z</updated>
<author>
<name>Kyle Evans</name>
<email>kevans@FreeBSD.org</email>
</author>
<published>2018-08-19T03:57:20Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=e68edb8cf06a796453378b98d963692c838c400f'/>
<id>urn:sha1:e68edb8cf06a796453378b98d963692c838c400f</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>Add -H as an alias for --speed-large-file to match GNU diff.</title>
<updated>2017-06-02T03:25:59Z</updated>
<author>
<name>John Baldwin</name>
<email>jhb@FreeBSD.org</email>
</author>
<published>2017-06-02T03:25:59Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=ea67c7a015806b1435c5eb106204e31e323b14f3'/>
<id>urn:sha1:ea67c7a015806b1435c5eb106204e31e323b14f3</id>
<content type='text'>
This is undocumented to match GNU diff where -H is also undocumented.
Some existing software (such as kompare) uses this option by default.

Reviewed by:	emaste, rpokala
Differential Revision:	https://reviews.freebsd.org/D11022
</content>
</entry>
<entry>
<title>Implement a basic --changed-group-format</title>
<updated>2017-04-20T14:22:33Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-04-20T14:22:33Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=fddcb7b82ff45dc9e08bab26bbfe7a2d2e8ca20f'/>
<id>urn:sha1:fddcb7b82ff45dc9e08bab26bbfe7a2d2e8ca20f</id>
<content type='text'>
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: %&lt; and %&gt;
%= is not implemented as the documentation of GNU diff says: common lines, but
it actually when tested print the changes from the first file
</content>
</entry>
<entry>
<title>Clean up headers declaration</title>
<updated>2017-04-15T13:57:35Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-04-15T13:57:35Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=7752043c9de277c9a4992b0e2f87ff3deb37fde0'/>
<id>urn:sha1:7752043c9de277c9a4992b0e2f87ff3deb37fde0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>add a stub --speed-large-files for compatibility with GNU diff</title>
<updated>2017-04-08T08:46:02Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-04-08T08:46:02Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=a077708d356b8c6c896cac91a44848115a574bd2'/>
<id>urn:sha1:a077708d356b8c6c896cac91a44848115a574bd2</id>
<content type='text'>
There is no intention to implement it, but lots of scripts/tools using
diff(1) passes GNU diff option
</content>
</entry>
<entry>
<title>Use strndup(3) instead of malloc + memcpy</title>
<updated>2017-03-22T21:52:22Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-03-22T21:52:22Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=5c8e56f615804abfd086c68959537a044f32c66d'/>
<id>urn:sha1:5c8e56f615804abfd086c68959537a044f32c66d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Implement a stub --horizon-lines=NUM for compatibility with GNU diff3</title>
<updated>2017-03-12T03:49:05Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-03-12T03:49:05Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=901a475b7a24b2d4eec2c0e006f0c7f78abd3789'/>
<id>urn:sha1:901a475b7a24b2d4eec2c0e006f0c7f78abd3789</id>
<content type='text'>
some options of GNU diff3 would call diff with --horizon-lines, rcs is depending
on that.

Reported by:	antoine
</content>
</entry>
<entry>
<title>Import diff from OpenBSD and remove GNU diff</title>
<updated>2017-03-11T05:01:29Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-03-11T05:01:29Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=3bbe3f672e37e4f609adb3be3a6476edce2243ec'/>
<id>urn:sha1:3bbe3f672e37e4f609adb3be3a6476edce2243ec</id>
<content type='text'>
Some of the modifications from the previous summer of code has been integrated
Modification for compatibility with GNU diff output has been added

Main difference with OpenBSD:
Implement multiple GNU diff options:
* --ignore-file-name-case
* --no-ignore-file-name-case
* --normal
* --tabsize
* --strip-trailing-cr
Make diff -p compatible with GNU diff
Implement diff -l
Make diff -r compatible with GNU diff

Capsicumize diffing 2 regular files
Add a simple test suite

Approved by:	AsiaBSDcon devsummit
Obtained from:	OpenBSD, GSoC
Relnotes:	yes
</content>
</entry>
</feed>
