#
ce7279d8 |
| 21-May-2024 |
jsg <jsg@openbsd.org> |
remove prototypes with no matching function and externs with no var partly checked by millert@
|
#
abb4f62a |
| 01-Nov-2020 |
jcs <jcs@openbsd.org> |
restore RCS id removed in 1.33
|
#
40e7295b |
| 05-Oct-2015 |
millert <millert@openbsd.org> |
Remove the non-standard -l flag that pipes the output through pr(1). Based on a diff from and OK deraadt@
|
#
57003866 |
| 07-Jun-2009 |
ray <ray@openbsd.org> |
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 neve
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
show more ...
|
#
3f8e756b |
| 06-Jun-2009 |
ray <ray@openbsd.org> |
Oops, forgot to pass dflags to diffreg. Now the flags work again.
OK millert
|
#
dba1d6ea |
| 06-Jun-2009 |
ray <ray@openbsd.org> |
Pull changes from rcsdiff, similar to what was pulled into cvsdiff.
OK millert
|
#
7bdb251c |
| 09-Dec-2004 |
millert <millert@openbsd.org> |
If the -L option is specified twice, use it for the second filename like GNU diff does. Adapted from a diff by YAMAMOTO Takashi
|
#
ccd55a2c |
| 20-Jun-2004 |
otto <otto@openbsd.org> |
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@
|
#
5f4c3fa8 |
| 16-Mar-2004 |
millert <millert@openbsd.org> |
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 anyt
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@
show more ...
|
#
96e45528 |
| 07-Jan-2004 |
otto <otto@openbsd.org> |
Implement -p option.
"works here" millert@ ok miod@ deraadt@
|
#
8fa21293 |
| 09-Nov-2003 |
otto <otto@openbsd.org> |
Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu>
|
#
4893e147 |
| 07-Oct-2003 |
millert <millert@openbsd.org> |
Fix printing of "Only in foo" when foo is "/" (trailing slash removal was overzealous in this case). Fix tested by Hugo Villeneuve and myself.
|
#
6681be91 |
| 01-Aug-2003 |
deraadt <deraadt@openbsd.org> |
anychange is no longer extern; millert ok
|
#
6e18f850 |
| 27-Jul-2003 |
otto <otto@openbsd.org> |
- 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 hi
- 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@
show more ...
|
#
1f9aa9e0 |
| 22-Jul-2003 |
millert <millert@openbsd.org> |
Implement the -L and -T options from GNU diff.
|
#
fed3a06d |
| 21-Jul-2003 |
millert <millert@openbsd.org> |
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).
|
#
7b6ec9e4 |
| 09-Jul-2003 |
millert <millert@openbsd.org> |
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
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
show more ...
|
#
b4bca33f |
| 09-Jul-2003 |
millert <millert@openbsd.org> |
Re-implement -l flag; diff -l now works correctly in non-directory mode (like GNU diff).
|
#
cab5d83c |
| 06-Jul-2003 |
millert <millert@openbsd.org> |
Add -q option from GNU diff
|
#
aeb82612 |
| 06-Jul-2003 |
millert <millert@openbsd.org> |
Implement -P from GNU diff (like -N but only for files that are missing from dir1).
|
#
4ec4b3d5 |
| 06-Jul-2003 |
millert <millert@openbsd.org> |
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
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@
show more ...
|
#
e1b11c9e |
| 04-Jul-2003 |
millert <millert@openbsd.org> |
Kill non-standard -l option as discussed with tedu@
|
#
1ba31747 |
| 04-Jul-2003 |
millert <millert@openbsd.org> |
Kill diff -h, we don't use or want diffh. Discussed w/ tedu@
|
#
c5b7f864 |
| 04-Jul-2003 |
millert <millert@openbsd.org> |
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
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
show more ...
|
#
90f56ad8 |
| 26-Jun-2003 |
millert <millert@openbsd.org> |
Remove cruft; We don't have the -I, -1 or -2 options anymore so we don't need the associated scaffolding. tedu@ OK
|