diff options
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge')
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.c | 218 |
1 files changed, 93 insertions, 125 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c index 5a27426..f5c46a8 100644 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c +++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c @@ -1,7 +1,13 @@ -/* Merge RCS revisions. */ +/* + * rcsmerge operation + */ +/***************************************************************************** + * join 2 revisions with respect to a third + ***************************************************************************** + */ -/* Copyright 1982, 1988, 1989 Walter Tichy - Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert +/* Copyright (C) 1982, 1988, 1989 Walter Tichy + Copyright 1990, 1991 by Paul Eggert Distributed under license by the Free Software Foundation, Inc. This file is part of RCS. @@ -17,9 +23,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with RCS; see the file COPYING. -If not, write to the Free Software Foundation, -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with RCS; see the file COPYING. If not, write to +the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. Report problems and direct all questions to: @@ -27,33 +32,11 @@ Report problems and direct all questions to: */ -/* - * $Log: rcsmerge.c,v $ - * Revision 5.15 1995/06/16 06:19:24 eggert - * Update FSF address. - * - * Revision 5.14 1995/06/01 16:23:43 eggert - * (main): Report an error if -kb, so don't worry about binary stdout. - * Punctuate messages properly. Rewrite to avoid `goto end'. - * - * Revision 5.13 1994/03/17 14:05:48 eggert - * Specify subprocess input via file descriptor, not file name. Remove lint. - * - * Revision 5.12 1993/11/09 17:40:15 eggert - * -V now prints version on stdout and exits. Don't print usage twice. - * - * Revision 5.11 1993/11/03 17:42:27 eggert - * Add -A, -E, -e, -z. Ignore -T. Allow up to three file labels. - * Pass -Vn to `co'. Pass unexpanded revision name to `co', so that Name works. - * - * Revision 5.10 1992/07/28 16:12:44 eggert - * Add -V. - * - * Revision 5.9 1992/01/24 18:44:19 eggert - * lint -> RCS_lint - * - * Revision 5.8 1992/01/06 02:42:34 eggert - * Update usage string. + + +/* $Log: rcsmerge.c,v $ + * Revision 1.1.1.1 1993/06/18 04:22:16 jkh + * Updated GNU utilities * * Revision 5.7 1991/11/20 17:58:09 eggert * Don't Iopen(f, "r+"); it's not portable. @@ -84,26 +67,26 @@ Report problems and direct all questions to: * * Revision 4.5 89/05/01 15:13:16 narten * changed copyright header to reflect current distribution rules - * + * * Revision 4.4 88/08/09 19:13:13 eggert * Beware merging into a readonly file. * Beware merging a revision to itself (no change). * Use execv(), not system(); yield exit status like diff(1)'s. - * + * * Revision 4.3 87/10/18 10:38:02 narten - * Updating version numbers. Changes relative to version 1.1 + * Updating version numbers. Changes relative to version 1.1 * actually relative to 4.1 - * + * * Revision 1.3 87/09/24 14:00:31 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf + * Sources now pass through lint (if you ignore printf/sprintf/fprintf * warnings) - * + * * Revision 1.2 87/03/27 14:22:36 jenkins * Port to suns - * + * * Revision 4.1 83/03/28 11:14:57 wft * Added handling of default branch. - * + * * Revision 3.3 82/12/24 15:29:00 wft * Added call to catchsig(). * @@ -118,17 +101,17 @@ Report problems and direct all questions to: static char const co[] = CO; -mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.15 1995/06/16 06:19:24 eggert Exp $") +mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.1.1.1 1993/06/18 04:22:16 jkh Exp $") { static char const cmdusage[] = - "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file"; + "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] [-p] [-Vn] file"; static char const quietarg[] = "-q"; register int i; char *a, **newargv; char const *arg[3]; - char const *rev[3], *xrev[3]; /*revision numbers*/ - char const *edarg, *expandarg, *suffixarg, *versionarg, *zonearg; + char const *rev[2]; /*revision numbers*/ + char const *expandarg, *versionarg; int tostdout; int status; RILE *workptr; @@ -139,10 +122,10 @@ mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.15 1995/06/16 06:19:24 egg bufautobegin(&commarg); bufautobegin(&numericrev); - edarg = rev[1] = rev[2] = 0; + rev[0] = rev[1] = nil; status = 0; /* Keep lint happy. */ tostdout = false; - expandarg = suffixarg = versionarg = zonearg = quietarg; /* no-op */ + expandarg = versionarg = quietarg; /* i.e. a no-op */ suffixes = X_DEFAULT; argc = getRCSINIT(argc, argv, &newargv); @@ -160,33 +143,16 @@ mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.15 1995/06/16 06:19:24 egg break; /* falls into -r */ case 'r': - if (!rev[1]) + if (!rev[0]) + rev[0] = a; + else if (!rev[1]) rev[1] = a; - else if (!rev[2]) - rev[2] = a; else - error("too many revision numbers"); + faterror("too many revision numbers"); break; - - case 'A': case 'E': case 'e': - if (*a) - goto unknown; - edarg = *argv; - break; - case 'x': - suffixarg = *argv; suffixes = a; break; - case 'z': - zonearg = *argv; - zone_set(a); - break; - case 'T': - /* Ignore -T, so that RCSINIT can contain -T. */ - if (*a) - goto unknown; - break; case 'V': versionarg = *argv; setRCSversion(versionarg); @@ -198,88 +164,90 @@ mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 5.15 1995/06/16 06:19:24 egg break; /* fall into */ default: - unknown: - error("unknown option: %s%s", *argv, cmdusage); + faterror("unknown option: %s%s", *argv, cmdusage); }; } /* end of option processing */ - if (!rev[1]) faterror("no base revision number given"); + if (argc<1) faterror("no input file%s", cmdusage); + if (!rev[0]) faterror("no base revision number given"); - /* Now handle all pathnames. */ + /* now handle all filenames */ - if (!nerror) { - if (argc < 1) - faterror("no input file%s", cmdusage); - if (0 < pairnames(argc, argv, rcsreadopen, true, false)) { + if (0 < pairfilenames(argc, argv, rcsreadopen, true, false)) { - if (argc>2 || (argc==2 && argv[1])) - warn("excess arguments ignored"); - if (Expand == BINARY_EXPAND) - workerror("merging binary files"); - diagnose("RCS file: %s\n", RCSname); - if (!(workptr = Iopen(workname, FOPEN_R_WORK, (struct stat*)0))) - efaterror(workname); + if (argc>2 || (argc==2&&argv[1]!=nil)) + warn("too many arguments"); + diagnose("RCS file: %s\n", RCSfilename); + if (!(workptr = Iopen(workfilename, + FOPEN_R_WORK, + (struct stat*)0 + ))) + efaterror(workfilename); gettree(); /* reads in the delta tree */ - if (!Head) rcsfaterror("no revisions present"); + if (Head==nil) faterror("no revisions present"); - if (!*rev[1]) + if (!*rev[0]) + rev[0] = Dbranch ? Dbranch : Head->num; + if (!fexpandsym(rev[0], &numericrev, workptr)) + goto end; + if (!(target=genrevs(numericrev.string, (char *)nil, (char *)nil, (char *)nil,&gendeltas))) goto end; + rev[0] = target->num; + if (!rev[1] || !*rev[1]) rev[1] = Dbranch ? Dbranch : Head->num; - if (fexpandsym(rev[1], &numericrev, workptr) - && (target=genrevs(numericrev.string, (char *)0, (char *)0, (char*)0, &gendeltas)) - ) { - xrev[1] = target->num; - if (!rev[2] || !*rev[2]) - rev[2] = Dbranch ? Dbranch : Head->num; - if (fexpandsym(rev[2], &numericrev, workptr) - && (target=genrevs(numericrev.string, (char *)0, (char *)0, (char *)0, &gendeltas)) - ) { - xrev[2] = target->num; - - if (strcmp(xrev[1],xrev[2]) == 0) { - if (tostdout) { - fastcopy(workptr, stdout); - Ofclose(stdout); - } - } else { - Izclose(&workptr); + if (!fexpandsym(rev[1], &numericrev, workptr)) + goto end; + if (!(target=genrevs(numericrev.string, (char *)nil, (char *)nil, (char *)nil,&gendeltas))) goto end; + rev[1] = target->num; + + if (strcmp(rev[0],rev[1]) == 0) { + if (tostdout) { + FILE *o; +# if text_equals_binary_stdio || text_work_stdio + o = stdout; +# else + if (!(o=fdopen(STDOUT_FILENO,FOPEN_W_WORK))) + efaterror("stdout"); +# endif + fastcopy(workptr,o); + Ofclose(o); + } + goto end; + } + Izclose(&workptr); - for (i=1; i<=2; i++) { - diagnose("retrieving revision %s\n", xrev[i]); + for (i=0; i<2; i++) { + diagnose("retrieving revision %s\n", rev[i]); bufscpy(&commarg, "-p"); - bufscat(&commarg, rev[i]); /* not xrev[i], for $Name's sake */ + bufscat(&commarg, rev[i]); if (run( - -1, + (char*)0, /* Do not collide with merger.c maketemp(). */ - arg[i] = maketemp(i+2), - co, quietarg, commarg.string, - expandarg, suffixarg, versionarg, zonearg, - RCSname, (char*)0 + arg[i+1] = maketemp(i+3), + co, quietarg, commarg.string, expandarg, + versionarg, RCSfilename, (char*)0 )) - rcsfaterror("co failed"); - } - diagnose("Merging differences between %s and %s into %s%s\n", - xrev[1], xrev[2], workname, - tostdout?"; result to stdout":""); - - arg[0] = xrev[0] = workname; - status = merge(tostdout, edarg, xrev, arg); - } - } + faterror("co failed"); } + diagnose("Merging differences between %s and %s into %s%s\n", + rev[0], rev[1], workfilename, + tostdout?"; result to stdout":""); - Izclose(&workptr); - } + arg[0] = rev[0] = workfilename; + status = merge(tostdout, rev, arg); } + +end: + Izclose(&workptr); tempunlink(); exitmain(nerror ? DIFF_TROUBLE : status); } -#if RCS_lint +#if lint # define exiterr rmergeExit #endif - void + exiting void exiterr() { tempunlink(); |
