OpenBSD CVS

CVS log for src/usr.bin/cvs/diff_internals.c


[BACK] Up to [local] / src / usr.bin / cvs

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.40 / (download) - annotate - [select for diffs], Fri Jun 28 13:35:00 2019 UTC (4 years, 10 months ago) by deraadt
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, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, HEAD
Changes since 1.39: +6 -6 lines
Diff to previous 1.39 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.39 / (download) - annotate - [select for diffs], Sat Oct 15 22:20:17 2016 UTC (7 years, 7 months ago) by millert
Branch: MAIN
CVS Tags: 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
Changes since 1.38: +3 -3 lines
Diff to previous 1.38 (colored)

Quiet compiler warnings.  OK tomc@ tb@

Revision 1.38 / (download) - annotate - [select for diffs], Thu Nov 5 09:48:21 2015 UTC (8 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.37: +9 -8 lines
Diff to previous 1.37 (colored)

Remove xfree(), like already done for RCS. From Michael W Bombardieri,
ok mmcc

Revision 1.37 / (download) - annotate - [select for diffs], Thu Feb 5 12:59:57 2015 UTC (9 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.36: +2 -1 lines
Diff to previous 1.36 (colored)

Include stdint.h, not limits.h to get SIZE_MAX.  OK guenther@

Revision 1.36 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:07 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.35: +14 -11 lines
Diff to previous 1.35 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.35 / (download) - annotate - [select for diffs], Mon Dec 1 21:58:46 2014 UTC (9 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.34: +9 -9 lines
Diff to previous 1.34 (colored)

An internal function called xrealloc() is actually a fail-hard
reallocarray()... so rename it.

Revision 1.34 / (download) - annotate - [select for diffs], Fri Apr 1 17:25:26 2011 UTC (13 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: 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
Changes since 1.33: +9 -6 lines
Diff to previous 1.33 (colored)

Move an isqrt() call outside a macro, from Michael W Bombardieri.

ok ray

Revision 1.33 / (download) - annotate - [select for diffs], Wed Jul 28 21:19:30 2010 UTC (13 years, 9 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.32: +12 -12 lines
Diff to previous 1.32 (colored)

Support -U and -C to specify the context length for "cvs diff".

This doesn't alter cvs rdiff, where -U and -C are not support by GNU
cvs.

ok sthen zinovik

Revision 1.32 / (download) - annotate - [select for diffs], Fri Jul 23 21:46:05 2010 UTC (13 years, 9 months ago) by ray
Branch: MAIN
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

Reduce variable/function name and whitespace differences between
cvs/rcs.

OK xsa zinovik

Revision 1.31 / (download) - annotate - [select for diffs], Fri Jul 16 17:53:20 2010 UTC (13 years, 10 months ago) by ray
Branch: MAIN
Changes since 1.30: +5 -9 lines
Diff to previous 1.30 (colored)

Combine two diff_output lines into one, from diff.

OK stsp xsa nicm

Revision 1.30 / (download) - annotate - [select for diffs], Thu Jul 15 18:23:50 2010 UTC (13 years, 10 months ago) by ray
Branch: MAIN
Changes since 1.29: +3 -6 lines
Diff to previous 1.29 (colored)

Die immediately if pread fails. It's a fatal error so treat it as
such. Besides, we weren't handling the NULL being returned.

From diff. Minor nit by nicm.

OK xsa stsp nicm

Revision 1.29 / (download) - annotate - [select for diffs], Thu Jul 15 11:10:23 2010 UTC (13 years, 10 months ago) by ray
Branch: MAIN
Changes since 1.28: +4 -5 lines
Diff to previous 1.28 (colored)

Sync with diff/diffreg.c r1.75:
Return -1 on error as advertised.
Handle case when only one stream failed.

OK xsa, stsp

Revision 1.28 / (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_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.27: +9 -13 lines
Diff to previous 1.27 (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.27 / (download) - annotate - [select for diffs], Sat Jun 6 14:17:27 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.26: +72 -72 lines
Diff to previous 1.26 (colored)

Sync some rcsdiff changes to cvsdiff.  As a side effect,
cvs diff -t now works.  There should be no functional change
otherwise.

OK millert

Revision 1.26 / (download) - annotate - [select for diffs], Tue Apr 28 09:05:40 2009 UTC (15 years ago) by sthen
Branch: MAIN
Changes since 1.25: +14 -10 lines
Diff to previous 1.25 (colored)

support some additional diff options: -a, -b, -d, -w
ok joris@

Revision 1.25 / (download) - annotate - [select for diffs], Wed Jun 11 03:38:28 2008 UTC (15 years, 11 months ago) by tobias
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.24: +2 -8 lines
Diff to previous 1.24 (colored)

Removed bogus var definition.

ok joris

Revision 1.24 / (download) - annotate - [select for diffs], Wed Jun 11 02:19:13 2008 UTC (15 years, 11 months ago) by tobias
Branch: MAIN
Changes since 1.23: +18 -17 lines
Diff to previous 1.23 (colored)

Avoid possible NULL pointer dereferences by using reentrant versions
of time functions.

ok joris

Revision 1.23 / (download) - annotate - [select for diffs], Tue Jun 10 05:01:36 2008 UTC (15 years, 11 months ago) by tobias
Branch: MAIN
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)

We have a cvs_buf_puts implementation now, also use cvs_buf_putc instead
of cvs_buf_append where appropiate.

ok joris

Revision 1.22 / (download) - annotate - [select for diffs], Fri May 30 11:06:17 2008 UTC (15 years, 11 months ago) by tobias
Branch: MAIN
Changes since 1.21: +9 -6 lines
Diff to previous 1.21 (colored)

diff -D support, also a change in diff_internals to properly print
file name or /dev/null, if file has been removed or added.

Revision 1.21 / (download) - annotate - [select for diffs], Thu Apr 24 19:13:56 2008 UTC (16 years ago) by tobias
Branch: MAIN
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Use a fixed string in case of vasprintf() error instead of relying on
strerror().  Although our vasprintf() sets errno, we cannot rely on it on
other systems.

ok ray (who spotted this issue), xsa

Revision 1.20 / (download) - annotate - [select for diffs], Sat Mar 8 11:53:36 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)

correct usage of lseek(2);

Revision 1.19 / (download) - annotate - [select for diffs], Wed Feb 27 22:34:04 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.18: +23 -7 lines
Diff to previous 1.18 (colored)

prevent file races

ok tobias@

Revision 1.18 / (download) - annotate - [select for diffs], Sun Feb 3 18:59:44 2008 UTC (16 years, 3 months ago) by tobias
Branch: MAIN
Changes since 1.17: +8 -13 lines
Diff to previous 1.17 (colored)

Diff header complies to GNU cvs now.

OK joris@

Revision 1.17 / (download) - annotate - [select for diffs], Sun Feb 3 18:18:44 2008 UTC (16 years, 3 months ago) by tobias
Branch: MAIN
Changes since 1.16: +96 -35 lines
Diff to previous 1.16 (colored)

Added rdiff support.  In order to do this, some output and option fixes
had to be done for diff, too.

OK joris@

Revision 1.16 / (download) - annotate - [select for diffs], Thu Jan 31 20:11:28 2008 UTC (16 years, 3 months ago) by tobias
Branch: MAIN
Changes since 1.15: +2 -1 lines
Diff to previous 1.15 (colored)

vasprintf requires stdio.h

Revision 1.15 / (download) - annotate - [select for diffs], Sat Sep 22 15:38:30 2007 UTC (16 years, 8 months ago) by joris
Branch: MAIN
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)

fix error message output, it caused diffs to be formed incorrectly
when no newline was present.

Revision 1.14 / (download) - annotate - [select for diffs], Fri Jun 29 05:04:40 2007 UTC (16 years, 10 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.13: +69 -75 lines
Diff to previous 1.13 (colored)

Sync cvs/rcs diff code.

OK joris and xsa.

Revision 1.13 / (download) - annotate - [select for diffs], Wed May 30 03:30:21 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

Remove cand structure (but not its definition).

Revision 1.12 / (download) - annotate - [select for diffs], Wed May 30 03:24:54 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.11: +1 -8 lines
Diff to previous 1.11 (colored)

Remove unused struct diff_arg.

Revision 1.11 / (download) - annotate - [select for diffs], Wed May 30 02:21:20 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.10: +14 -12 lines
Diff to previous 1.10 (colored)

Sync rcsdiff -> cvs diff

Surprisingly, rcsdiff has nicer code than cvs diff.  Changes:
1. Include sys/param.h because we are using MIN/MAX... not sure why
   it hasn't complained in the past.
2. Use fstat instead of stat.
3. Remove useless casts and __inline.
4. Plug a memory leak.

OK niallo@

Revision 1.10 / (download) - annotate - [select for diffs], Tue May 29 08:02:59 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.9: +3 -5 lines
Diff to previous 1.9 (colored)

Get rid of another useless variable, another difference between our
diff code and diff(1).

OK niallo@

Revision 1.9 / (download) - annotate - [select for diffs], Tue May 29 00:19:10 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.8: +11 -22 lines
Diff to previous 1.8 (colored)

Since xrealloc dies on failure it is safe to directly assign to the
original pointer.  Theo agrees, and so does the rest of the tree
(ssh, etc. all do this already).

Saves a bunch of variables and assignments.

OK niallo@

Revision 1.8 / (download) - annotate - [select for diffs], Mon May 28 23:02:40 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)

Some spacing syncs with diff(1).

Revision 1.7 / (download) - annotate - [select for diffs], Mon May 28 22:12:44 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

"in formation" -> "information"

OK niallo@

Revision 1.6 / (download) - annotate - [select for diffs], Mon May 28 22:07:40 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.5: +5 -5 lines
Diff to previous 1.5 (colored)

Line up comments with the rest of the file, like in diff(1).

Revision 1.5 / (download) - annotate - [select for diffs], Tue Mar 27 07:21:21 2007 UTC (17 years, 1 month ago) by xsa
Branch: MAIN
Changes since 1.4: +23 -6 lines
Diff to previous 1.4 (colored)

sync with espie@'s latest change to diff(1).

from src/usr.bin/diff/diffreg.c rev 1.67:

improve -p for C++ code: classes definition often have
public:/protected:/private: at the start of line.
This lets the -p scanner just take note of the section and keep
looking for the actual class definition.

Also increase function name bufsize so it shows most of these pesky C++
decls...

OK niallo@ espie@.

Revision 1.4 / (download) - annotate - [select for diffs], Thu Feb 22 06:42:09 2007 UTC (17 years, 2 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.3: +9 -6 lines
Diff to previous 1.3 (colored)

general includes cleanup sweep. ok joris@ niallo@

Revision 1.3 / (download) - annotate - [select for diffs], Fri Jul 7 17:37:17 2006 UTC (17 years, 10 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.2: +3 -3 lines
Diff to previous 1.2 (colored)

first part of opencvs remote, fairly useable on existing trees
although i advise against using it on real development trees for now.

only a few commands work right so far:
- commit
- diff
- status
- log
- update (partially working)

if you feel like testing remote and run into bugs feel free to
contact me, and please include a full trace (-t).

Revision 1.2 / (download) - annotate - [select for diffs], Wed May 31 22:24:12 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN
Changes since 1.1: +5 -4 lines
Diff to previous 1.1 (colored)

support -p flag for diff, makes dlg@ feel all warm
and fuzzie inside.

Revision 1.1 / (download) - annotate - [select for diffs], Sat May 27 03:30:30 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN

commit the new opencvs code, i have been hacking on
this for the past 2 weeks now and it should go in at
the start of the hackathon so others can help out.

this code is a lot safer, smarter, faster and best of
all it is actually doing what it is suppose to do!

basic checkout, update, status, diff and commit are
working in local mode only.
there is no support for any remote setups now.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.