Import cvs-1.10.7. There are a number of nasty bugs that have been fixed.

Obtained from:  cyclic.com

1 files changed, 67 insertions, 0 deletions

diff --git a/contrib/cvs/diff/ChangeLog b/contrib/cvs/diff/ChangeLog
index 3ebde5d..a435182 100644
--- a/contrib/cvs/diff/ChangeLog
+++ b/contrib/cvs/diff/ChangeLog
@@ -1,3 +1,70 @@
+1999-05-06  Jim Kingdon  <http://www.cyclic.com>
+
+	* Makefile.in (DISTFILES): Remove libdiff.mak.
+	* libdiff.mak: Removed; we are back to a single makefile for
+	Visual C++ version 4.
+
+1999-04-29  Jim Kingdon  <http://www.cyclic.com>
+
+	* diff.c (diff_run): Use separate statement for setjmp call and if
+	statement.  This is better style in general (IMHO) but in the case
+	of setjmp the UNICOS compiler apparently cares (I don't have the
+	standard handy, but there are lots of legitimate restrictions on
+	how you can call setjmp).
+
+1999-04-26  Jim Kingdon  <http://www.cyclic.com>
+
+	* Makefile.in (DISTFILES): Add libdiff.dsp libdiff.mak .cvsignore.
+
+1999-04-26 (submitted 1999-03-24) John O'Connor  <john@shore.net>
+
+	* libdiff.dsp: new file. MSVC project file used to build the library.
+
+	* libdiff.mak: new file. Makefile for building from the command-line.
+
+	* .cvsignore: Removed un-used entries related to MSVC.  Added
+	entries to ignore directories generated by the NT build, Debug
+	and Release.
+
+1999-03-24  Larry Jones  <larry.jones@sdrc.com>
+	and Olaf Brandes
+
+	* diff3.c (diff3_run): Use a separate stream for the input to
+	output_diff3_merge instead of reopening stdin to avoid problems
+	with leaving it open.
+
+1999-02-17  Jim Kingdon  <http://www.cyclic.com>
+	and Hallvard B Furuseth.
+
+	* util.c: Use __STDC__ consistently with ./system.h.
+	* system.h: Add comment about PARAMS.
+
+1999-01-12  Jim Kingdon  <http://www.cyclic.com>
+
+	* Makefile.in, analyze.c, cmpbuf.c, cmpbuf.h, context.c, diff.c,
+	diff.h, diff3.c, diffrun.h, dir.c, ed.c, io.c, normal.c, system.h,
+	util.c: Remove paragraph containing the old snail mail address of
+	the Free Software Foundation.
+
+1998-09-21  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* util.c (printf_output): Make msg static; avoids auto
+	initializer, which is not portable to SunOS4 /bin/cc.
+	Reported by Mike Sutton@SAIC.
+
+1998-09-14  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* Makefile.in (DISTFILES): Add diagmeet.note.
+
+1998-08-15  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* diffrun.h (struct diff_callbacks): Change calling convention of
+	write_output so that a zero length means to output zero bytes.
+	The cvs_output convention is just too ugly/error-prone.
+	* util.c (printf_output): Rewrite to parse format string
+	overselves rather than calling vasprintf, which cannot be
+	implemented in portable C.
+
 1998-08-06  David Masterson of kla-tencor.com
 
 	* util.c (flush_output): Don't prototype.