![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / rcs
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.57 / (download) - annotate - [select for diffs], Fri Aug 26 09:02:54 2016 UTC (7 years, 8 months ago) by guenther
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,
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,
HEAD
Changes since 1.56: +2 -1 lines
Diff to previous 1.56 (colored)
Pull in <time.h> for struct tm, used in rcs.h ok deraadt@
Revision 1.56 / (download) - annotate - [select for diffs], Mon Nov 2 16:45: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.55: +3 -7 lines
Diff to previous 1.55 (colored)
Allow rcsnum_free and buf_free to accept NULL and remove various NULL checks that are now unnecessary, from Michael W Bombardieri. ok millert
Revision 1.55 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:11 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (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.54 / (download) - annotate - [select for diffs], Fri Oct 10 08:15:25 2014 UTC (9 years, 7 months ago) by otto
Branch: MAIN
Changes since 1.53: +1 -2 lines
Diff to previous 1.53 (colored)
Zap some stored values never read; From Fritjof Bornebusch; ok nicm@
Revision 1.53 / (download) - annotate - [select for diffs], Thu Oct 2 06:23:15 2014 UTC (9 years, 7 months ago) by otto
Branch: MAIN
Changes since 1.52: +4 -6 lines
Diff to previous 1.52 (colored)
exit in usage functions themselves; from Fritjof Bornebusch; ok nicm@
Revision 1.52 / (download) - annotate - [select for diffs], Fri Jul 23 21:46:05 2010 UTC (13 years, 9 months ago) by ray
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,
OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.51: +5 -5 lines
Diff to previous 1.51 (colored)
Reduce variable/function name and whitespace differences between cvs/rcs. OK xsa zinovik
Revision 1.51 / (download) - annotate - [select for diffs], Sat Jun 30 08:23:49 2007 UTC (16 years, 10 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6,
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
Changes since 1.50: +3 -2 lines
Diff to previous 1.50 (colored)
Sync revisions and time buffers size to be consistent with each others. Simplifies further size tweaks if needed. OK ray@.
Revision 1.50 / (download) - annotate - [select for diffs], Tue Feb 27 07:59:13 2007 UTC (17 years, 2 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.49: +6 -2 lines
Diff to previous 1.49 (colored)
As done in OpenCVS, general includes cleanup sweep. OK otto@.
Revision 1.49 / (download) - annotate - [select for diffs], Thu Oct 12 17:20:12 2006 UTC (17 years, 7 months ago) by niallo
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 (colored)
- convert some warnx() to warn(), which fixes a few stupidly un-informative error messages (found by tom@) - make rcs_choosefile() save wrt errno, input from ray@ ok joris@ xsa@
Revision 1.48 / (download) - annotate - [select for diffs], Fri Aug 11 08:18:19 2006 UTC (17 years, 9 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0
Changes since 1.47: +13 -4 lines
Diff to previous 1.47 (colored)
correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.
Revision 1.47 / (download) - annotate - [select for diffs], Tue Aug 1 05:14:17 2006 UTC (17 years, 9 months ago) by ray
Branch: MAIN
Changes since 1.46: +7 -9 lines
Diff to previous 1.46 (colored)
Reduce rcs_buf_release() usage, improving binary support. OK niallo@
Revision 1.46 / (download) - annotate - [select for diffs], Sat May 27 05:49:14 2006 UTC (17 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.45: +3 -3 lines
Diff to previous 1.45 (colored)
Remove rcs_statfile(). It was just a wrapper for rcs_choosefile(), handling exceptions oddly. OK joris@
Revision 1.45 / (download) - annotate - [select for diffs], Sun May 14 15:23:10 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.44: +3 -5 lines
Diff to previous 1.44 (colored)
warnx(); return(); --> errx();
Revision 1.44 / (download) - annotate - [select for diffs], Wed May 10 12:05:33 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.43: +68 -71 lines
Diff to previous 1.43 (colored)
treat first file passed as argument only; issue a warning for others. matches gnu/usr.bin/rcs. OK joris@.
Revision 1.43 / (download) - annotate - [select for diffs], Tue May 9 14:03:55 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 (colored)
move -e to compat land; pointed out by ray ok xsa
Revision 1.42 / (download) - annotate - [select for diffs], Tue May 9 12:33:42 2006 UTC (18 years ago) by ray
Branch: MAIN
Changes since 1.41: +1 -2 lines
Diff to previous 1.41 (colored)
Remove /* NOTREACHED */ comments, now that lint is smart about __dead. I never should have put them there. OK xsa@.
Revision 1.41 / (download) - annotate - [select for diffs], Mon May 8 18:36:04 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.40: +7 -3 lines
Diff to previous 1.40 (colored)
properly handle exit code 1; OK ray@.
Revision 1.40 / (download) - annotate - [select for diffs], Mon May 8 11:56:16 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 (colored)
correctly handle the `no input file' case.
Revision 1.39 / (download) - annotate - [select for diffs], Mon May 8 09:59:09 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.38: +3 -3 lines
Diff to previous 1.38 (colored)
err() and errx() should also exit with status 2;
Revision 1.38 / (download) - annotate - [select for diffs], Mon May 8 09:48:12 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.37: +5 -5 lines
Diff to previous 1.37 (colored)
exit with status 2 after usage() too; pointed out by uwe@.
Revision 1.37 / (download) - annotate - [select for diffs], Wed Apr 26 21:55:22 2006 UTC (18 years ago) by joris
Branch: MAIN
Changes since 1.36: +5 -4 lines
Diff to previous 1.36 (colored)
prevent file races by obtaining an fd for the RCS file and do our operations on that, this is safe and guarantees we can operate on the file until we close(2) it. a fix is coming for the remaining races in our diff code. okay niallo@ and ray@
Revision 1.36 / (download) - annotate - [select for diffs], Wed Apr 26 02:55:13 2006 UTC (18 years ago) by joris
Branch: MAIN
Changes since 1.35: +7 -7 lines
Diff to previous 1.35 (colored)
fork our code we shared between openrcs/cvs into the openrcs dir. this was starting to become inhuman to maintain without ugly ugly hacks in the shared code, and it will be easier to make specific changes for openrcs without touching the soon-to-be-replaced opencvs code.
Revision 1.35 / (download) - annotate - [select for diffs], Tue Apr 25 13:36:35 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.34: +3 -3 lines
Diff to previous 1.34 (colored)
fatal() -> err()/errx() as we try to not depend on heavy cvs_log(). OK joriski.
Revision 1.34 / (download) - annotate - [select for diffs], Tue Apr 25 03:25:42 2006 UTC (18 years ago) by ray
Branch: MAIN
Changes since 1.33: +10 -5 lines
Diff to previous 1.33 (colored)
The -r flag without an argument signifies HEAD for rcsmerge as well. OK joris@
Revision 1.33 / (download) - annotate - [select for diffs], Mon Apr 24 13:32:10 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)
- move -A into compat land - tweak -E description accordingly ok xsa
Revision 1.32 / (download) - annotate - [select for diffs], Mon Apr 24 08:18:06 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.31: +2 -2 lines
Diff to previous 1.31 (colored)
-r is not optional: simplify its synopsis, but improve its description; ok xsa
Revision 1.31 / (download) - annotate - [select for diffs], Mon Apr 24 08:10:41 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)
be consistent in error messages for wrongly specified keyword substitution mode for `-k'.
Revision 1.30 / (download) - annotate - [select for diffs], Fri Apr 21 17:17:29 2006 UTC (18 years, 1 month ago) by xsa
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)
move shared functions into rcsutil.[ch]; this makes rcsprog.c cleaner; "the voices in my head say OK!" joris@.
Revision 1.29 / (download) - annotate - [select for diffs], Fri Apr 21 14:18:26 2006 UTC (18 years, 1 month ago) by xsa
Branch: MAIN
Changes since 1.28: +6 -7 lines
Diff to previous 1.28 (colored)
remove overkill cvs_log() and rather use warn()/warnx(). OK ray@ and discussed with joris@.
Revision 1.28 / (download) - annotate - [select for diffs], Fri Apr 21 07:06:25 2006 UTC (18 years, 1 month ago) by xsa
Branch: MAIN
Changes since 1.27: +4 -4 lines
Diff to previous 1.27 (colored)
switch -p handling to bitwise flags; OK ray@.
Revision 1.27 / (download) - annotate - [select for diffs], Wed Apr 19 06:53:41 2006 UTC (18 years, 1 month ago) by xsa
Branch: MAIN
Changes since 1.26: +8 -8 lines
Diff to previous 1.26 (colored)
switch -q handling to bitwise flags; OK ray@ niallo@.
Revision 1.26 / (download) - annotate - [select for diffs], Fri Apr 14 16:28:24 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.25: +3 -2 lines
Diff to previous 1.25 (colored)
Add missing usage() calls. ``crazy'' joris@
Revision 1.25 / (download) - annotate - [select for diffs], Thu Apr 13 00:58:25 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.24: +7 -5 lines
Diff to previous 1.24 (colored)
*** empty log message ***
Revision 1.24 / (download) - annotate - [select for diffs], Wed Apr 12 08:23:30 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.23: +32 -23 lines
Diff to previous 1.23 (colored)
Clean up <rev> handling. Whenever a revision is specified after a flag, it calls one of two new functions: rcs_setrevstr() or rcs_setrevstr2(). rcs_setrevstr() sets a string to another string, and complains if it was set more than once. rcs_setrevstr2() takes two strings, sets one after the other, and fatal()s if more than two strings were given. All <rev> handling is now done in the loop that goes through each argv. This is necessary for parsing symbols, which will be much easier after this. Along the way a lot of memory leaks were cleaned up. There is one area where rcs_set_rev() is called, which allocates a RCSNUM and stores it in pb.newrev, but it segfaults whenever I try to rcsnum_free() it. I put an /* XXX */ comment there for now. Passes regression tests and the code is less complicated in some ways (to me). Suggestions and OK xsa@
Revision 1.23 / (download) - annotate - [select for diffs], Fri Mar 24 05:14:48 2006 UTC (18 years, 2 months ago) by ray
Branch: MAIN
Changes since 1.22: +4 -3 lines
Diff to previous 1.22 (colored)
Allow the -x flag to be used without an extension. ``that makes sense'' xsa@
Revision 1.22 / (download) - annotate - [select for diffs], Thu Mar 23 08:50:41 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.21: +2 -6 lines
Diff to previous 1.21 (colored)
- cvs_buf_putc() will never return non-zero - change cvs_buf_putc() return type to void OK ray@.
Revision 1.21 / (download) - annotate - [select for diffs], Thu Mar 16 04:04:57 2006 UTC (18 years, 2 months ago) by ray
Branch: MAIN
Changes since 1.20: +2 -1 lines
Diff to previous 1.20 (colored)
Follow exit() with /* NOTREACHED*/ for lint. ``OK niallo@'' niallo@
Revision 1.20 / (download) - annotate - [select for diffs], Tue Mar 14 15:59:06 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.19: +3 -2 lines
Diff to previous 1.19 (colored)
add an argument to cvs_diff3() to be able to handle verbosity of commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
Revision 1.19 / (download) - annotate - [select for diffs], Wed Mar 8 12:34:53 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.18: +3 -3 lines
Diff to previous 1.18 (colored)
fix usage();
Revision 1.18 / (download) - annotate - [select for diffs], Wed Mar 8 08:44:29 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.17: +7 -4 lines
Diff to previous 1.17 (colored)
respect -q; pointed out by Ray Lai.
Revision 1.17 / (download) - annotate - [select for diffs], Tue Mar 7 01:40:52 2006 UTC (18 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.16: +5 -2 lines
Diff to previous 1.16 (colored)
-z support for RCS;
Revision 1.16 / (download) - annotate - [select for diffs], Mon Mar 6 14:44:51 2006 UTC (18 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)
move compat flags into a STANDARDS section; update usage() whilst here...
Revision 1.15 / (download) - annotate - [select for diffs], Mon Mar 6 13:22:59 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.14: +8 -2 lines
Diff to previous 1.14 (colored)
adapt informative message if we are sending output to stdout.
Revision 1.14 / (download) - annotate - [select for diffs], Mon Mar 6 08:46:55 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.13: +12 -11 lines
Diff to previous 1.13 (colored)
if the submitted rev(s) is/are the same as the head rev, skip the process for the specified file. Fix some error messages while there. OK joris@
Revision 1.13 / (download) - annotate - [select for diffs], Thu Jan 5 10:28:24 2006 UTC (18 years, 4 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE,
OPENBSD_3_9
Changes since 1.12: +2 -4 lines
Diff to previous 1.12 (colored)
cleanup, move log.h and rcs.h inclusion into rcsprog.h;
Revision 1.12 / (download) - annotate - [select for diffs], Mon Jan 2 08:13:28 2006 UTC (18 years, 4 months ago) by xsa
Branch: MAIN
Changes since 1.11: +2 -8 lines
Diff to previous 1.11 (colored)
#include's cleanup; ok joris@ niallo@.
Revision 1.11 / (download) - annotate - [select for diffs], Sat Dec 10 20:27:46 2005 UTC (18 years, 5 months ago) by joris
Branch: MAIN
Changes since 1.10: +2 -2 lines
Diff to previous 1.10 (colored)
switch to xmalloc stuff, me and xsa@ agreed on this a long time ago, but we were being held back by jfb. too bad for him. next step is to use fatal() through out the code for unrecoverable errors instead of trying to be all nice and fluffy and reach main() again. ok niallo@ and xsa@
Revision 1.10 / (download) - annotate - [select for diffs], Mon Nov 28 14:43:59 2005 UTC (18 years, 5 months ago) by xsa
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)
sync usage() for `-xsuffixes';
Revision 1.9 / (download) - annotate - [select for diffs], Mon Nov 21 16:20:29 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.8: +5 -2 lines
Diff to previous 1.8 (colored)
enable `-xsuffixes' support as it has been added a few days ago in rcs_statfile(); niallo ok
Revision 1.8 / (download) - annotate - [select for diffs], Wed Nov 2 13:21:37 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.7: +3 -1 lines
Diff to previous 1.7 (colored)
print RCS file path;
Revision 1.7 / (download) - annotate - [select for diffs], Wed Nov 2 11:26:19 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.6: +5 -3 lines
Diff to previous 1.6 (colored)
sync with Reality;
Revision 1.6 / (download) - annotate - [select for diffs], Wed Oct 26 18:13:58 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.5: +1 -3 lines
Diff to previous 1.5 (colored)
diff3_conflicts cleanup; joris ok
Revision 1.5 / (download) - annotate - [select for diffs], Sun Oct 23 11:42:43 2005 UTC (18 years, 6 months ago) by niallo
Branch: MAIN
Changes since 1.4: +2 -1 lines
Diff to previous 1.4 (colored)
add extern int diff3_conflicts to unbreak. bad joris.
Revision 1.4 / (download) - annotate - [select for diffs], Sun Oct 23 11:04:26 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (colored)
correct error message;
Revision 1.3 / (download) - annotate - [select for diffs], Sun Oct 23 04:25:34 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.2: +6 -1 lines
Diff to previous 1.2 (colored)
warn if conflicts were found during the merge;
Revision 1.2 / (download) - annotate - [select for diffs], Sun Oct 23 04:07:06 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.1: +50 -6 lines
Diff to previous 1.1 (colored)
with recent diff3 support, rcsmerge now works;
Revision 1.1 / (download) - annotate - [select for diffs], Tue Oct 18 16:16:39 2005 UTC (18 years, 7 months ago) by xsa
Branch: MAIN
skeletons for rcsmerge(1);