1 2004-05-15 Derek Price <derek@ximbiot.com>
3 * libdiff.dsp: Header file list updated.
4 * libdiff.dep: Regenerated for "libdiff.dsp" changes.
5 * libdiff.mak: Regenerated for "libdiff.dsp" changes.
6 (Patch from Conrad Pino <conrad@pino.com>.)
8 2004-05-13 Derek Price <derek@ximbiot.com>
10 * .cvsignore: Changed for "libdiff.dsp" changes.
11 * libdiff.dep: Added for "../cvsnt.dsw" changes.
12 * libdiff.dsp: Changed for "../cvsnt.dsw" changes.
13 * libdiff.mak: Regenerated for "../cvsnt.dsw" changes.
14 (Patch from Conrad Pino <conrad@pino.com>.)
16 2004-03-20 Derek Price <derek@ximbiot.com>
18 * diff.c (diff_run): Update string arg to const.
19 * diffrun.h: Update prototype to match.
21 2003-07-12 Larry Jones <lawrence.jones@eds.com>
23 * io.c (find_identical_ends): Update to match current diffutils
24 code and improve handling of files with no newline at end.
25 (Patch from Andrew Moise <chops@demiurgestudios.com>.)
27 2003-06-13 Derek Price <derek@ximbiot.com>
29 * diff3.c (read_diff): Fix memory leak.
30 (Patch from Kenneth Lorber <keni@his.com>.)
32 2003-05-21 Derek Price <derek@ximbiot.com>
34 * Makefile.in: Regenerate with Automake version 1.7.5.
36 2003-05-09 Derek Price <derek@ximbiot.com>
38 * system.h: Define S_ISSOCK on SCO OpenServer.
40 2003-04-10 Larry Jones <lawrence.jones@eds.com>
42 * Makefile.in: Regenerated.
44 2003-02-25 Derek Price <derek@ximbiot.com>
46 * Makefile.in: Regenerated.
48 2003-02-01 Larry Jones <lawrence.jones@eds.com>
50 * util.c (finish_output): Handle EINTR from waitpid.
52 2002-09-24 Derek Price <derek@ximbiot.com>
54 * Makefile.in: Regenerated using Automake 1.6.3.
56 2002-09-24 Larry Jones <lawrence.jones@eds.com>
58 * system.h: Use HAVE_STRUCT_STAT_ST_BLKSIZE instead of the
59 obsolete HAVE_ST_BLKSIZE.
61 2002-09-24 Derek Price <derek@ximbiot.com>
63 * Makefile.in: Regenerated.
65 2002-04-30 Derek Price <oberon@umich.edu>
67 * Makefile.in: Regenerated with automake 1.6.
69 2002-04-28 Derek Price <oberon@umich.edu>
71 * diff.c: Use the system fnmatch.h when present.
73 2001-09-04 Derek Price <dprice@collab.net>
75 * Makefile.in: Regenerated with automake 1.5.
77 2001-08-09 Derek Price <dprice@collab.net>
79 * system.h: Source some header files when present to eliminate warning
80 messages under Windows.
81 (Patch from "Manfred Klug" <manklu@web.de>.)
83 2001-08-07 Derek Price <dprice@collab.net>
85 * build_diff.com: Turn on verify to get a better trace of the DCL.
86 * diff3.c: Eliminate compiler warning. The VMS read rval is ssize_t
87 (signed). The VMS size_t appears to be unsigned.
88 * io.c: Eliminate compiler warning (ssize_t).
89 (Patch from Mike Marciniszyn <Mike.Marciniszyn@sanchez.com>.)
91 2001-08-06 Derek Price <dprice@collab.net>
93 * Makefile.in: Regenerated.
95 2001-07-04 Derek Price <dprice@collab.net>
97 * Makefile.in: Regenerated with new Automake release candidate 1.4h.
99 2001-06-28 Derek Price <dprice@collab.net>
101 * Makefile.in: Regenerated with new version of Automake.
103 2001-05-07 Larry Jones <larry.jones@sdrc.com>
105 * diff3.c (diff3_run): Put the name of the output file in the error
106 message instead of "could not open output file" to aid in debugging.
108 2001-04-25 Derek Price <dprice@collab.net>
110 * Makefile.in: Regenerated using AM 1.4e as of today at 18:10 -0400.
112 2001-03-24 Noel Cragg <noel@shave.red-bean.com>
114 * diff.c: fix typo in usage string.
116 2001-03-20 Derek Price <derek.price@openavenue.com>
117 for Karl Tomlinson <k.tomlinson@auckland.ac.nz>
119 * diff3.c (main): changed the common file of the two diffs to
120 OLDFILE for merges and edscripts so that the diffs are more likely
121 to contain the intended changes. Not changing the horizon-lines
122 arg for the second diff. If the two diffs have the same parameters
123 equal changes in each diff are more likely to appear the same.
125 * analyze.c (shift_boundaries): undid Paul Eggert's patch to fix
126 the diff3 merge bug described in ccvs/doc/DIFFUTILS-2.7-BUG. The
127 patch is no longer necessary now that diff3 does its differences
128 differently. I think the hunk merges provide a better indication
129 of the area modified by the user now that the diffs are actually
130 done between the appropriate revisions.
132 2001-03-15 Derek Price <derek.price@openavenue.com>
134 * Makefile.am (INCLUDES): Add -I$(top_srcdir)/lib for platforms which
135 need the regex library there.
137 * Makefile.in: Regenerated.
139 2001-03-14 Derek Price <derek.price@openavenue.com>
141 * .cvsignore: Added '.deps'.
143 Pavel Roskin <proski@gnu.org>
145 * Makefile.am: New file.
146 * Makefile.in: Regenerated.
148 2001-02-22 Derek Price <derek.price@openavenue.com>
149 Pavel Roskin <proski@gnu.org>
151 * Makefile.in: Don't define PR_PROGRAM - it's defined by configure.
152 Remove separate rule for util.c.
154 2001-02-06 Derek Price <derek.price@openavenue.com>
155 Rex Jolliff <Rex_Jolliff@notes.ymp.gov>
156 Shawn Smith <Shawn_Smith@notes.ymp.gov>
158 * dir.c: Replace opendir, closedir, & readdir calls with CVS_OPENDIR,
159 CVS_CLOSEDIR, & CVS_READDIR in support of changes to handle VMS DEC C
160 5.7 {open,read,close}dir problems. Check today's entry in the vms
162 * system.h: definitions of CVS_*DIR provided here.
164 2000-12-21 Derek Price <derek.price@openavenue.com>
166 * Makefile.in: Some changes to support Automake targets
168 2000-10-26 Larry Jones <larry.jones@sdrc.com>
170 * Makefile.in: Get PR_PROGRAM from autoconf instead of hard coding.
171 (Patch submitted by Urs Thuermann <urs@isnogud.escape.de>.)
172 Also add a dependency for util.o on Makefile since PR_PROGRAM gets
175 2000-08-03 Larry Jones <larry.jones@sdrc.com>
177 * diff3.c (read_diff): Use cvs_temp_name () instead of tmpnam () so
178 there's at least a chance of getting the file in the correct tmp dir.
180 2000-07-10 Larry Jones <larry.jones@sdrc.com>
182 * util.c (printf_output): Fix type clashes.
184 2000-06-15 Larry Jones <larry.jones@sdrc.com>
186 * diff3.c (diff3_run, make_3way_diff): Plug memory leaks.
188 1999-12-29 Jim Kingdon <http://developer.redhat.com/>
190 * diff.c (compare_files): Use explicit braces with if-if-else, per
191 GNU coding standards and gcc -Wall.
193 1999-11-23 Larry Jones <larry.jones@sdrc.com>
195 * diff3.c: Explicitly initialize zero_diff3 to placate neurotic
196 compilers that gripe about implicitly initialized const variables.
197 Reported by Eric Veum <sysv@yahoo.com>.
199 1999-09-15 Larry Jones <larry.jones@sdrc.com>
201 * diff.c (diff_run): Move the setjmp call before the options
202 processing since option errors can call fatal which in turn
205 1999-05-06 Jim Kingdon <http://www.cyclic.com>
207 * Makefile.in (DISTFILES): Remove libdiff.mak.
208 * libdiff.mak: Removed; we are back to a single makefile for
209 Visual C++ version 4.
211 1999-04-29 Jim Kingdon <http://www.cyclic.com>
213 * diff.c (diff_run): Use separate statement for setjmp call and if
214 statement. This is better style in general (IMHO) but in the case
215 of setjmp the UNICOS compiler apparently cares (I don't have the
216 standard handy, but there are lots of legitimate restrictions on
217 how you can call setjmp).
219 1999-04-26 Jim Kingdon <http://www.cyclic.com>
221 * Makefile.in (DISTFILES): Add libdiff.dsp libdiff.mak .cvsignore.
223 1999-04-26 (submitted 1999-03-24) John O'Connor <john@shore.net>
225 * libdiff.dsp: new file. MSVC project file used to build the library.
227 * libdiff.mak: new file. Makefile for building from the command-line.
229 * .cvsignore: Removed un-used entries related to MSVC. Added
230 entries to ignore directories generated by the NT build, Debug
233 1999-03-24 Larry Jones <larry.jones@sdrc.com>
236 * diff3.c (diff3_run): Use a separate stream for the input to
237 output_diff3_merge instead of reopening stdin to avoid problems
238 with leaving it open.
240 1999-02-17 Jim Kingdon <http://www.cyclic.com>
241 and Hallvard B Furuseth.
243 * util.c: Use __STDC__ consistently with ./system.h.
244 * system.h: Add comment about PARAMS.
246 1999-01-12 Jim Kingdon <http://www.cyclic.com>
248 * Makefile.in, analyze.c, cmpbuf.c, cmpbuf.h, context.c, diff.c,
249 diff.h, diff3.c, diffrun.h, dir.c, ed.c, io.c, normal.c, system.h,
250 util.c: Remove paragraph containing the old snail mail address of
251 the Free Software Foundation.
253 1998-09-21 Jim Kingdon <kingdon@harvey.cyclic.com>
255 * util.c (printf_output): Make msg static; avoids auto
256 initializer, which is not portable to SunOS4 /bin/cc.
257 Reported by Mike Sutton@SAIC.
259 1998-09-14 Jim Kingdon <kingdon@harvey.cyclic.com>
261 * Makefile.in (DISTFILES): Add diagmeet.note.
263 1998-08-15 Jim Kingdon <kingdon@harvey.cyclic.com>
265 * diffrun.h (struct diff_callbacks): Change calling convention of
266 write_output so that a zero length means to output zero bytes.
267 The cvs_output convention is just too ugly/error-prone.
268 * util.c (printf_output): Rewrite to parse format string
269 overselves rather than calling vasprintf, which cannot be
270 implemented in portable C.
272 1998-08-06 David Masterson of kla-tencor.com
274 * util.c (flush_output): Don't prototype.
276 Thu Jul 2 16:34:38 1998 Ian Lance Taylor <ian@cygnus.com>
278 Simplify the callback interface:
279 * diffrun.h: Don't include <stdarg.h> or <varargs.h>.
280 (struct diff_callbacks): Remove printf_output field.
281 * util.c: Include <stdarg.h> or <varargs.h>.
282 (printf_output): Use vasprintf and write_output callback rather
283 than printf_output callback.
284 * diff3.c (read_diff): Don't set my_callbacks.printf_output.
286 Thu Jun 18 12:43:53 1998 Ian Lance Taylor <ian@cygnus.com>
288 * diffrun.h: New file.
289 * diff.h: Include diffrun.h.
290 (callbacks): New EXTERN variable.
291 (write_output, printf_output, flush_output): Declare.
292 * diff.c (diff_run): Add parameter callbacks_arg. Use callback
293 functions rather than writing to stdout. Don't open a file if
294 there is a write_output callback. Call perror_with_name rather
296 (usage): Use callbacks if defined rather than writing to stdout.
297 (compare_files): Call flush_output rather than fflush (outfile).
298 * diff3.c: Include diffrun.h. Change several functions to use
299 output functions from util.c rather than direct printing. Use
300 diff_error and friends rather than printing to stderr. Set global
302 (outfile, callbacks): Declare.
303 (write_output, printf_output, flush_output): Declare.
304 (diff3_run): Add parameter callbacks_arg. Use callback functions
305 rather than writing to stdout.
306 (usage): Use callbacks if defined rather than writing to stdout.
307 (read_diff): Preserve callbacks and outfile around call to
309 * util.c (perror_with_name): Use error callback if defined.
310 (pfatal_with_name, diff_error): Likewise.
311 (message5): Use printf_output and write_output.
312 (print_message_queue, print_1_line, output_1_line): Likewise.
313 (begin_output): Reject paginate_flag if there are output
315 (write_output, printf_output, flush_output): New functions.
316 * context.c: Change all output to outfile to use printf_output and
320 * normal.c: Likewise.
322 * Makefile.in (SOURCES): Add diffrun.h.
323 ($(OBJECTS)): Depend upon diffrun.h.
325 Fri Jan 16 14:58:19 1998 Larry Jones <larry.jones@sdrc.com>
327 * diff.c, diff3.c: Plug memory leaks.
329 Thu Jan 15 13:36:46 1998 Jim Kingdon <kingdon@harvey.cyclic.com>
331 * Makefile.in (installdirs): New rule, for when ../Makefile
332 recurses into this directory (bug reported by W. L. Estes).
334 Tue Nov 11 10:48:19 1997 Jim Kingdon <kingdon@harvey.cyclic.com>
336 * diff.c (diff_run): Change #ifdef on HAVE_SETMODE to #if to match
337 the other uses (fixes compilation error on unix).
339 * diff.c (diff_run): Don't set stdout to binary mode.
341 Mon, 10 Nov 1997 Jim Kingdon
343 * diff.c (run_diff): Open outfile in binary mode if --binary.
345 Thu Nov 6 12:42:12 1997 Karl Fogel <kfogel@floss.red-bean.com>
346 and Paul Eggert <eggert@twinsun.com>
348 * analyze.c: applied Paul Eggert's patch to fix the diff3 merge
349 bug described in ccvs/doc/DIFFUTILS-2.7-BUG:
350 (shift_boundaries): new var `inhibit_hunk_merge'; use it to
351 control something important that I don't quite understand, but
352 Paul apparently does, so that's okay.
354 Sat Nov 1 14:17:57 1997 Michael L.H. Brouwer <michael@thi.nl>
356 * Makefile.in: Add call to ranlib to build a table of contents for
357 the library since some systems seem to require this.
359 1997-10-28 Jim Kingdon
361 * .cvsignore: Add files du jour for Visual C++, vc50.pdb and vc50.idb.
363 * system.h: Define HAVE_TIME_H.
364 * dir.c [_WIN32]: Define CLOSEDIR_VOID.
366 1997-10-18 Jim Kingdon
368 * build_diff.com: Add diff3.c
370 Fri Sep 26 14:24:42 1997 Tim Pierce <twp@twp.tezcat.com>
372 * diff.c (diff_run): Save old value of optind before calling
373 getopt_long, then restore before returning. Eventually it would
374 be nice if diff_run were fully reentrant.
376 New diff3 library for CVS.
377 * Makefile.in (SOURCES): Add diff3.c.
378 (OBJECTS): Add diff3.o.
379 * diff3.c: New file, copied from diffutils-2.7. See diffutils for
380 earlier ChangeLogs. Undefine initialize_main macro. Remove <signal.h>.
381 (diff3_run): Renamed from main(). Add `outfile' argument. Remove
382 SIGCLD handling; we do not fork. Save optind and reset to 0
383 before calling getopt_long; restore after option processing done.
384 (read_diff): Use diff_run with a temporary output file,
385 instead of forking a diff subprocess and reading from a pipe.
386 Change DIFF_PROGRAM to "diff"; this argument is now used only for
387 diagnostic reporting.
388 (xmalloc, xrealloc): Removed.
389 (diff_program): Removed.
390 (diff_program_name): Made extern, so it may be used in other
391 library calls like `error'.
392 (initialize_main): New function.
394 Namespace munging. util.c defines both fatal() and
395 perror_with_exit(), but these cannot be used to abort diff3: both
396 attempt to longjmp() to a buffer set in diff.c, used only by
397 diff_run. This is an awful solution, but necessary until the code
398 can be cleaned up. (These functions do not *have* to be renamed,
399 since both are declared static to diff3.c and should not clash
400 with libdiff.a, but it reduces potential confusion.)
401 * diff3.c (diff3_fatal): Renamed from fatal.
402 (diff3_perror_with_exit): Renamed from perror_with_exit.
404 Eliminate exit calls.
405 (try_help): Change from `void' to `int'. Return, do not exit.
406 (diff3_fatal, diff3_perror_with_exit, process_diff): Change `exit'
408 (diff3_run): Initialize jump buffer for nonlocal exits. Change
409 exit calls to returns. Change `perror_with_exit' to
410 `perror_with_name' and add a return. Change `fatal' to
411 `diff_error' and add a return. The reasoning is that we shouldn't
412 rely on setjmp/longjmp any more than necessary.
415 (check_output): Renamed from check_stdout. Take stream argument
416 instead of blindly checking stdout. Do not close stream, but
418 (diff3_run): Initialize outstream, and close when done. Pass this
419 stream (instead of stdout) to output_diff3_edscript,
420 output_diff3_merge, and output_diff3.
422 Thu Sep 25 14:34:22 1997 Jim Kingdon <kingdon@harvey.cyclic.com>
424 * util.c (begin_output, finish_output): If PR_PROGRAM is not
425 defined (VMS), just give a fatal error if --paginate specified.
427 * Makefile.in (DISTFILES): Add ChangeLog build_diff.com
429 * build_diff.com: New file.
431 Wed Sep 24 10:27:00 1997 Jim Kingdon <kingdon@harvey.cyclic.com>
433 * Makefile.in: Also set top_srcdir. Needed to make today's other
434 Makefile.in change work.
436 * .cvsignore: New file.
438 * Makefile.in (COMPILE): Add -I options for srcdir (perhaps
439 unneeded) and change -I option for lib to use top_srcdir (needed
440 to avoid mixups with CVS's regex.h vs. the system one).
442 Sun Sep 21 19:44:42 1997 Jim Kingdon <kingdon@harvey.cyclic.com>
444 * Makefile.in (util.o): Change util.c to $<, needed for srcdir.
446 Sat Sep 20 12:06:41 1997 Tim Pierce <twp@twp.tezcat.com>
448 New diff library for CVS, based on diffutils-2.7. See diffutils
449 for earlier ChangeLogs.
450 * Makefile.in, analyze.c, cmpbuf.c, cmpbuf.h, config.hin,
451 context.c, diagmeet.note, diff.c, diff.h, dir.c, ed.c, ifdef.c,
452 io.c, normal.c, side.c, stamp-h.in, system.h, util.c, version.c:
454 (COMPILE): Add -I../lib, so we can get getopt.h.
456 * Makefile.in: Removed anything not related to libdiff.a.
457 (dist-dir): New target, copied from ../lib/Makefile.in.
458 (DISTFILES): New variable.
459 (SOURCES): Renamed from `srcs'.
460 (OBJECTS): Renamed from `libdiff_o'.
461 (Makefile): Changed dependencies to reflect
462 new, shallow config directory structure.
463 (stamp-h.in, config.h.in, config.h, stamp-h): Removed.
464 * stamp-h.in, config.h.in: Removed.
466 * system.h: Remove dup2 macro (provided by ../lib/dup2.c).
467 Include stdlib.h if STDC_HEADERS is defined (not just
470 Sat Sep 20 05:32:18 1997 Tim Pierce <twp@twp.tezcat.com>
472 Diff librarification.
474 * diff.c (diff_run): New function, renamed from `main'.
475 Initialize `outfile' based on the value of the new `out' filename
477 (initialize_main): New function.
478 * system.h: Removed initialize_main macro.
479 * diffmain.c: New file.
480 * Makefile.in (diff): Added diffmain.o.
481 (libdiff): New target.
482 (AR, libdiff_o): New variables. libdiff_o does not include
483 xmalloc.o, fnmatch.o, getopt.o, getopt1.o, regex.o or error.o,
484 because these functions are already present in CVS. It will take
485 some work to make this more general-purpose.
487 Redirect standard output.
488 * util.c: Redirect stdout to outfile: change all naked `printf'
489 and `putchar' statements to `fprintf (outfile)' and `putc (...,
490 outfile)' throughout. This should permit redirecting diff output
491 by changing `outfile' just once in `diff_run'.
492 (output_in_progress): New variable.
493 (begin_output, finish_output): Use `output_in_progress', rather than
494 `outfile', as a semaphore to avoid reentrancy problems.
495 (finish_output): Close `outfile' only if paginate_flag is set.
496 * diff.c (check_output): New function, was check_stdout. Take a
497 `file' argument, and flush it instead of closing it.
498 (diff_run): Change check_stdout to check_output.
499 (compare_files): Fflush outfile, not stdout.
501 Eliminate exit statements.
502 * diff.h: Include setjmp.h.
503 (diff_abort_buf): New variable.
504 (DIFF_ABORT): New macro.
505 * diff.c (diff_run): Change all `exit' statements to `return'.
506 Set up diff_abort_buf, so we can abort diff without
507 terminating (for libdiff.a).
508 (try_help): Return int instead of void; do not exit.
509 * util.c (fatal): Use DIFF_ABORT instead of exit.
510 (pfatal_with_name): Use DIFF_ABORT instead of exit.
512 Namespace cleanup (rudimentary). Strictly speaking, this is not
513 necessary to make diff into a library. However, namespace
514 clashes between diff and CVS must be resolved immediately, since
515 CVS is the first application targeted for use with difflib.
517 * analyze.c, diff.c, diff.h, util.c (diff_error): Renamed from `error'.
519 * version.c, diff.c, diff.h, cmp.c, diff3.c, sdiff.c
520 (diff_version_string): Renamed from version_string.
521 * diff.c, util.c, diff.h, diff3.c, error.c (diff_program_name):
522 Renamed from program_name.
524 * util.c (xmalloc, xrealloc): Removed.
525 * Makefile.in (diff_o): Added error.o and xmalloc.o.