![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / diff
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.34 / (download) - annotate - [select for diffs], Sun Nov 1 18:16:08 2020 UTC (3 years, 6 months ago) by jcs
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,
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,
HEAD
Changes since 1.33: +2 -2 lines
Diff to previous 1.33 (colored)
restore RCS id removed in 1.33
Revision 1.33 / (download) - annotate - [select for diffs], Mon Oct 5 20:15:00 2015 UTC (8 years, 7 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
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.32: +7 -10 lines
Diff to previous 1.32 (colored)
Remove the non-standard -l flag that pipes the output through pr(1). Based on a diff from and OK deraadt@
Revision 1.32 / (download) - annotate - [select for diffs], Sun Jun 7 08:39:13 2009 UTC (14 years, 11 months ago) by ray
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,
OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3,
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,
OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 (colored)
More cvs/diff/rcs convergence: 1. Mostly variable/function renaming, SIZE_T_MAX->SIZE_MAX, and spacing. 2. One strchr -> strncspn. 3. diff had a weird thing where it set file[12] = ofile[12] but never updated file or ofile, then if file and ofile were different it freed it. I removed it. OK millert
Revision 1.31 / (download) - annotate - [select for diffs], Sat Jun 6 15:37:28 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)
Oops, forgot to pass dflags to diffreg. Now the flags work again. OK millert
Revision 1.30 / (download) - annotate - [select for diffs], Sat Jun 6 15:00:27 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.29: +16 -6 lines
Diff to previous 1.29 (colored)
Pull changes from rcsdiff, similar to what was pulled into cvsdiff. OK millert
Revision 1.29 / (download) - annotate - [select for diffs], Thu Dec 9 18:56:10 2004 UTC (19 years, 5 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3,
OPENBSD_4_2_BASE,
OPENBSD_4_2,
OPENBSD_4_1_BASE,
OPENBSD_4_1,
OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9,
OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7
Changes since 1.28: +2 -2 lines
Diff to previous 1.28 (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.28 / (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.27: +6 -2 lines
Diff to previous 1.27 (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.27 / (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.26: +3 -1 lines
Diff to previous 1.26 (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.26 / (download) - annotate - [select for diffs], Wed Jan 7 17:18:32 2004 UTC (20 years, 4 months ago) by otto
Branch: MAIN
Changes since 1.25: +3 -3 lines
Diff to previous 1.25 (colored)
Implement -p option. "works here" millert@ ok miod@ deraadt@
Revision 1.25 / (download) - annotate - [select for diffs], Sun Nov 9 20:13:57 2003 UTC (20 years, 6 months ago) by otto
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)
Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu>
Revision 1.24 / (download) - annotate - [select for diffs], Tue Oct 7 23:37:27 2003 UTC (20 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.23: +2 -1 lines
Diff to previous 1.23 (colored)
Fix printing of "Only in foo" when foo is "/" (trailing slash removal was overzealous in this case). Fix tested by Hugo Villeneuve and myself.
Revision 1.23 / (download) - annotate - [select for diffs], Fri Aug 1 20:54:18 2003 UTC (20 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)
anychange is no longer extern; millert ok
Revision 1.22 / (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.21: +2 -2 lines
Diff to previous 1.21 (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.21 / (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.20: +3 -3 lines
Diff to previous 1.20 (colored)
Implement the -L and -T options from GNU diff.
Revision 1.20 / (download) - annotate - [select for diffs], Mon Jul 21 21:57:22 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.19: +4 -3 lines
Diff to previous 1.19 (colored)
POSIX-compliant output when there are two paths w/ the same name but one is a file and the other is a directory in -r mode (cosmetic).
Revision 1.19 / (download) - annotate - [select for diffs], Wed Jul 9 00:39:25 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.18: +4 -8 lines
Diff to previous 1.18 (colored)
Unlink temp file as soon as it is opened and return a FILE * for it so we don't have to worry about cleanup. This means the quit() signal handler and error/errorx can go away too. Move splice() out of diffreg() and into diff.c where it belongs since we don't want to be calling splice() for a directory diff. Add a check for mismatched paths (one file, one dir) in diffreg.c. deraadt@ OK
Revision 1.18 / (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.17: +16 -3 lines
Diff to previous 1.17 (colored)
Re-implement -l flag; diff -l now works correctly in non-directory mode (like GNU diff).
Revision 1.17 / (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.16: +2 -1 lines
Diff to previous 1.16 (colored)
Add -q option from GNU diff
Revision 1.16 / (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.15: +2 -2 lines
Diff to previous 1.15 (colored)
Implement -P from GNU diff (like -N but only for files that are missing from dir1).
Revision 1.15 / (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.14: +43 -50 lines
Diff to previous 1.14 (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.14 / (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.13: +2 -2 lines
Diff to previous 1.13 (colored)
Kill non-standard -l option as discussed with tedu@
Revision 1.13 / (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.12: +2 -2 lines
Diff to previous 1.12 (colored)
Kill diff -h, we don't use or want diffh. Discussed w/ tedu@
Revision 1.12 / (download) - annotate - [select for diffs], Fri Jul 4 02:54:36 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.11: +2 -3 lines
Diff to previous 1.11 (colored)
Some cosmetic fixes: o get rid of now-unused tempfile variable o move inifdef into diffreg.c (only used there) o correct a comment o use _PATH_DIFF, _PATH_DIFFH and _PATH_PR instead of variables set to them o get rid of hack to look for pr and diff in /bin
Revision 1.11 / (download) - annotate - [select for diffs], Thu Jun 26 22:04:45 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.10: +2 -2 lines
Diff to previous 1.10 (colored)
Remove cruft; We don't have the -I, -1 or -2 options anymore so we don't need the associated scaffolding. tedu@ OK
Revision 1.10 / (download) - annotate - [select for diffs], Thu Jun 26 18:19:29 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.9: +3 -1 lines
Diff to previous 1.9 (colored)
Fix temp file handling. o honor TMPDIR environment variable as per man page o need 2 temp files if both file1 and file2 are devices o add error() and errorx() which cleanup temp file and then call err() and errx() respectively. OK tedu@
Revision 1.9 / (download) - annotate - [select for diffs], Thu Jun 26 04:52:26 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.8: +4 -4 lines
Diff to previous 1.8 (colored)
Fix temp file handling and deal with the case where we might need 2 temp files.
Revision 1.8 / (download) - annotate - [select for diffs], Thu Jun 26 00:20:48 2003 UTC (20 years, 10 months ago) by tedu
Branch: MAIN
Changes since 1.7: +8 -57 lines
Diff to previous 1.7 (colored)
put all the flags and globals in diff.c, and declare externs in diff.h ok millert@
Revision 1.7 / (download) - annotate - [select for diffs], Wed Jun 25 21:43:49 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.6: +3 -4 lines
Diff to previous 1.6 (colored)
o use S_ISDIR instead of doing it by hand o rename talloc -> emalloc and ralloc -> erealloc o struct direct -> struct dirent (POSIX) o kill remaining strcpy() o fix unterminated string in setfile() deraadt@ OK
Revision 1.6 / (download) - annotate - [select for diffs], Wed Jun 25 17:49:22 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.5: +9 -6 lines
Diff to previous 1.5 (colored)
o use getopt() o use err/warn o only call done() when needed (after mkstemp) o add "-C lines" like GNU grep OK deraadt@
Revision 1.5 / (download) - annotate - [select for diffs], Wed Jun 25 07:26:59 2003 UTC (20 years, 10 months ago) by tedu
Branch: MAIN
Changes since 1.4: +1 -2 lines
Diff to previous 1.4 (colored)
remove silly signal catcher, and just use done. ok deraadt@
Revision 1.4 / (download) - annotate - [select for diffs], Wed Jun 25 03:37:32 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)
exit path signal race safe
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: +11 -5 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:38 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +36 -0 lines
Diff to previous 1.1 (colored)
caldera licenses
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.