1*86d7f5d3SJohn Marino /* Merge RCS revisions. */
2*86d7f5d3SJohn Marino
3*86d7f5d3SJohn Marino /* Copyright 1982, 1988, 1989 Walter Tichy
4*86d7f5d3SJohn Marino Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
5*86d7f5d3SJohn Marino Distributed under license by the Free Software Foundation, Inc.
6*86d7f5d3SJohn Marino
7*86d7f5d3SJohn Marino This file is part of RCS.
8*86d7f5d3SJohn Marino
9*86d7f5d3SJohn Marino RCS is free software; you can redistribute it and/or modify
10*86d7f5d3SJohn Marino it under the terms of the GNU General Public License as published by
11*86d7f5d3SJohn Marino the Free Software Foundation; either version 2, or (at your option)
12*86d7f5d3SJohn Marino any later version.
13*86d7f5d3SJohn Marino
14*86d7f5d3SJohn Marino RCS is distributed in the hope that it will be useful,
15*86d7f5d3SJohn Marino but WITHOUT ANY WARRANTY; without even the implied warranty of
16*86d7f5d3SJohn Marino MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17*86d7f5d3SJohn Marino GNU General Public License for more details.
18*86d7f5d3SJohn Marino
19*86d7f5d3SJohn Marino You should have received a copy of the GNU General Public License
20*86d7f5d3SJohn Marino along with RCS; see the file COPYING.
21*86d7f5d3SJohn Marino If not, write to the Free Software Foundation,
22*86d7f5d3SJohn Marino 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
23*86d7f5d3SJohn Marino
24*86d7f5d3SJohn Marino Report problems and direct all questions to:
25*86d7f5d3SJohn Marino
26*86d7f5d3SJohn Marino rcs-bugs@cs.purdue.edu
27*86d7f5d3SJohn Marino
28*86d7f5d3SJohn Marino */
29*86d7f5d3SJohn Marino
30*86d7f5d3SJohn Marino /*
31*86d7f5d3SJohn Marino * $FreeBSD: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c,v 1.7 1999/08/27 23:36:58 peter Exp $
32*86d7f5d3SJohn Marino * $DragonFly: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c,v 1.2 2003/06/17 04:25:48 dillon Exp $
33*86d7f5d3SJohn Marino *
34*86d7f5d3SJohn Marino * Revision 5.15 1995/06/16 06:19:24 eggert
35*86d7f5d3SJohn Marino * Update FSF address.
36*86d7f5d3SJohn Marino *
37*86d7f5d3SJohn Marino * Revision 5.14 1995/06/01 16:23:43 eggert
38*86d7f5d3SJohn Marino * (main): Report an error if -kb, so don't worry about binary stdout.
39*86d7f5d3SJohn Marino * Punctuate messages properly. Rewrite to avoid `goto end'.
40*86d7f5d3SJohn Marino *
41*86d7f5d3SJohn Marino * Revision 5.13 1994/03/17 14:05:48 eggert
42*86d7f5d3SJohn Marino * Specify subprocess input via file descriptor, not file name. Remove lint.
43*86d7f5d3SJohn Marino *
44*86d7f5d3SJohn Marino * Revision 5.12 1993/11/09 17:40:15 eggert
45*86d7f5d3SJohn Marino * -V now prints version on stdout and exits. Don't print usage twice.
46*86d7f5d3SJohn Marino *
47*86d7f5d3SJohn Marino * Revision 5.11 1993/11/03 17:42:27 eggert
48*86d7f5d3SJohn Marino * Add -A, -E, -e, -z. Ignore -T. Allow up to three file labels.
49*86d7f5d3SJohn Marino * Pass -Vn to `co'. Pass unexpanded revision name to `co', so that Name works.
50*86d7f5d3SJohn Marino *
51*86d7f5d3SJohn Marino * Revision 5.10 1992/07/28 16:12:44 eggert
52*86d7f5d3SJohn Marino * Add -V.
53*86d7f5d3SJohn Marino *
54*86d7f5d3SJohn Marino * Revision 5.9 1992/01/24 18:44:19 eggert
55*86d7f5d3SJohn Marino * lint -> RCS_lint
56*86d7f5d3SJohn Marino *
57*86d7f5d3SJohn Marino * Revision 5.8 1992/01/06 02:42:34 eggert
58*86d7f5d3SJohn Marino * Update usage string.
59*86d7f5d3SJohn Marino *
60*86d7f5d3SJohn Marino * Revision 5.7 1991/11/20 17:58:09 eggert
61*86d7f5d3SJohn Marino * Don't Iopen(f, "r+"); it's not portable.
62*86d7f5d3SJohn Marino *
63*86d7f5d3SJohn Marino * Revision 5.6 1991/08/19 03:13:55 eggert
64*86d7f5d3SJohn Marino * Add -r$. Tune.
65*86d7f5d3SJohn Marino *
66*86d7f5d3SJohn Marino * Revision 5.5 1991/04/21 11:58:27 eggert
67*86d7f5d3SJohn Marino * Add -x, RCSINIT, MS-DOS support.
68*86d7f5d3SJohn Marino *
69*86d7f5d3SJohn Marino * Revision 5.4 1991/02/25 07:12:43 eggert
70*86d7f5d3SJohn Marino * Merging a revision to itself is no longer an error.
71*86d7f5d3SJohn Marino *
72*86d7f5d3SJohn Marino * Revision 5.3 1990/11/01 05:03:50 eggert
73*86d7f5d3SJohn Marino * Remove unneeded setid check.
74*86d7f5d3SJohn Marino *
75*86d7f5d3SJohn Marino * Revision 5.2 1990/09/04 08:02:28 eggert
76*86d7f5d3SJohn Marino * Check for I/O error when reading working file.
77*86d7f5d3SJohn Marino *
78*86d7f5d3SJohn Marino * Revision 5.1 1990/08/29 07:14:04 eggert
79*86d7f5d3SJohn Marino * Add -q. Pass -L options to merge.
80*86d7f5d3SJohn Marino *
81*86d7f5d3SJohn Marino * Revision 5.0 1990/08/22 08:13:41 eggert
82*86d7f5d3SJohn Marino * Propagate merge's exit status.
83*86d7f5d3SJohn Marino * Remove compile-time limits; use malloc instead.
84*86d7f5d3SJohn Marino * Make lock and temp files faster and safer. Ansify and Posixate. Add -V.
85*86d7f5d3SJohn Marino * Don't use access(). Tune.
86*86d7f5d3SJohn Marino *
87*86d7f5d3SJohn Marino * Revision 4.5 89/05/01 15:13:16 narten
88*86d7f5d3SJohn Marino * changed copyright header to reflect current distribution rules
89*86d7f5d3SJohn Marino *
90*86d7f5d3SJohn Marino * Revision 4.4 88/08/09 19:13:13 eggert
91*86d7f5d3SJohn Marino * Beware merging into a readonly file.
92*86d7f5d3SJohn Marino * Beware merging a revision to itself (no change).
93*86d7f5d3SJohn Marino * Use execv(), not system(); yield exit status like diff(1)'s.
94*86d7f5d3SJohn Marino *
95*86d7f5d3SJohn Marino * Revision 4.3 87/10/18 10:38:02 narten
96*86d7f5d3SJohn Marino * Updating version numbers. Changes relative to version 1.1
97*86d7f5d3SJohn Marino * actually relative to 4.1
98*86d7f5d3SJohn Marino *
99*86d7f5d3SJohn Marino * Revision 1.3 87/09/24 14:00:31 narten
100*86d7f5d3SJohn Marino * Sources now pass through lint (if you ignore printf/sprintf/fprintf
101*86d7f5d3SJohn Marino * warnings)
102*86d7f5d3SJohn Marino *
103*86d7f5d3SJohn Marino * Revision 1.2 87/03/27 14:22:36 jenkins
104*86d7f5d3SJohn Marino * Port to suns
105*86d7f5d3SJohn Marino *
106*86d7f5d3SJohn Marino * Revision 4.1 83/03/28 11:14:57 wft
107*86d7f5d3SJohn Marino * Added handling of default branch.
108*86d7f5d3SJohn Marino *
109*86d7f5d3SJohn Marino * Revision 3.3 82/12/24 15:29:00 wft
110*86d7f5d3SJohn Marino * Added call to catchsig().
111*86d7f5d3SJohn Marino *
112*86d7f5d3SJohn Marino * Revision 3.2 82/12/10 21:32:02 wft
113*86d7f5d3SJohn Marino * Replaced getdelta() with gettree(); improved error messages.
114*86d7f5d3SJohn Marino *
115*86d7f5d3SJohn Marino * Revision 3.1 82/11/28 19:27:44 wft
116*86d7f5d3SJohn Marino * Initial revision.
117*86d7f5d3SJohn Marino *
118*86d7f5d3SJohn Marino */
119*86d7f5d3SJohn Marino #include "rcsbase.h"
120*86d7f5d3SJohn Marino
121*86d7f5d3SJohn Marino static char const co[] = CO;
122*86d7f5d3SJohn Marino
123*86d7f5d3SJohn Marino mainProg(rcsmergeId, "rcsmerge", "$DragonFly: src/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c,v 1.2 2003/06/17 04:25:48 dillon Exp $")
124*86d7f5d3SJohn Marino {
125*86d7f5d3SJohn Marino static char const cmdusage[] =
126*86d7f5d3SJohn Marino "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
127*86d7f5d3SJohn Marino static char const quietarg[] = "-q";
128*86d7f5d3SJohn Marino
129*86d7f5d3SJohn Marino register int i;
130*86d7f5d3SJohn Marino char *a, **newargv;
131*86d7f5d3SJohn Marino char const *arg[3];
132*86d7f5d3SJohn Marino char const *rev[3], *xrev[3]; /*revision numbers*/
133*86d7f5d3SJohn Marino char const *edarg, *expandarg, *suffixarg, *versionarg, *zonearg;
134*86d7f5d3SJohn Marino int tostdout;
135*86d7f5d3SJohn Marino int status;
136*86d7f5d3SJohn Marino RILE *workptr;
137*86d7f5d3SJohn Marino struct buf commarg;
138*86d7f5d3SJohn Marino struct buf numericrev; /* holds expanded revision number */
139*86d7f5d3SJohn Marino struct hshentries *gendeltas; /* deltas to be generated */
140*86d7f5d3SJohn Marino struct hshentry * target;
141*86d7f5d3SJohn Marino
142*86d7f5d3SJohn Marino bufautobegin(&commarg);
143*86d7f5d3SJohn Marino bufautobegin(&numericrev);
144*86d7f5d3SJohn Marino edarg = rev[1] = rev[2] = 0;
145*86d7f5d3SJohn Marino status = 0; /* Keep lint happy. */
146*86d7f5d3SJohn Marino tostdout = false;
147*86d7f5d3SJohn Marino expandarg = suffixarg = versionarg = zonearg = quietarg; /* no-op */
148*86d7f5d3SJohn Marino suffixes = X_DEFAULT;
149*86d7f5d3SJohn Marino
150*86d7f5d3SJohn Marino argc = getRCSINIT(argc, argv, &newargv);
151*86d7f5d3SJohn Marino argv = newargv;
152*86d7f5d3SJohn Marino while (a = *++argv, 0<--argc && *a++=='-') {
153*86d7f5d3SJohn Marino switch (*a++) {
154*86d7f5d3SJohn Marino case 'p':
155*86d7f5d3SJohn Marino tostdout=true;
156*86d7f5d3SJohn Marino goto revno;
157*86d7f5d3SJohn Marino
158*86d7f5d3SJohn Marino case 'q':
159*86d7f5d3SJohn Marino quietflag = true;
160*86d7f5d3SJohn Marino revno:
161*86d7f5d3SJohn Marino if (!*a)
162*86d7f5d3SJohn Marino break;
163*86d7f5d3SJohn Marino /* falls into -r */
164*86d7f5d3SJohn Marino case 'r':
165*86d7f5d3SJohn Marino if (!rev[1])
166*86d7f5d3SJohn Marino rev[1] = a;
167*86d7f5d3SJohn Marino else if (!rev[2])
168*86d7f5d3SJohn Marino rev[2] = a;
169*86d7f5d3SJohn Marino else
170*86d7f5d3SJohn Marino error("too many revision numbers");
171*86d7f5d3SJohn Marino break;
172*86d7f5d3SJohn Marino
173*86d7f5d3SJohn Marino case 'A': case 'E': case 'e':
174*86d7f5d3SJohn Marino if (*a)
175*86d7f5d3SJohn Marino goto unknown;
176*86d7f5d3SJohn Marino edarg = *argv;
177*86d7f5d3SJohn Marino break;
178*86d7f5d3SJohn Marino
179*86d7f5d3SJohn Marino case 'x':
180*86d7f5d3SJohn Marino suffixarg = *argv;
181*86d7f5d3SJohn Marino suffixes = a;
182*86d7f5d3SJohn Marino break;
183*86d7f5d3SJohn Marino case 'z':
184*86d7f5d3SJohn Marino zonearg = *argv;
185*86d7f5d3SJohn Marino zone_set(a);
186*86d7f5d3SJohn Marino break;
187*86d7f5d3SJohn Marino case 'T':
188*86d7f5d3SJohn Marino /* Ignore -T, so that RCSINIT can contain -T. */
189*86d7f5d3SJohn Marino if (*a)
190*86d7f5d3SJohn Marino goto unknown;
191*86d7f5d3SJohn Marino break;
192*86d7f5d3SJohn Marino case 'V':
193*86d7f5d3SJohn Marino versionarg = *argv;
194*86d7f5d3SJohn Marino setRCSversion(versionarg);
195*86d7f5d3SJohn Marino break;
196*86d7f5d3SJohn Marino
197*86d7f5d3SJohn Marino case 'k':
198*86d7f5d3SJohn Marino expandarg = *argv;
199*86d7f5d3SJohn Marino if (0 <= str2expmode(expandarg+2))
200*86d7f5d3SJohn Marino break;
201*86d7f5d3SJohn Marino /* fall into */
202*86d7f5d3SJohn Marino default:
203*86d7f5d3SJohn Marino unknown:
204*86d7f5d3SJohn Marino error("unknown option: %s%s", *argv, cmdusage);
205*86d7f5d3SJohn Marino };
206*86d7f5d3SJohn Marino } /* end of option processing */
207*86d7f5d3SJohn Marino
208*86d7f5d3SJohn Marino if (!rev[1]) faterror("no base revision number given");
209*86d7f5d3SJohn Marino
210*86d7f5d3SJohn Marino /* Now handle all pathnames. */
211*86d7f5d3SJohn Marino
212*86d7f5d3SJohn Marino if (!nerror) {
213*86d7f5d3SJohn Marino if (argc < 1)
214*86d7f5d3SJohn Marino faterror("no input file%s", cmdusage);
215*86d7f5d3SJohn Marino if (0 < pairnames(argc, argv, rcsreadopen, true, false)) {
216*86d7f5d3SJohn Marino
217*86d7f5d3SJohn Marino if (argc>2 || (argc==2 && argv[1]))
218*86d7f5d3SJohn Marino warn("excess arguments ignored");
219*86d7f5d3SJohn Marino if (Expand == BINARY_EXPAND)
220*86d7f5d3SJohn Marino workerror("merging binary files");
221*86d7f5d3SJohn Marino diagnose("RCS file: %s\n", RCSname);
222*86d7f5d3SJohn Marino if (!(workptr = Iopen(workname, FOPEN_R_WORK, (struct stat*)0)))
223*86d7f5d3SJohn Marino efaterror(workname);
224*86d7f5d3SJohn Marino
225*86d7f5d3SJohn Marino gettree(); /* reads in the delta tree */
226*86d7f5d3SJohn Marino
227*86d7f5d3SJohn Marino if (!Head) rcsfaterror("no revisions present");
228*86d7f5d3SJohn Marino
229*86d7f5d3SJohn Marino if (!*rev[1])
230*86d7f5d3SJohn Marino rev[1] = Dbranch ? Dbranch : Head->num;
231*86d7f5d3SJohn Marino if (fexpandsym(rev[1], &numericrev, workptr)
232*86d7f5d3SJohn Marino && (target=genrevs(numericrev.string, (char *)0, (char *)0, (char*)0, &gendeltas))
233*86d7f5d3SJohn Marino ) {
234*86d7f5d3SJohn Marino xrev[1] = target->num;
235*86d7f5d3SJohn Marino if (!rev[2] || !*rev[2])
236*86d7f5d3SJohn Marino rev[2] = Dbranch ? Dbranch : Head->num;
237*86d7f5d3SJohn Marino if (fexpandsym(rev[2], &numericrev, workptr)
238*86d7f5d3SJohn Marino && (target=genrevs(numericrev.string, (char *)0, (char *)0, (char *)0, &gendeltas))
239*86d7f5d3SJohn Marino ) {
240*86d7f5d3SJohn Marino xrev[2] = target->num;
241*86d7f5d3SJohn Marino
242*86d7f5d3SJohn Marino if (strcmp(xrev[1],xrev[2]) == 0) {
243*86d7f5d3SJohn Marino if (tostdout) {
244*86d7f5d3SJohn Marino fastcopy(workptr, stdout);
245*86d7f5d3SJohn Marino Ofclose(stdout);
246*86d7f5d3SJohn Marino }
247*86d7f5d3SJohn Marino } else {
248*86d7f5d3SJohn Marino Izclose(&workptr);
249*86d7f5d3SJohn Marino
250*86d7f5d3SJohn Marino for (i=1; i<=2; i++) {
251*86d7f5d3SJohn Marino diagnose("retrieving revision %s\n", xrev[i]);
252*86d7f5d3SJohn Marino bufscpy(&commarg, "-p");
253*86d7f5d3SJohn Marino bufscat(&commarg, rev[i]); /* not xrev[i], for $Name's sake */
254*86d7f5d3SJohn Marino if (run(
255*86d7f5d3SJohn Marino -1,
256*86d7f5d3SJohn Marino /* Do not collide with merger.c maketemp(). */
257*86d7f5d3SJohn Marino arg[i] = maketemp(i+2),
258*86d7f5d3SJohn Marino co, quietarg, commarg.string,
259*86d7f5d3SJohn Marino expandarg, suffixarg, versionarg, zonearg,
260*86d7f5d3SJohn Marino RCSname, (char*)0
261*86d7f5d3SJohn Marino ))
262*86d7f5d3SJohn Marino rcsfaterror("co failed");
263*86d7f5d3SJohn Marino }
264*86d7f5d3SJohn Marino diagnose("Merging differences between %s and %s into %s%s\n",
265*86d7f5d3SJohn Marino xrev[1], xrev[2], workname,
266*86d7f5d3SJohn Marino tostdout?"; result to stdout":"");
267*86d7f5d3SJohn Marino
268*86d7f5d3SJohn Marino arg[0] = xrev[0] = workname;
269*86d7f5d3SJohn Marino status = merge(tostdout, edarg, xrev, arg);
270*86d7f5d3SJohn Marino }
271*86d7f5d3SJohn Marino }
272*86d7f5d3SJohn Marino }
273*86d7f5d3SJohn Marino
274*86d7f5d3SJohn Marino Izclose(&workptr);
275*86d7f5d3SJohn Marino }
276*86d7f5d3SJohn Marino }
277*86d7f5d3SJohn Marino tempunlink();
278*86d7f5d3SJohn Marino exitmain(nerror ? DIFF_TROUBLE : status);
279*86d7f5d3SJohn Marino }
280*86d7f5d3SJohn Marino
281*86d7f5d3SJohn Marino #if RCS_lint
282*86d7f5d3SJohn Marino # define exiterr rmergeExit
283*86d7f5d3SJohn Marino #endif
284*86d7f5d3SJohn Marino void
exiterr()285*86d7f5d3SJohn Marino exiterr()
286*86d7f5d3SJohn Marino {
287*86d7f5d3SJohn Marino tempunlink();
288*86d7f5d3SJohn Marino _exit(DIFF_TROUBLE);
289*86d7f5d3SJohn Marino }
290