Up to [local] / src / usr.bin / rcs
Request diff between arbitrary revisions
Default branch: MAIN
Current tag: OPENBSD_6_8
Revision 1.44 / (download) - annotate - [select for diffs], Fri Jun 26 07:28:46 2020 UTC (3 years, 11 months ago) by stsp
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE,
OPENBSD_6_8
Changes since 1.43: +10 -3 lines
Diff to previous 1.43 (colored)
Fix merging of files that lack newlines for diff(3), OpenRCS, and OpenCVS. Merges with a file that lacks newlines (\n) were triggering a fatal error. This could be easily reproduced with merge(1) and diff3(1): $ echo foo > foo $ echo bar > bar $ echo -n baz > baz $ merge -p foo bar baz merge: failed to merge $ diff3 -E foo bar baz 1a ======= diff3prog: logic error $ Fix this by properly handling short reads from the third file argument. Only the third file argument triggered the problem. The other input files were already handled correctly. ok millert@