12001-04-25 Derek Price <dprice@collab.net> 2 3 * Makefile.in: Regenerated using AM 1.4e as of today at 18:10 -0400. 4 52001-03-24 Noel Cragg <noel@shave.red-bean.com> 6 7 * diff.c: fix typo in usage string. 8 92001-03-20 Derek Price <derek.price@openavenue.com> 10 for Karl Tomlinson <k.tomlinson@auckland.ac.nz> 11 12 * diff3.c (main): changed the common file of the two diffs to 13 OLDFILE for merges and edscripts so that the diffs are more likely 14 to contain the intended changes. Not changing the horizon-lines 15 arg for the second diff. If the two diffs have the same parameters 16 equal changes in each diff are more likely to appear the same. 17 18 * analyze.c (shift_boundaries): undid Paul Eggert's patch to fix 19 the diff3 merge bug described in ccvs/doc/DIFFUTILS-2.7-BUG. The 20 patch is no longer necessary now that diff3 does its differences 21 differently. I think the hunk merges provide a better indication 22 of the area modified by the user now that the diffs are actually 23 done between the appropriate revisions. 24 252001-03-15 Derek Price <derek.price@openavenue.com> 26 27 * Makefile.am (INCLUDES): Add -I$(top_srcdir)/lib for platforms which 28 need the regex library there. 29 30 * Makefile.in: Regenerated. 31 322001-03-14 Derek Price <derek.price@openavenue.com> 33 34 * .cvsignore: Added '.deps'. 35 36 Pavel Roskin <proski@gnu.org> 37 38 * Makefile.am: New file. 39 * Makefile.in: Regenerated. 40 412001-02-22 Derek Price <derek.price@openavenue.com> 42 Pavel Roskin <proski@gnu.org> 43 44 * Makefile.in: Don't define PR_PROGRAM - it's defined by configure. 45 Remove separate rule for util.c. 46 472001-02-06 Derek Price <derek.price@openavenue.com> 48 Rex Jolliff <Rex_Jolliff@notes.ymp.gov> 49 Shawn Smith <Shawn_Smith@notes.ymp.gov> 50 51 * dir.c: Replace opendir, closedir, & readdir calls with CVS_OPENDIR, 52 CVS_CLOSEDIR, & CVS_READDIR in support of changes to handle VMS DEC C 53 5.7 {open,read,close}dir problems. Check today's entry in the vms 54 subdir for more. 55 * system.h: definitions of CVS_*DIR provided here. 56 572000-12-21 Derek Price <derek.price@openavenue.com> 58 59 * Makefile.in: Some changes to support Automake targets 60 612000-10-26 Larry Jones <larry.jones@sdrc.com> 62 63 * Makefile.in: Get PR_PROGRAM from autoconf instead of hard coding. 64 (Patch submitted by Urs Thuermann <urs@isnogud.escape.de>.) 65 Also add a dependency for util.o on Makefile since PR_PROGRAM gets 66 compiled in. 67 682000-08-03 Larry Jones <larry.jones@sdrc.com> 69 70 * diff3.c (read_diff): Use cvs_temp_name () instead of tmpnam () so 71 there's at least a chance of getting the file in the correct tmp dir. 72 732000-07-10 Larry Jones <larry.jones@sdrc.com> 74 75 * util.c (printf_output): Fix type clashes. 76 772000-06-15 Larry Jones <larry.jones@sdrc.com> 78 79 * diff3.c (diff3_run, make_3way_diff): Plug memory leaks. 80 811999-12-29 Jim Kingdon <http://developer.redhat.com/> 82 83 * diff.c (compare_files): Use explicit braces with if-if-else, per 84 GNU coding standards and gcc -Wall. 85 861999-11-23 Larry Jones <larry.jones@sdrc.com> 87 88 * diff3.c: Explicitly initialize zero_diff3 to placate neurotic 89 compilers that gripe about implicitly initialized const variables. 90 Reported by Eric Veum <sysv@yahoo.com>. 91 921999-09-15 Larry Jones <larry.jones@sdrc.com> 93 94 * diff.c (diff_run): Move the setjmp call before the options 95 processing since option errors can call fatal which in turn 96 calls longjmp. 97 981999-05-06 Jim Kingdon <http://www.cyclic.com> 99 100 * Makefile.in (DISTFILES): Remove libdiff.mak. 101 * libdiff.mak: Removed; we are back to a single makefile for 102 Visual C++ version 4. 103 1041999-04-29 Jim Kingdon <http://www.cyclic.com> 105 106 * diff.c (diff_run): Use separate statement for setjmp call and if 107 statement. This is better style in general (IMHO) but in the case 108 of setjmp the UNICOS compiler apparently cares (I don't have the 109 standard handy, but there are lots of legitimate restrictions on 110 how you can call setjmp). 111 1121999-04-26 Jim Kingdon <http://www.cyclic.com> 113 114 * Makefile.in (DISTFILES): Add libdiff.dsp libdiff.mak .cvsignore. 115 1161999-04-26 (submitted 1999-03-24) John O'Connor <john@shore.net> 117 118 * libdiff.dsp: new file. MSVC project file used to build the library. 119 120 * libdiff.mak: new file. Makefile for building from the command-line. 121 122 * .cvsignore: Removed un-used entries related to MSVC. Added 123 entries to ignore directories generated by the NT build, Debug 124 and Release. 125 1261999-03-24 Larry Jones <larry.jones@sdrc.com> 127 and Olaf Brandes 128 129 * diff3.c (diff3_run): Use a separate stream for the input to 130 output_diff3_merge instead of reopening stdin to avoid problems 131 with leaving it open. 132 1331999-02-17 Jim Kingdon <http://www.cyclic.com> 134 and Hallvard B Furuseth. 135 136 * util.c: Use __STDC__ consistently with ./system.h. 137 * system.h: Add comment about PARAMS. 138 1391999-01-12 Jim Kingdon <http://www.cyclic.com> 140 141 * Makefile.in, analyze.c, cmpbuf.c, cmpbuf.h, context.c, diff.c, 142 diff.h, diff3.c, diffrun.h, dir.c, ed.c, io.c, normal.c, system.h, 143 util.c: Remove paragraph containing the old snail mail address of 144 the Free Software Foundation. 145 1461998-09-21 Jim Kingdon <kingdon@harvey.cyclic.com> 147 148 * util.c (printf_output): Make msg static; avoids auto 149 initializer, which is not portable to SunOS4 /bin/cc. 150 Reported by Mike Sutton@SAIC. 151 1521998-09-14 Jim Kingdon <kingdon@harvey.cyclic.com> 153 154 * Makefile.in (DISTFILES): Add diagmeet.note. 155 1561998-08-15 Jim Kingdon <kingdon@harvey.cyclic.com> 157 158 * diffrun.h (struct diff_callbacks): Change calling convention of 159 write_output so that a zero length means to output zero bytes. 160 The cvs_output convention is just too ugly/error-prone. 161 * util.c (printf_output): Rewrite to parse format string 162 overselves rather than calling vasprintf, which cannot be 163 implemented in portable C. 164 1651998-08-06 David Masterson of kla-tencor.com 166 167 * util.c (flush_output): Don't prototype. 168 169Thu Jul 2 16:34:38 1998 Ian Lance Taylor <ian@cygnus.com> 170 171 Simplify the callback interface: 172 * diffrun.h: Don't include <stdarg.h> or <varargs.h>. 173 (struct diff_callbacks): Remove printf_output field. 174 * util.c: Include <stdarg.h> or <varargs.h>. 175 (printf_output): Use vasprintf and write_output callback rather 176 than printf_output callback. 177 * diff3.c (read_diff): Don't set my_callbacks.printf_output. 178 179Thu Jun 18 12:43:53 1998 Ian Lance Taylor <ian@cygnus.com> 180 181 * diffrun.h: New file. 182 * diff.h: Include diffrun.h. 183 (callbacks): New EXTERN variable. 184 (write_output, printf_output, flush_output): Declare. 185 * diff.c (diff_run): Add parameter callbacks_arg. Use callback 186 functions rather than writing to stdout. Don't open a file if 187 there is a write_output callback. Call perror_with_name rather 188 than perror. 189 (usage): Use callbacks if defined rather than writing to stdout. 190 (compare_files): Call flush_output rather than fflush (outfile). 191 * diff3.c: Include diffrun.h. Change several functions to use 192 output functions from util.c rather than direct printing. Use 193 diff_error and friends rather than printing to stderr. Set global 194 variable outfile. 195 (outfile, callbacks): Declare. 196 (write_output, printf_output, flush_output): Declare. 197 (diff3_run): Add parameter callbacks_arg. Use callback functions 198 rather than writing to stdout. 199 (usage): Use callbacks if defined rather than writing to stdout. 200 (read_diff): Preserve callbacks and outfile around call to 201 diff_run. 202 * util.c (perror_with_name): Use error callback if defined. 203 (pfatal_with_name, diff_error): Likewise. 204 (message5): Use printf_output and write_output. 205 (print_message_queue, print_1_line, output_1_line): Likewise. 206 (begin_output): Reject paginate_flag if there are output 207 callbacks. 208 (write_output, printf_output, flush_output): New functions. 209 * context.c: Change all output to outfile to use printf_output and 210 write_output. 211 * ed.c: Likewise. 212 * ifdef.c: Likewise. 213 * normal.c: Likewise. 214 * side.c: Likewise. 215 * Makefile.in (SOURCES): Add diffrun.h. 216 ($(OBJECTS)): Depend upon diffrun.h. 217 218Fri Jan 16 14:58:19 1998 Larry Jones <larry.jones@sdrc.com> 219 220 * diff.c, diff3.c: Plug memory leaks. 221 222Thu Jan 15 13:36:46 1998 Jim Kingdon <kingdon@harvey.cyclic.com> 223 224 * Makefile.in (installdirs): New rule, for when ../Makefile 225 recurses into this directory (bug reported by W. L. Estes). 226 227Tue Nov 11 10:48:19 1997 Jim Kingdon <kingdon@harvey.cyclic.com> 228 229 * diff.c (diff_run): Change #ifdef on HAVE_SETMODE to #if to match 230 the other uses (fixes compilation error on unix). 231 232 * diff.c (diff_run): Don't set stdout to binary mode. 233 234Mon, 10 Nov 1997 Jim Kingdon 235 236 * diff.c (run_diff): Open outfile in binary mode if --binary. 237 238Thu Nov 6 12:42:12 1997 Karl Fogel <kfogel@floss.red-bean.com> 239 and Paul Eggert <eggert@twinsun.com> 240 241 * analyze.c: applied Paul Eggert's patch to fix the diff3 merge 242 bug described in ccvs/doc/DIFFUTILS-2.7-BUG: 243 (shift_boundaries): new var `inhibit_hunk_merge'; use it to 244 control something important that I don't quite understand, but 245 Paul apparently does, so that's okay. 246 247Sat Nov 1 14:17:57 1997 Michael L.H. Brouwer <michael@thi.nl> 248 249 * Makefile.in: Add call to ranlib to build a table of contents for 250 the library since some systems seem to require this. 251 2521997-10-28 Jim Kingdon 253 254 * .cvsignore: Add files du jour for Visual C++, vc50.pdb and vc50.idb. 255 256 * system.h: Define HAVE_TIME_H. 257 * dir.c [_WIN32]: Define CLOSEDIR_VOID. 258 2591997-10-18 Jim Kingdon 260 261 * build_diff.com: Add diff3.c 262 263Fri Sep 26 14:24:42 1997 Tim Pierce <twp@twp.tezcat.com> 264 265 * diff.c (diff_run): Save old value of optind before calling 266 getopt_long, then restore before returning. Eventually it would 267 be nice if diff_run were fully reentrant. 268 269 New diff3 library for CVS. 270 * Makefile.in (SOURCES): Add diff3.c. 271 (OBJECTS): Add diff3.o. 272 * diff3.c: New file, copied from diffutils-2.7. See diffutils for 273 earlier ChangeLogs. Undefine initialize_main macro. Remove <signal.h>. 274 (diff3_run): Renamed from main(). Add `outfile' argument. Remove 275 SIGCLD handling; we do not fork. Save optind and reset to 0 276 before calling getopt_long; restore after option processing done. 277 (read_diff): Use diff_run with a temporary output file, 278 instead of forking a diff subprocess and reading from a pipe. 279 Change DIFF_PROGRAM to "diff"; this argument is now used only for 280 diagnostic reporting. 281 (xmalloc, xrealloc): Removed. 282 (diff_program): Removed. 283 (diff_program_name): Made extern, so it may be used in other 284 library calls like `error'. 285 (initialize_main): New function. 286 287 Namespace munging. util.c defines both fatal() and 288 perror_with_exit(), but these cannot be used to abort diff3: both 289 attempt to longjmp() to a buffer set in diff.c, used only by 290 diff_run. This is an awful solution, but necessary until the code 291 can be cleaned up. (These functions do not *have* to be renamed, 292 since both are declared static to diff3.c and should not clash 293 with libdiff.a, but it reduces potential confusion.) 294 * diff3.c (diff3_fatal): Renamed from fatal. 295 (diff3_perror_with_exit): Renamed from perror_with_exit. 296 297 Eliminate exit calls. 298 (try_help): Change from `void' to `int'. Return, do not exit. 299 (diff3_fatal, diff3_perror_with_exit, process_diff): Change `exit' 300 to DIFF3_ABORT. 301 (diff3_run): Initialize jump buffer for nonlocal exits. Change 302 exit calls to returns. Change `perror_with_exit' to 303 `perror_with_name' and add a return. Change `fatal' to 304 `diff_error' and add a return. The reasoning is that we shouldn't 305 rely on setjmp/longjmp any more than necessary. 306 307 Redirect stdout. 308 (check_output): Renamed from check_stdout. Take stream argument 309 instead of blindly checking stdout. Do not close stream, but 310 merely fflush it. 311 (diff3_run): Initialize outstream, and close when done. Pass this 312 stream (instead of stdout) to output_diff3_edscript, 313 output_diff3_merge, and output_diff3. 314 315Thu Sep 25 14:34:22 1997 Jim Kingdon <kingdon@harvey.cyclic.com> 316 317 * util.c (begin_output, finish_output): If PR_PROGRAM is not 318 defined (VMS), just give a fatal error if --paginate specified. 319 320 * Makefile.in (DISTFILES): Add ChangeLog build_diff.com 321 Makefile.in. 322 * build_diff.com: New file. 323 324Wed Sep 24 10:27:00 1997 Jim Kingdon <kingdon@harvey.cyclic.com> 325 326 * Makefile.in: Also set top_srcdir. Needed to make today's other 327 Makefile.in change work. 328 329 * .cvsignore: New file. 330 331 * Makefile.in (COMPILE): Add -I options for srcdir (perhaps 332 unneeded) and change -I option for lib to use top_srcdir (needed 333 to avoid mixups with CVS's regex.h vs. the system one). 334 335Sun Sep 21 19:44:42 1997 Jim Kingdon <kingdon@harvey.cyclic.com> 336 337 * Makefile.in (util.o): Change util.c to $<, needed for srcdir. 338 339Sat Sep 20 12:06:41 1997 Tim Pierce <twp@twp.tezcat.com> 340 341 New diff library for CVS, based on diffutils-2.7. See diffutils 342 for earlier ChangeLogs. 343 * Makefile.in, analyze.c, cmpbuf.c, cmpbuf.h, config.hin, 344 context.c, diagmeet.note, diff.c, diff.h, dir.c, ed.c, ifdef.c, 345 io.c, normal.c, side.c, stamp-h.in, system.h, util.c, version.c: 346 New files. 347 (COMPILE): Add -I../lib, so we can get getopt.h. 348 349 * Makefile.in: Removed anything not related to libdiff.a. 350 (dist-dir): New target, copied from ../lib/Makefile.in. 351 (DISTFILES): New variable. 352 (SOURCES): Renamed from `srcs'. 353 (OBJECTS): Renamed from `libdiff_o'. 354 (Makefile): Changed dependencies to reflect 355 new, shallow config directory structure. 356 (stamp-h.in, config.h.in, config.h, stamp-h): Removed. 357 * stamp-h.in, config.h.in: Removed. 358 359 * system.h: Remove dup2 macro (provided by ../lib/dup2.c). 360 Include stdlib.h if STDC_HEADERS is defined (not just 361 HAVE_STDLIB_H). 362 363Sat Sep 20 05:32:18 1997 Tim Pierce <twp@twp.tezcat.com> 364 365 Diff librarification. 366 367 * diff.c (diff_run): New function, renamed from `main'. 368 Initialize `outfile' based on the value of the new `out' filename 369 argument. 370 (initialize_main): New function. 371 * system.h: Removed initialize_main macro. 372 * diffmain.c: New file. 373 * Makefile.in (diff): Added diffmain.o. 374 (libdiff): New target. 375 (AR, libdiff_o): New variables. libdiff_o does not include 376 xmalloc.o, fnmatch.o, getopt.o, getopt1.o, regex.o or error.o, 377 because these functions are already present in CVS. It will take 378 some work to make this more general-purpose. 379 380 Redirect standard output. 381 * util.c: Redirect stdout to outfile: change all naked `printf' 382 and `putchar' statements to `fprintf (outfile)' and `putc (..., 383 outfile)' throughout. This should permit redirecting diff output 384 by changing `outfile' just once in `diff_run'. 385 (output_in_progress): New variable. 386 (begin_output, finish_output): Use `output_in_progress', rather than 387 `outfile', as a semaphore to avoid reentrancy problems. 388 (finish_output): Close `outfile' only if paginate_flag is set. 389 * diff.c (check_output): New function, was check_stdout. Take a 390 `file' argument, and flush it instead of closing it. 391 (diff_run): Change check_stdout to check_output. 392 (compare_files): Fflush outfile, not stdout. 393 394 Eliminate exit statements. 395 * diff.h: Include setjmp.h. 396 (diff_abort_buf): New variable. 397 (DIFF_ABORT): New macro. 398 * diff.c (diff_run): Change all `exit' statements to `return'. 399 Set up diff_abort_buf, so we can abort diff without 400 terminating (for libdiff.a). 401 (try_help): Return int instead of void; do not exit. 402 * util.c (fatal): Use DIFF_ABORT instead of exit. 403 (pfatal_with_name): Use DIFF_ABORT instead of exit. 404 405 Namespace cleanup (rudimentary). Strictly speaking, this is not 406 necessary to make diff into a library. However, namespace 407 clashes between diff and CVS must be resolved immediately, since 408 CVS is the first application targeted for use with difflib. 409 410 * analyze.c, diff.c, diff.h, util.c (diff_error): Renamed from `error'. 411 412 * version.c, diff.c, diff.h, cmp.c, diff3.c, sdiff.c 413 (diff_version_string): Renamed from version_string. 414 * diff.c, util.c, diff.h, diff3.c, error.c (diff_program_name): 415 Renamed from program_name. 416 417 * util.c (xmalloc, xrealloc): Removed. 418 * Makefile.in (diff_o): Added error.o and xmalloc.o. 419 420