projects / freebsd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 662d71c) | patch
Import diff from OpenBSD and remove GNU diff
authorbapt <bapt@FreeBSD.org>
Sat, 11 Mar 2017 05:01:29 +0000 (05:01 +0000)
committerbapt <bapt@FreeBSD.org>
Sat, 11 Mar 2017 05:01:29 +0000 (05:01 +0000)
commit57d397c2df162d8a8e02b611daaf1fa4b0476bff
treed0c4281aad22341ee2dcefb6bcad582cedd9d7a0tree | snapshot
parent662d71cd1c9ecdcad623e272aed62bc8f00686d0commit | diff
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
34 files changed:
ObsoleteFiles.inc diff | blob | blame | history
UPDATING diff | blob | blame | history
gnu/usr.bin/Makefile diff | blob | blame | history
gnu/usr.bin/diff/Makefile [deleted file] blob | blame | history
gnu/usr.bin/diff/Makefile.depend [deleted file] blob | blame | history
gnu/usr.bin/diff/tests/Makefile [deleted file] blob | blame | history
gnu/usr.bin/diff/tests/Makefile.depend [deleted file] blob | blame | history
usr.bin/Makefile diff | blob | blame | history
usr.bin/diff/Makefile [new file with mode: 0644] blob
usr.bin/diff/TODO [new file with mode: 0644] blob
usr.bin/diff/diff.1 [new file with mode: 0644] blob
usr.bin/diff/diff.c [new file with mode: 0644] blob
usr.bin/diff/diff.h [new file with mode: 0644] blob
usr.bin/diff/diffdir.c [new file with mode: 0644] blob
usr.bin/diff/diffreg.c [new file with mode: 0644] blob
usr.bin/diff/tests/Makefile [new file with mode: 0644] blob
usr.bin/diff/tests/diff.sh [new file with mode: 0755] blob
usr.bin/diff/tests/input1.in [new file with mode: 0644] blob
usr.bin/diff/tests/input2.in [new file with mode: 0644] blob
usr.bin/diff/tests/input_c1.in [new file with mode: 0644] blob
usr.bin/diff/tests/input_c2.in [new file with mode: 0644] blob
usr.bin/diff/tests/simple.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_b.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_e.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_i.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_n.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_p.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_u.out [new file with mode: 0644] blob
usr.bin/diff/tests/simple_w.out [new file with mode: 0644] blob
usr.bin/diff/tests/unified_9999.out [new file with mode: 0644] blob
usr.bin/diff/tests/unified_c9999.out [new file with mode: 0644] blob
usr.bin/diff/tests/unified_p.out [new file with mode: 0644] blob
usr.bin/diff/xmalloc.c [new file with mode: 0644] blob
usr.bin/diff/xmalloc.h [new file with mode: 0644] blob
FreeBSD Project Source