summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/diff3.c
AgeCommit message (Expand)Author
2011-04-20Remove some unneeded includes and dead code, from Michael W Bombardieri.Nicholas Marriott
2010-07-28Make BUFs autoextend by default. This was already done in OpenCVSRay Lai
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-02-25Checking if a file is ASCII should only be done when diffing, becauseRay Lai
2008-03-02Make sure that temporary file has been successfully opened.Tobias Stoeckmann
2007-12-23increase the marker buffers, they are not big enough for hg mergeTed Unangst
2007-09-10Proper use of fseek/fseeko macros.Tobias Stoeckmann
2007-07-03Rename rcs_diffreg() to diffreg().Ray Lai
2007-06-30Sync 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-27As done in OpenCVS, general includes cleanup sweep. OK otto@.Xavier Santolaria
2007-02-22Fix const inconsistencies, void pointer artithmetic;Xavier Santolaria
2007-01-11remove some un-needed buffer NUL-termination. in openrcs, diff3 is already N...Niall O'Higgins
2007-01-02- fix support for checking out binary files.Niall O'Higgins
2006-10-24Check that string length != 0 before setting buf[strlen(buf) - 1].Ray Lai
2006-09-21Add support to rcsdiff for all the other diff flags thatTodd C. Miller
2006-08-11correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.Xavier Santolaria
2006-08-08let ed_patch_lines work with a c command that encompasses the last lineMarc Espie
2006-08-07More strlcpy/strlcat -> snprintf/xasprintf cleanup.Ray Lai
2006-07-08Remove file mode argument from {cvs|rcs}_buf_write_stmp(). WeRay Lai
2006-06-03- correctly handle binary files; say bye bye to using c strings for deltatexts.Niall O'Higgins
2006-05-15missing bits for a working merge(1). Built and enabled.Xavier Santolaria
2006-05-10Remove (size_t) casts on integer constants.Ray Lai
2006-05-08check for rcs_diffreg() return value; OK ray@.Xavier Santolaria
2006-05-08fix error/verbose messages to match gnu/usr.bin/rcs when using rcsmerge(1).Xavier Santolaria
2006-05-04finish work wrt TMPDIR; use xasprintf() to simplify code while in there;Xavier Santolaria
2006-05-03respect TMPDIR; OK ray@.Xavier Santolaria
2006-04-29Check return values for all strlcpy, and strlcat calls.Ray Lai
2006-04-27zap util.[ch] and move the content into rcsutil.[ch].Xavier Santolaria
2006-04-26fork our code we shared between openrcs/cvs into the openrcs dir.Joris Vink
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 23:08:45 +0000