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