1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
/* $OpenBSD: rcsmerge.c,v 1.13 2006/01/05 10:28:24 xsa Exp $ */
/*
* Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
#include "rcsprog.h"
#include "diff.h"
static int kflag = RCS_KWEXP_ERR;
int
rcsmerge_main(int argc, char **argv)
{
int i, ch;
char *fcont, fpath[MAXPATHLEN];
RCSFILE *file;
RCSNUM *baserev, *rev2, *frev;
BUF *bp;
baserev = rev2 = RCS_HEAD_REV;
while ((ch = rcs_getopt(argc, argv, "k:p::q::r:TVx:")) != -1) {
switch (ch) {
case 'k':
kflag = rcs_kflag_get(rcs_optarg);
if (RCS_KWEXP_INVAL(kflag)) {
cvs_log(LP_ERR,
"invalid RCS keyword expansion mode");
(usage)();
exit(1);
}
break;
case 'p':
rcs_set_rev(rcs_optarg, &baserev);
pipeout = 1;
break;
case 'q':
rcs_set_rev(rcs_optarg, &baserev);
verbose = 0;
break;
case 'r':
if (baserev == RCS_HEAD_REV)
rcs_set_rev(rcs_optarg, &baserev);
else if (rev2 == RCS_HEAD_REV)
rcs_set_rev(rcs_optarg, &rev2);
else
cvs_log(LP_WARN, "ignored excessive -r option");
break;
case 'T':
/*
* kept for compatibility
*/
break;
case 'V':
printf("%s\n", rcs_version);
exit(0);
case 'x':
rcs_suffixes = rcs_optarg;
break;
default:
break;
}
}
argc -= rcs_optind;
argv += rcs_optind;
if (argc < 0) {
cvs_log(LP_ERR, "no input file");
(usage)();
exit(1);
}
if (baserev == RCS_HEAD_REV) {
cvs_log(LP_ERR, "no base revision number given");
(usage)();
exit(1);
}
for (i = 0; i < argc; i++) {
if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
continue;
if ((file = rcs_open(fpath, RCS_READ)) == NULL)
continue;
if (rev2 == RCS_HEAD_REV)
frev = file->rf_head;
else
frev = rev2;
printf("RCS file: %s\n", fpath);
if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) {
cvs_log(LP_ERR, "failed to merge");
rcs_close(file);
continue;
}
if (pipeout == 1) {
if (cvs_buf_putc(bp, '\0') < 0) {
rcs_close(file);
continue;
}
fcont = cvs_buf_release(bp);
printf("%s", fcont);
xfree(fcont);
} else {
/* XXX mode */
if (cvs_buf_write(bp, argv[i], 0644) < 0)
cvs_log(LP_ERR, "failed to write new file");
cvs_buf_free(bp);
}
if (diff3_conflicts > 0) {
cvs_log(LP_WARN, "%d conflict%s found during merge",
diff3_conflicts, (diff3_conflicts > 1) ? "s": "");
}
rcs_close(file);
}
return (0);
}
void
rcsmerge_usage(void)
{
fprintf(stderr,
"usage: rcsmerge [-TV] [-kmode] [-p[rev]] [-q[rev]] "
"[-rrev] [-xsuffixes] file ...\n");
}
|
