svn commit: r315051 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin usr.bin/diff usr.bin/diff/tests

Ngie Cooper (yaneurabeya) yaneurabeya at gmail.com
Sun Mar 12 03:46:41 UTC 2017


> On Mar 10, 2017, at 21:01, Baptiste Daroussin <bapt at FreeBSD.org> wrote:
> 
> Author: bapt
> Date: Sat Mar 11 05:01:29 2017
> New Revision: 315051
> URL: https://svnweb.freebsd.org/changeset/base/315051
> 
> Log:
>  Import diff from OpenBSD and remove GNU diff
> 
>  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
> 
> Added:
>  head/usr.bin/diff/
>  head/usr.bin/diff/Makefile   (contents, props changed)
>  head/usr.bin/diff/TODO   (contents, props changed)
>  head/usr.bin/diff/diff.1   (contents, props changed)
>  head/usr.bin/diff/diff.c   (contents, props changed)
>  head/usr.bin/diff/diff.h   (contents, props changed)
>  head/usr.bin/diff/diffdir.c   (contents, props changed)
>  head/usr.bin/diff/diffreg.c   (contents, props changed)
>  head/usr.bin/diff/tests/
>  head/usr.bin/diff/tests/Makefile   (contents, props changed)
>  head/usr.bin/diff/tests/diff.sh   (contents, props changed)
>  head/usr.bin/diff/tests/input1.in   (contents, props changed)
>  head/usr.bin/diff/tests/input2.in   (contents, props changed)
>  head/usr.bin/diff/tests/input_c1.in   (contents, props changed)
>  head/usr.bin/diff/tests/input_c2.in   (contents, props changed)
>  head/usr.bin/diff/tests/simple.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_b.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_e.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_i.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_n.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_p.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_u.out   (contents, props changed)
>  head/usr.bin/diff/tests/simple_w.out   (contents, props changed)
>  head/usr.bin/diff/tests/unified_9999.out   (contents, props changed)
>  head/usr.bin/diff/tests/unified_c9999.out   (contents, props changed)
>  head/usr.bin/diff/tests/unified_p.out   (contents, props changed)
>  head/usr.bin/diff/xmalloc.c   (contents, props changed)
>  head/usr.bin/diff/xmalloc.h   (contents, props changed)
> Deleted:
>  head/gnu/usr.bin/diff/
> Modified:
>  head/ObsoleteFiles.inc
>  head/UPDATING
>  head/gnu/usr.bin/Makefile
>  head/usr.bin/Makefile

Hi Baptiste,
	This change fails with gcc riscv due to some -Wunused errors: https://ci.freebsd.org/job/FreeBSD-head-riscv64-build/697/console .
Thanks,
-Ngie
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 842 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20170311/e02d70c4/attachment.sig>


More information about the svn-src-head mailing list