summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3/diff3prog.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Change all tame callers to namechange to pledge(2).deraadt2015-10-091-3/+3
* tame "stdio rpath" or tame "stdio" suffices for all of these programs.deraadt2015-10-051-1/+4
* Add brackets to clarify assignments that are the result of a test operator.jsg2015-09-051-2/+2
* trivial reallocarray() usederaadt2014-12-011-5/+5
* Include unistd.h as it is the standard location for getopt().millert2013-11-151-3/+4
* In preparation for getline and getdelim additions to libc, rename getline()fgsch2012-03-041-5/+5
* rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andderaadt2009-10-271-11/+1
* Properly check if temporary files have been successfully opened. If not,tobias2008-02-271-6/+6
* Proper use of fseek/fseeko macros.tobias2007-09-101-4/+4
* out-of-bounds access; ok otto@, millert@, deraadt@markus2005-11-221-4/+6
* Use dynamic memory instead of a fixed table. Makes merges files withotto2005-08-011-19/+57
* Use fgetln() to read lines so we are not limited to an arbitrarily smallmillert2005-03-301-31/+42
* Correctly test for cases where one file is different, and the other hascanacar2004-01-071-4/+4
* Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu>otto2003-11-091-5/+5
* dont compare int to NULL, millert@ okavsm2003-10-241-3/+3
* knfderaadt2003-07-141-31/+31
* A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitmillert2003-07-101-0/+566