summaryrefslogtreecommitdiffstats
path: root/usr.bin/rcs/diff3.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix merging of files that lack newlines for diff(3), OpenRCS, and OpenCVS.stsp2020-06-261-3/+10
* Amend previous fix; joris@ fixed the same bug in OpenCVS's diff3.c r1.47.stsp2019-08-101-2/+4
* Fix merge(1) of files which contain lines with leading dots.stsp2019-08-101-2/+2
* Using bitwise OR along with two assignments in the conditional ofmillert2016-10-181-2/+7
* Quiet compiler warnings; as applied to usr.bin/cvs by millert@okan2016-10-161-2/+2
* Pull in <time.h> for struct tm, used in rcs.hguenther2016-08-261-1/+2
* Allow rcsnum_free and buf_free to accept NULL and remove various NULLnicm2015-11-021-17/+9
* Add brackets to clarify assignments that are the result of a test operator.jsg2015-09-051-2/+2
* Convert xfree to free. From Fritjof Bornebusch. ok deraadtnicm2015-06-131-29/+15
* Replace <sys/param.h> with <limits.h> and other less dirty headers wherederaadt2015-01-161-2/+2
* An internal function called xrealloc() is actually a fail-hardderaadt2014-12-011-6/+6
* In preparation for getline and getdelim additions to libc, rename getline()fgsch2012-03-041-5/+5
* Remove some unneeded includes and dead code, from Michael W Bombardieri.nicm2011-04-201-2/+2
* Make BUFs autoextend by default. This was already done in OpenCVSray2010-07-281-11/+11
* Reduce variable/function name and whitespace differences betweenray2010-07-231-50/+54
* Rename a bunch of variables and functions, removing the cvs_/rcs_ray2010-07-231-3/+3
* rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andderaadt2009-10-271-12/+1
* Checking if a file is ASCII should only be done when diffing, becauseray2009-02-251-6/+6
* Make sure that temporary file has been successfully opened.tobias2008-03-021-7/+15
* increase the marker buffers, they are not big enough for hg mergetedu2007-12-231-3/+3
* Proper use of fseek/fseeko macros.tobias2007-09-101-4/+4
* Rename rcs_diffreg() to diffreg().ray2007-07-031-6/+6
* Sync revisions and time buffers size to be consistent with each others.xsa2007-06-301-3/+3
* Since xrealloc dies on failure it is safe to directly assign to theray2007-05-291-19/+11
* As done in OpenCVS, general includes cleanup sweep. OK otto@.xsa2007-02-271-3/+8
* Fix const inconsistencies, void pointer artithmetic;xsa2007-02-221-4/+4
* remove some un-needed buffer NUL-termination. in openrcs, diff3 is already NUL-terminating itsniallo2007-01-111-9/+2
* - fix support for checking out binary files.niallo2007-01-021-8/+41
* Check that string length != 0 before setting buf[strlen(buf) - 1].ray2006-10-241-2/+4
* Add support to rcsdiff for all the other diff flags thatmillert2006-09-211-6/+6
* correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.xsa2006-08-111-18/+22
* let ed_patch_lines work with a c command that encompasses the last lineespie2006-08-081-4/+5
* More strlcpy/strlcat -> snprintf/xasprintf cleanup.ray2006-08-071-7/+7
* Remove file mode argument from {cvs|rcs}_buf_write_stmp(). Weray2006-07-081-12/+12
* - correctly handle binary files; say bye bye to using c strings for deltatexts.niallo2006-06-031-23/+4
* missing bits for a working merge(1). Built and enabled.xsa2006-05-151-2/+119
* Remove (size_t) casts on integer constants.ray2006-05-101-6/+6
* check for rcs_diffreg() return value; OK ray@.xsa2006-05-081-4/+9
* fix error/verbose messages to match gnu/usr.bin/rcs when using rcsmerge(1).xsa2006-05-081-9/+6
* finish work wrt TMPDIR; use xasprintf() to simplify code while in there;xsa2006-05-041-23/+19
* respect TMPDIR; OK ray@.xsa2006-05-031-9/+19
* Check return values for all strlcpy, and strlcat calls.ray2006-04-291-15/+18
* zap util.[ch] and move the content into rcsutil.[ch].xsa2006-04-271-3/+3
* fork our code we shared between openrcs/cvs into the openrcs dir.joris2006-04-261-0/+806