summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff3.c
AgeCommit message (Expand)Author
2010-10-29Nuke some unused variables and remove an unnecessary call to dirname().Nicholas Marriott
2010-07-23Reduce variable/function name and whitespace differences betweenRay Lai
2010-07-23Rename a bunch of variables and functions, removing the cvs_/rcs_Ray Lai
2009-10-28rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andTheo de Raadt
2009-06-07More cvs/diff/rcs convergence:Ray Lai
2009-06-06Sync some rcsdiff changes to cvsdiff. As a side effect,Ray Lai
2008-03-09unused varJoris Vink
2008-03-08add checkout/update -j support.Joris Vink
2008-03-08correct usage of lseek(2);Joris Vink
2008-03-01when reopening the file pass the proper mode and reopen it usingJoris Vink
2008-02-29handle file permissions and owners properly.Joris Vink
2008-02-28nobody needs weird debug messagesJoris Vink
2008-02-27prevent file racesJoris Vink
2008-02-23reset overlapcnt at each cvs_merge_file() call so that files thatJoris Vink
2008-02-11Cleanup buf implementation:Tobias Stoeckmann
2007-09-17Imported atomicio interface.Tobias Stoeckmann
2007-09-10Proper use of fseek/fseeko macros.Tobias Stoeckmann
2007-06-28Sync revisions and time buffers size to be consistent with each others.Xavier Santolaria
2007-05-29Since xrealloc dies on failure it is safe to directly assign to theRay Lai
2007-02-22general includes cleanup sweep. ok joris@ niallo@Otto Moerbeek
2007-01-31snprintf() -> xsnprintf()Xavier Santolaria
2007-01-28add merging support in both local and remote sides.Joris Vink
2007-01-12major re-work of the RCS api. this results in 100x performance improvements ...Niall O'Higgins
2007-01-12complete binary support for opencvs,Joris Vink
2007-01-11rework opencvs so that we can deal with binary files. previously we assumed ...Niall O'Higgins
2006-11-10sync with usr.bin/rcs/diff3.cXavier Santolaria
2006-11-09respect TMPDIR here too, changes pulled in from usr.bin/rcs.Xavier Santolaria
2006-10-24Check that string length != 0 before setting buf[strlen(buf) - 1].Ray Lai
2006-07-08Remove file mode argument from {cvs|rcs}_buf_write_stmp(). WeRay Lai
2006-06-14add cvs_buf_load_fd() which does the same as cvs_buf_load()Joris Vink
2006-05-27commit the new opencvs code, i have been hacking onJoris Vink
2006-04-14more nasty spaces go bye byeTheo de Raadt
2006-04-05Use variable names for sizeof, remove casts in front of xmalloc,Ray Lai
2006-03-28Today is Integer Overflow Prevention Day:Ray Lai
2006-03-25Correct integer types, remove unused arguments, non-portable bitshiftsRay Lai
2006-03-16kill two unused variables.Xavier Santolaria
2006-03-14add an argument to cvs_diff3() to be able to handle verbosity ofXavier Santolaria
2006-03-06adapt informative message if we are sending output to stdout.Xavier Santolaria
2006-03-06if the submitted rev(s) is/are the same as the head rev, skip the processXavier Santolaria
2006-03-05oops, forgot the diff3.c portion of this diff:Niall O'Higgins
2006-02-26out-of-bounds access and correct some printf while here;Xavier Santolaria
2006-01-23snprintf() -> strlcpy()/strlcat(); OK niallo@.Xavier Santolaria
2006-01-02#include's cleanup; ok joris@ niallo@.Xavier Santolaria
2005-12-30knfReyk Floeter
2005-12-24remove useless cvs_buf_alloc() failure checks;Joris Vink
2005-12-20cvs_buf_putc() and cvs_buf_write_*() functions cannot fail anymore;Xavier Santolaria
2005-12-10switch to xmalloc stuff, me and xsa@ agreed on this a longJoris Vink
2005-12-03add very basic support for the following stuff:Joris Vink
2005-11-08missing casts;Xavier Santolaria
2005-10-26diff3_conflicts cleanup; joris okXavier Santolaria