summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | occurrences to get_line(). Based on a diff from Jan Klemkow <j-dot-klemkow-at-wemelug-dot-de> to tech.
* rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andderaadt2009-10-271-11/+1
| | | | | | | unmaintainable). these days, people use source. these id's do not provide any benefit, and do hurt the small install media (the 33,000 line diff is essentially mechanical) ok with the idea millert, ok dms
* Properly check if temporary files have been successfully opened. If not,tobias2008-02-271-6/+6
| | | | | | print error message on stderr (instead of stdout). ok millert, ray, tedu
* Proper use of fseek/fseeko macros.tobias2007-09-101-4/+4
| | | | OK joris@, otto@
* convert to new .Dd format;jmc2007-05-311-2/+2
|
* sort options + sync usage();jmc2006-02-222-19/+19
|
* add -- after options, so files with leading - work.tedu2006-01-281-4/+4
| | | | pr 4993 from jason.
* +.Xr sdiff 1 ,jmc2005-12-271-2/+3
|
* 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
| | | | | lots of changes possible. While there, kill an off-by-one. Report and testing by Alexander Bluhm. ok millert@
* Use fgetln() to read lines so we are not limited to an arbitrarily smallmillert2005-03-301-31/+42
| | | | line length. OK otto@
* - add shell prompt to command examplejaredy2004-07-071-3/+3
| | | | | | - fix location of real diff3prog ok jmc@ otto@
* Correctly test for cases where one file is different, and the other hascanacar2004-01-071-4/+4
| | | | | | no more changes. ok millert@
* 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
|
* - fix rcs Xr; from Jared Yanovichjmc2003-10-241-12/+11
| | | | | | | - correct order for sections - remove unnecessary .Pp and -compact from display - kill some double spacing - sort SEE ALSO
* Fix botched conversion to getopts; markus@millert2003-07-311-5/+8
|
* Install diff3.ksh with the correct name; noticed by Theomillert2003-07-221-2/+2
|
* knfderaadt2003-07-142-33/+33
|
* A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitmillert2003-07-104-0/+840
(KNF and -Wall) and rewrote the shell front-end.