summaryrefslogtreecommitdiffstats
path: root/usr.bin/rcs/rcsmerge.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Pull in <time.h> for struct tm, used in rcs.hguenther2016-08-261-1/+2
| | | | ok deraadt@
* Allow rcsnum_free and buf_free to accept NULL and remove various NULLnicm2015-11-021-7/+3
| | | | checks that are now unnecessary, from Michael W Bombardieri. ok millert
* Replace <sys/param.h> with <limits.h> and other less dirty headers wherederaadt2015-01-161-2/+2
| | | | | | | | | 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)
* Zap some stored values never read; From Fritjof Bornebusch; ok nicm@otto2014-10-101-2/+1
|
* exit in usage functions themselves; from Fritjof Bornebusch; ok nicm@otto2014-10-021-6/+4
|
* Reduce variable/function name and whitespace differences betweenray2010-07-231-5/+5
| | | | | | cvs/rcs. OK xsa zinovik
* Sync revisions and time buffers size to be consistent with each others.xsa2007-06-301-2/+3
| | | | | Simplifies further size tweaks if needed. OK ray@.
* As done in OpenCVS, general includes cleanup sweep. OK otto@.xsa2007-02-271-2/+6
|
* - convert some warnx() to warn(), which fixes a few stupidly un-informative error messages (found by tom@)niallo2006-10-121-2/+2
| | | | | | - make rcs_choosefile() save wrt errno, input from ray@ ok joris@ xsa@
* correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.xsa2006-08-111-4/+13
|
* Reduce rcs_buf_release() usage, improving binary support.ray2006-08-011-9/+7
| | | | OK niallo@
* Remove rcs_statfile(). It was just a wrapper for rcs_choosefile(),ray2006-05-271-3/+3
| | | | | | handling exceptions oddly. OK joris@
* warnx(); return(); --> errx();xsa2006-05-141-5/+3
|
* treat first file passed as argument only; issue a warning for others.xsa2006-05-101-68/+65
| | | | matches gnu/usr.bin/rcs. OK joris@.
* move -e to compat land; pointed out by rayjmc2006-05-091-2/+2
| | | | ok xsa
* Remove /* NOTREACHED */ comments, now that lint is smart aboutray2006-05-091-2/+1
| | | | | | __dead. I never should have put them there. OK xsa@.
* properly handle exit code 1; OK ray@.xsa2006-05-081-3/+7
|
* correctly handle the `no input file' case.xsa2006-05-081-2/+2
|
* err() and errx() should also exit with status 2;xsa2006-05-081-3/+3
|
* exit with status 2 after usage() too; pointed out by uwe@.xsa2006-05-081-5/+5
|
* prevent file races by obtaining an fd for the RCS file andjoris2006-04-261-4/+5
| | | | | | | | 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@
* fork our code we shared between openrcs/cvs into the openrcs dir.joris2006-04-261-7/+7
| | | | | | | 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.
* fatal() -> err()/errx() as we try to not depend on heavy cvs_log().xsa2006-04-251-3/+3
| | | | OK joriski.
* The -r flag without an argument signifies HEAD for rcsmerge as well.ray2006-04-251-5/+10
| | | | OK joris@
* - move -A into compat landjmc2006-04-241-2/+2
| | | | | | - tweak -E description accordingly ok xsa
* -r is not optional: simplify its synopsis, but improve its description;jmc2006-04-241-2/+2
| | | | ok xsa
* be consistent in error messages for wrongly specified keyword substitutionxsa2006-04-241-2/+2
| | | | mode for `-k'.
* move shared functions into rcsutil.[ch]; this makes rcsprog.c cleaner;xsa2006-04-211-2/+2
| | | | "the voices in my head say OK!" joris@.
* remove overkill cvs_log() and rather use warn()/warnx().xsa2006-04-211-7/+6
| | | | OK ray@ and discussed with joris@.
* switch -p handling to bitwise flags; OK ray@.xsa2006-04-211-4/+4
|
* switch -q handling to bitwise flags; OK ray@ niallo@.xsa2006-04-191-8/+8
|
* Add missing usage() calls.ray2006-04-141-2/+3
| | | | ``crazy'' joris@
* *** empty log message ***ray2006-04-131-5/+7
|
* Clean up <rev> handling. Whenever a revision is specified after aray2006-04-121-23/+32
| | | | | | | | | | | | | | | | | | | | | | 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@
* Allow the -x flag to be used without an extension.ray2006-03-241-3/+4
| | | | ``that makes sense'' xsa@
* - cvs_buf_putc() will never return non-zeroxsa2006-03-231-6/+2
| | | | | - change cvs_buf_putc() return type to void OK ray@.
* Follow exit() with /* NOTREACHED*/ for lint.ray2006-03-161-1/+2
| | | | ``OK niallo@'' niallo@
* add an argument to cvs_diff3() to be able to handle verbosity ofxsa2006-03-141-2/+3
| | | | commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
* fix usage();xsa2006-03-081-3/+3
|
* respect -q; pointed out by Ray Lai.xsa2006-03-081-4/+7
|
* -z support for RCS;joris2006-03-071-2/+5
|
* move compat flags into a STANDARDS section;jmc2006-03-061-3/+3
| | | | update usage() whilst here...
* adapt informative message if we are sending output to stdout.xsa2006-03-061-2/+8
|
* if the submitted rev(s) is/are the same as the head rev, skip the processxsa2006-03-061-11/+12
| | | | for the specified file. Fix some error messages while there. OK joris@
* cleanup, move log.h and rcs.h inclusion into rcsprog.h;xsa2006-01-051-4/+2
|
* #include's cleanup; ok joris@ niallo@.xsa2006-01-021-8/+2
|
* switch to xmalloc stuff, me and xsa@ agreed on this a longjoris2005-12-101-2/+2
| | | | | | | | | 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@
* sync usage() for `-xsuffixes';xsa2005-11-281-2/+2
|
* enable `-xsuffixes' support as it has been added a few days agoxsa2005-11-211-2/+5
| | | | | in rcs_statfile(); niallo ok
* print RCS file path;xsa2005-11-021-1/+3
|
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.