![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / diff
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.51 / (download) - annotate - [select for diffs], Thu Jan 5 00:00:44 2023 UTC (16 months, 1 week ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
HEAD
Changes since 1.50: +7 -7 lines
Diff to previous 1.50 (colored)
Delete remnants of removed "diff -l" option. From Nathan Houghton
Revision 1.50 / (download) - annotate - [select for diffs], Mon Mar 8 02:47:27 2021 UTC (3 years, 2 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9
Changes since 1.49: +4 -3 lines
Diff to previous 1.49 (colored)
Add some references, most of these were removed when we stopped building and installing USD/SMM/PSD docs. jmc@ agrees with the direction, ok millert@ on an earlier diff
Revision 1.49 / (download) - annotate - [select for diffs], Sat Feb 8 01:09:58 2020 UTC (4 years, 3 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7
Changes since 1.48: +3 -3 lines
Diff to previous 1.48 (colored)
correct Research Unix edition "appeared in" use in HISTORY Starting from "Combined Table of Contents" in Doug McIlroy's "A Research UNIX Reader" a table of which edition manuals appeared in. Checked against manuals from bitsavers/TUHS and source from TUHS where available. Ingo points out there are cases where something is included but not documented until a later release. bcd(6) v6 v7 printf(3) v2 v4 abort(3) v5 v6 system(3) v6 v7 fmod(3) v5 v6 ok schwarze@
Revision 1.48 / (download) - annotate - [select for diffs], Wed Mar 20 04:38:10 2019 UTC (5 years, 2 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5
Changes since 1.47: +6 -9 lines
Diff to previous 1.47 (colored)
remove incorrect escaping of '+', correctly escape '-', and garbage collect .Tn
Revision 1.47 / (download) - annotate - [select for diffs], Tue Nov 24 19:35:41 2015 UTC (8 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.46: +2 -2 lines
Diff to previous 1.46 (colored)
fix an error in the text; from donald allen ok millert
Revision 1.46 / (download) - annotate - [select for diffs], Mon Oct 26 17:56:20 2015 UTC (8 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.45: +3 -6 lines
Diff to previous 1.45 (colored)
no more TMPDIR;
Revision 1.45 / (download) - annotate - [select for diffs], Mon Oct 26 12:52:27 2015 UTC (8 years, 6 months ago) by tedu
Branch: MAIN
Changes since 1.44: +2 -13 lines
Diff to previous 1.44 (colored)
remove TMPDIR support. ok millert
Revision 1.44 / (download) - annotate - [select for diffs], Mon Oct 5 20:15:00 2015 UTC (8 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.43: +3 -11 lines
Diff to previous 1.43 (colored)
Remove the non-standard -l flag that pipes the output through pr(1). Based on a diff from and OK deraadt@
Revision 1.43 / (download) - annotate - [select for diffs], Thu Feb 13 14:52:53 2014 UTC (10 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7,
OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.42: +7 -4 lines
Diff to previous 1.42 (colored)
TMPDIR is an extension; while here, converting \*(Gt to >, in accordance with some advice from ingo
Revision 1.42 / (download) - annotate - [select for diffs], Tue Jul 16 06:52:05 2013 UTC (10 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)
where "-" represents stdin, just use Sq, not Fl, since it's not a flag; from Jan Stary
Revision 1.41 / (download) - annotate - [select for diffs], Sun Jan 20 11:19:12 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.40: +2 -18 lines
Diff to previous 1.40 (colored)
remove obsolete BUGS (cmp is not run internally); ok otto
Revision 1.40 / (download) - annotate - [select for diffs], Thu Feb 3 08:19:55 2011 UTC (13 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9
Changes since 1.39: +10 -2 lines
Diff to previous 1.39 (colored)
add a reference to the "An Algorithm for Differential File Comparison" paper; diff originally from Daniel Dickman, but otto suggested this paper ok otto millert
Revision 1.39 / (download) - annotate - [select for diffs], Fri Sep 3 11:09:28 2010 UTC (13 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.38: +4 -4 lines
Diff to previous 1.38 (colored)
add an EXIT STATUS section for /usr/bin;
Revision 1.38 / (download) - annotate - [select for diffs], Wed Aug 18 16:25:20 2010 UTC (13 years, 9 months ago) by schwarze
Branch: MAIN
Changes since 1.37: +4 -6 lines
Diff to previous 1.37 (colored)
Add a cross reference to patch(1) as suggested by Thomas de Grivel <billitch at gmail dot com> on tech@. While here, remove the SEE ALSO entries (but not the cross references at the appropriate places!) to fnmatch(3), re_format(7), and pr(1). Their relevance is restricted to one single option each, the latter is mostly obsolete nowadays anyway, and the number of SEE ALSO entries is so large that SEE ALSO is starting to look confusing. "yes" jmc@
Revision 1.37 / (download) - annotate - [select for diffs], Sun Feb 21 15:24:01 2010 UTC (14 years, 2 months ago) by sobrado
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.36: +9 -9 lines
Diff to previous 1.36 (colored)
`-q' is an output option, hence it is mutually exclusive. ok jmc@
Revision 1.36 / (download) - annotate - [select for diffs], Mon Nov 9 13:34:59 2009 UTC (14 years, 6 months ago) by sobrado
Branch: MAIN
Changes since 1.35: +3 -3 lines
Diff to previous 1.35 (colored)
move mutually exclusive options (-c, -e, -f, -n and -u) to the right place. ok jmc@
Revision 1.35 / (download) - annotate - [select for diffs], Sun Feb 8 17:33:01 2009 UTC (15 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5
Changes since 1.34: +3 -3 lines
Diff to previous 1.34 (colored)
updates to IEEE Std 1003.1-2008;
Revision 1.34 / (download) - annotate - [select for diffs], Sun Feb 8 17:15:09 2009 UTC (15 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)
bump the posix reference in STANDARDS to IEEE Std 1003.1-2008, with a few updates to follow;
Revision 1.33 / (download) - annotate - [select for diffs], Thu May 31 19:20:09 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3,
OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)
convert to new .Dd format;
Revision 1.32 / (download) - annotate - [select for diffs], Wed May 30 04:41:33 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.31: +7 -3 lines
Diff to previous 1.31 (colored)
- use a consistent text for STANDARDS - note which options are extensions to POSIX
Revision 1.31 / (download) - annotate - [select for diffs], Thu Mar 1 21:48:32 2007 UTC (17 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.30: +44 -46 lines
Diff to previous 1.30 (colored)
sort options/synopsis/usage(); from Igor Sobrado
Revision 1.30 / (download) - annotate - [select for diffs], Fri May 5 14:54:14 2006 UTC (18 years ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0
Changes since 1.29: +4 -4 lines
Diff to previous 1.29 (colored)
- no need to escape these
Revision 1.29 / (download) - annotate - [select for diffs], Tue Dec 27 12:48:56 2005 UTC (18 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE,
OPENBSD_3_9
Changes since 1.28: +2 -1 lines
Diff to previous 1.28 (colored)
+.Xr sdiff 1 ,
Revision 1.28 / (download) - annotate - [select for diffs], Thu Jan 6 00:28:53 2005 UTC (19 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7
Changes since 1.27: +11 -2 lines
Diff to previous 1.27 (colored)
clarify what -a does; prod and ok deraadt@
Revision 1.27 / (download) - annotate - [select for diffs], Thu Dec 9 18:56:10 2004 UTC (19 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.26: +3 -2 lines
Diff to previous 1.26 (colored)
If the -L option is specified twice, use it for the second filename like GNU diff does. Adapted from a diff by YAMAMOTO Takashi
Revision 1.26 / (download) - annotate - [select for diffs], Sun Jun 20 18:47:45 2004 UTC (19 years, 11 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE,
OPENBSD_3_6
Changes since 1.25: +35 -14 lines
Diff to previous 1.25 (colored)
Implement -I option: ignore changes matching a set of regexes. From Jared Yanovich, with twists from millert@ and me. Testing by brad@, sturm@ and pval@. ok millert@
Revision 1.25 / (download) - annotate - [select for diffs], Tue Mar 16 00:40:34 2004 UTC (20 years, 2 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5
Changes since 1.24: +4 -1 lines
Diff to previous 1.24 (colored)
POSIX specifies that in directory mode device special files and FIFOs shall be skipped. Other types of files may be skipped too (this is implementation-dependent). In directory mode, just skip anything that is not a regular file or directory. OK tedu@
Revision 1.24 / (download) - annotate - [select for diffs], Sun Jan 25 14:48:32 2004 UTC (20 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)
use new .St macro;
Revision 1.23 / (download) - annotate - [select for diffs], Wed Jan 7 17:19:05 2004 UTC (20 years, 4 months ago) by otto
Branch: MAIN
Changes since 1.22: +11 -5 lines
Diff to previous 1.22 (colored)
Document -p option. ok jmc@
Revision 1.22 / (download) - annotate - [select for diffs], Thu Sep 18 09:38:33 2003 UTC (20 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.21: +6 -6 lines
Diff to previous 1.21 (colored)
- move `-d' to comparison options, rather then output options - note (again) that output options are mutually exclusive from Andy Isaacson (PR 3479)
Revision 1.21 / (download) - annotate - [select for diffs], Sun Sep 7 18:50:58 2003 UTC (20 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)
- add -P to SYNOPSIS - remove "mutually exclusive" clause - -c produces 15 *'s, not a dozen - add -a to uage() - sync usage() with SYNOPSIS ok tedu@
Revision 1.20 / (download) - annotate - [select for diffs], Sun Jul 27 18:32:49 2003 UTC (20 years, 9 months ago) by otto
Branch: MAIN
Changes since 1.19: +4 -4 lines
Diff to previous 1.19 (colored)
Start new sentence on a new line. ok jmc@
Revision 1.19 / (download) - annotate - [select for diffs], Sun Jul 27 07:39:52 2003 UTC (20 years, 9 months ago) by otto
Branch: MAIN
Changes since 1.18: +12 -7 lines
Diff to previous 1.18 (colored)
- Use a heuristic to bound memory and cpu usage, at the cost of producing suboptimal diffs for large file containing lots of changes. Switch heuristic off with -d/--minimal (GNU compatible). Some hints from millert@. - Improve performance by reducing the number of realloc(3) calls. ok millert@ tedu@
Revision 1.18 / (download) - annotate - [select for diffs], Tue Jul 22 01:23:51 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.17: +1 -12 lines
Diff to previous 1.17 (colored)
Fixed the "dot alone on a line" bug.
Revision 1.17 / (download) - annotate - [select for diffs], Tue Jul 22 01:22:07 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.16: +6 -12 lines
Diff to previous 1.16 (colored)
Bring FILES section up to date.
Revision 1.16 / (download) - annotate - [select for diffs], Tue Jul 22 01:16:01 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.15: +27 -15 lines
Diff to previous 1.15 (colored)
Implement the -L and -T options from GNU diff.
Revision 1.15 / (download) - annotate - [select for diffs], Mon Jul 21 23:18:21 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.14: +7 -1 lines
Diff to previous 1.14 (colored)
Add STANDARDS section
Revision 1.14 / (download) - annotate - [select for diffs], Wed Jul 9 00:07:44 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.13: +15 -6 lines
Diff to previous 1.13 (colored)
Re-implement -l flag; diff -l now works correctly in non-directory mode (like GNU diff).
Revision 1.13 / (download) - annotate - [select for diffs], Sun Jul 6 22:17:21 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.12: +9 -6 lines
Diff to previous 1.12 (colored)
Add -q option from GNU diff
Revision 1.12 / (download) - annotate - [select for diffs], Sun Jul 6 22:02:36 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.11: +7 -1 lines
Diff to previous 1.11 (colored)
Implement -P from GNU diff (like -N but only for files that are missing from dir1).
Revision 1.11 / (download) - annotate - [select for diffs], Sun Jul 6 20:48:59 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.10: +28 -5 lines
Diff to previous 1.10 (colored)
Some fairly major changes:
o -N is implemented
o -X is implemented
o -x is implemented
o diff.c has been rewritten and GNU long options are now supported
o diffdir.c has been rewritten
+ no longer does fork + exec of /usr/bin/diff
+ can be called recursively (and will be for -r)
o diff.h
+ don't include any .h files here any more, do it in the .c files
+ no Bell Labs code in this, gets a UCB copyright (the 32v sources
only have a diff.c and there is nothing in common).
o diffreg.c
+ most all remaining globals are now private to diffreg.c
+ files are only opened once
+ dynamically allocated objects are either freed or realloced
+ added missing UCB copyright (there were lots of UCB changes)
+ print correct thing when -s is specified
OK deraadt@
Revision 1.10 / (download) - annotate - [select for diffs], Fri Jul 4 17:50:24 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.9: +1 -11 lines
Diff to previous 1.9 (colored)
Kill non-standard -l option as discussed with tedu@
Revision 1.9 / (download) - annotate - [select for diffs], Fri Jul 4 17:37:07 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.8: +3 -15 lines
Diff to previous 1.8 (colored)
Kill diff -h, we don't use or want diffh. Discussed w/ tedu@
Revision 1.8 / (download) - annotate - [select for diffs], Sat Jun 28 18:33:39 2003 UTC (20 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)
tweak; ok tedu@
Revision 1.7 / (download) - annotate - [select for diffs], Fri Jun 27 20:28:13 2003 UTC (20 years, 10 months ago) by tedu
Branch: MAIN
Changes since 1.6: +8 -6 lines
Diff to previous 1.6 (colored)
-a to force ascii compare. ok millert
Revision 1.6 / (download) - annotate - [select for diffs], Thu Jun 26 04:53:02 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.5: +61 -24 lines
Diff to previous 1.5 (colored)
Update with unidiff info and make FILES section fit reality. With input from jmc@
Revision 1.5 / (download) - annotate - [select for diffs], Wed Jun 25 18:52:46 2003 UTC (20 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.4: +89 -74 lines
Diff to previous 1.4 (colored)
cleanup; ok deraadt@
Revision 1.4 / (download) - annotate - [select for diffs], Wed Jun 25 16:10:05 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +2 -6 lines
Diff to previous 1.3 (colored)
this can be 3 term; gwyllion@ace.ulyssis.org
Revision 1.3 / (download) - annotate - [select for diffs], Wed Jun 25 03:02:33 2003 UTC (20 years, 10 months ago) by tedu
Branch: MAIN
Changes since 1.2: +1 -0 lines
Diff to previous 1.2 (colored)
cleanup. ansi, headers, correct prototypes, some safer string and tempfile functions, whitespace, ... no functional improvements yet
Revision 1.2 / (download) - annotate - [select for diffs], Wed Jun 25 01:23:30 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +95 -110 lines
Diff to previous 1.1 (colored)
man page from 4.4lite2
Revision 1.1 / (download) - annotate - [select for diffs], Wed Jun 25 01:20:52 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
4.3reno diff. This is free because of the Caldera license. Nasty, but a place to start.