Paths

Table of Contentst

Differential D5981

Finish sdiff(1) from soc 2012
AbandonedPublic
Actions

Authored by bapt on Apr 16 2016, 10:39 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Tue, Nov 19, 1:55 AM

	Unknown Object (File)
	Tue, Nov 19, 12:20 AM

	Unknown Object (File)
	Mon, Nov 18, 6:50 PM

	Unknown Object (File)
	Mon, Nov 18, 5:24 AM

	Unknown Object (File)
	Thu, Nov 14, 2:09 AM

	Unknown Object (File)
	Wed, Nov 13, 11:32 PM

	Unknown Object (File)
	Wed, Nov 13, 1:37 PM

	Unknown Object (File)
	Wed, Nov 13, 11:02 AM

View All 86 Files

Subscribers

Details

Reviewers

emaste
des

Group Reviewers

Summary

During the GSoC 2012, Jesse Hagewood worked on text processing tools.

I have extracted from that summer of code the sdiff(1) part and tried to finish
it.

I have also imported the regression tests from NetBSD and modified them match
what the GNU version is really producing

Compared to the summer of code, I have fixed the z version of sdiff
Finished fixing the "column" output vs gnu diff (which makes it different from
OpenBSD and NetBSD)

Added the '(' that gnu sdiff shows when only printing the left column

The last difference with GNU sdiff that I do not plan to fix the fact that this
version padds using spaces while GNU sdiff pads using tabs (I honnestly prefer
the current behaviour and visually there is no differences)

Tested and compared against gnu sdiff as in base

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Warnings

Severity	Location	Code	Message
Warning	usr.bin/sdiff/tests/sdiff.sh:	CHMOD1	Invalid Executable

Unit

No Test Coverage

Build Status

Buildable 3364
Build 3401: arc lint + arc unit

Event Timeline

bapt updated this revision to Diff 15272.Apr 16 2016, 10:39 PM

bapt retitled this revision from to Finish sdiff(1) from soc 2012.

bapt updated this object.

bapt edited the test plan for this revision. (Show Details)

bapt added reviewers: emaste, des.

Herald added a reviewer: manpages. · View Herald TranscriptApr 16 2016, 10:39 PM

Herald added a subscriber: imp. · View Herald Transcript

Note that I'm not sure the zsdiff is really useful, but anyway it was there :)

emaste added inline comments.Apr 18 2016, 7:46 PM

usr.bin/sdiff/Makefile
8	:(
usr.bin/sdiff/decompress.c
67 ↗	(On Diff #15272)	What's the `\2`?
73 ↗	(On Diff #15272)	Should check be for null term here?

Remove zsdiff, it is not worth adding it

Herald edited edge metadata. · View Herald TranscriptApr 18 2016, 8:33 PM

The diff versus NetBSD: https://people.freebsd.org/~bapt/sdiff-netbsd.diff
The diff versus OpenBSD: https://people.freebsd.org/~bapt/sdiff-openbsd.diff

Reduce diff with OpenBSD and NetBSD

Herald edited edge metadata. · View Herald TranscriptApr 18 2016, 9:30 PM

bapt marked an inline comment as done.Apr 18 2016, 9:31 PM

Do you mind regenerating the OpenBSD/NetBSD diff after the recent update?

In D5981#127793, @emaste wrote:

Do you mind regenerating the OpenBSD/NetBSD diff after the recent update?

regenerated and added to phabricator:

https://reviews.freebsd.org/D6032

and

https://reviews.freebsd.org/D6033

Reduce a bit more diff with openbsd and exit 2 in case of failures

Herald edited edge metadata. · View Herald TranscriptApr 21 2016, 7:14 AM

More exit(2)

Herald edited edge metadata. · View Herald TranscriptApr 21 2016, 7:20 AM

bapt abandoned this revision.Apr 29 2016, 11:32 PM

Revision Contents
Changeset List

Path

Size

usr.bin/

1 line

16 lines

8 lines

24 lines

209 lines

11 lines

174 lines

1185 lines

38 lines

1 line

102 lines

79 lines

102 lines

d_iflags_a1.out

100 lines

d_iflags_a2.out

96 lines

d_iflags_b1.out

69 lines

d_iflags_b2.out

65 lines

d_iflags_c1.out

99 lines

d_iflags_c2.out

94 lines

d_iflags_d1.out

69 lines

d_iflags_d2.out

65 lines

72 lines

69 lines

1 line

d_oneline_a.out

1 line

d_oneline_b.out

1 line

72 lines

15 lines

17 lines

d_tabends_a.out

17 lines

d_tabends_b.out

17 lines

d_tabends_c.out

17 lines

102 lines

72 lines

69 lines

207 lines

Diff 15418

usr.bin/Makefile

Loading...

usr.bin/sdiff/

Loading...

usr.bin/sdiff/Makefile

Loading...

usr.bin/sdiff/common.h

Loading...

usr.bin/sdiff/common.c

Loading...

usr.bin/sdiff/edit.c

Loading...

usr.bin/sdiff/extern.h

Loading...

usr.bin/sdiff/sdiff.1

Loading...

usr.bin/sdiff/sdiff.c

Loading...

usr.bin/sdiff/tests/

Loading...

usr.bin/sdiff/tests/Makefile

Loading...

usr.bin/sdiff/tests/d_dot.in

Loading...

usr.bin/sdiff/tests/d_flags_l.out

Loading...

usr.bin/sdiff/tests/d_flags_s.out

Loading...

usr.bin/sdiff/tests/d_flags_w.out

Loading...

usr.bin/sdiff/tests/d_iflags_a1.out

Loading...

usr.bin/sdiff/tests/d_iflags_a2.out

Loading...

usr.bin/sdiff/tests/d_iflags_b1.out

Loading...

usr.bin/sdiff/tests/d_iflags_b2.out

Loading...

usr.bin/sdiff/tests/d_iflags_c1.out

Loading...

usr.bin/sdiff/tests/d_iflags_c2.out

Loading...

usr.bin/sdiff/tests/d_iflags_d1.out

Loading...

usr.bin/sdiff/tests/d_iflags_d2.out

Loading...

usr.bin/sdiff/tests/d_input1

Loading...

usr.bin/sdiff/tests/d_input2

Loading...

usr.bin/sdiff/tests/d_oneline.in

Loading...

usr.bin/sdiff/tests/d_oneline_a.out

Loading...

usr.bin/sdiff/tests/d_oneline_b.out

Loading...

usr.bin/sdiff/tests/d_same.out

Loading...

usr.bin/sdiff/tests/d_short.out

Loading...

usr.bin/sdiff/tests/d_tabends.in

Loading...

usr.bin/sdiff/tests/d_tabends_a.out

Loading...

usr.bin/sdiff/tests/d_tabends_b.out

Loading...

usr.bin/sdiff/tests/d_tabends_c.out

Loading...

usr.bin/sdiff/tests/d_tabs.out

Loading...

usr.bin/sdiff/tests/d_tabs1.in

Loading...

usr.bin/sdiff/tests/d_tabs2.in

Loading...

usr.bin/sdiff/tests/sdiff.sh

Loading...