import sdiff(1) from GSoC 2012
authorbapt <bapt@FreeBSD.org>
Fri, 29 Apr 2016 23:27:15 +0000 (23:27 +0000)
committerbapt <bapt@FreeBSD.org>
Fri, 29 Apr 2016 23:27:15 +0000 (23:27 +0000)
commit8f5c11fdbe0c2d8d7434ca656cae0d4c676ee4af
tree7ec38e45cbfa9d445907fa348017b10854448f2a
parent27a52ce3e3da09854ac99ae8631add209493c47e
import sdiff(1) from GSoC 2012

Import sdiff(1) from the diff version written by Raymond Lai,
improved during GSoC 2012 by Jesse Hagewood.

Compared to the version done in during that summer of code:
- Remove the zlib frontend: zsdiff
- Compatible output (column size and separators) with GNU sdiff

Compared to GNU sdiff in ports:
- The only difference is padding using spaces vs tabs

Compared to OpenBSD and NetBSD import:
- Implement missing options (including long options) from GNU sdiff
- Improved support for the edition mode (signal handling)
- Output visually compatible with GNU sdiff: size of columns

While here import regression tests from NetBSD adapted to fit the output as
expected by GNU sdiff

Reviewed by: emaste (in part)
Obtained from: OpenBSD, NetBSD, GSoC 2012
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D5981
Differential Revision: https://reviews.freebsd.org/D6032 (diff with NetBSD version)
Differential Revision: https://reviews.freebsd.org/D6033 (diff with OpenBSD version)
40 files changed:
gnu/usr.bin/Makefile
gnu/usr.bin/sdiff/Makefile [deleted file]
gnu/usr.bin/sdiff/Makefile.depend [deleted file]
gnu/usr.bin/sdiff/sdiff.c.diff [deleted file]
usr.bin/Makefile
usr.bin/sdiff/Makefile [new file with mode: 0644]
usr.bin/sdiff/common.c [new file with mode: 0644]
usr.bin/sdiff/common.h [new file with mode: 0644]
usr.bin/sdiff/edit.c [new file with mode: 0644]
usr.bin/sdiff/extern.h [new file with mode: 0644]
usr.bin/sdiff/sdiff.1 [new file with mode: 0644]
usr.bin/sdiff/sdiff.c [new file with mode: 0644]
usr.bin/sdiff/tests/Makefile [new file with mode: 0644]
usr.bin/sdiff/tests/d_dot.in [new file with mode: 0644]
usr.bin/sdiff/tests/d_flags_l.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_flags_s.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_flags_w.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_a1.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_a2.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_b1.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_b2.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_c1.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_c2.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_d1.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_iflags_d2.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_input1 [new file with mode: 0644]
usr.bin/sdiff/tests/d_input2 [new file with mode: 0644]
usr.bin/sdiff/tests/d_oneline.in [new file with mode: 0644]
usr.bin/sdiff/tests/d_oneline_a.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_oneline_b.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_same.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_short.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabends.in [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabends_a.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabends_b.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabends_c.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabs.out [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabs1.in [new file with mode: 0644]
usr.bin/sdiff/tests/d_tabs2.in [new file with mode: 0644]
usr.bin/sdiff/tests/sdiff.sh [new file with mode: 0755]