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
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
|
/* $OpenBSD: diff.c,v 1.121 2007/09/22 16:01:22 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/stat.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include "cvs.h"
#include "diff.h"
#include "remote.h"
void cvs_diff_local(struct cvs_file *);
static int Nflag = 0;
static char *rev1 = NULL;
static char *rev2 = NULL;
struct cvs_cmd cvs_cmd_diff = {
CVS_OP_DIFF, 0, "diff",
{ "di", "dif" },
"Show differences between revisions",
"[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] "
"[-k mode] [file ...]",
"cD:iklNnpr:Ru",
NULL,
cvs_diff
};
int
cvs_diff(int argc, char **argv)
{
int ch;
char *arg = ".";
int flags;
struct cvs_recursion cr;
flags = CR_RECURSE_DIRS;
strlcpy(diffargs, argv[0], sizeof(diffargs));
while ((ch = getopt(argc, argv, cvs_cmd_diff.cmd_opts)) != -1) {
switch (ch) {
case 'c':
strlcat(diffargs, " -c", sizeof(diffargs));
diff_format = D_CONTEXT;
break;
case 'l':
flags &= ~CR_RECURSE_DIRS;
break;
case 'n':
strlcat(diffargs, " -n", sizeof(diffargs));
diff_format = D_RCSDIFF;
break;
case 'N':
strlcat(diffargs, " -N", sizeof(diffargs));
Nflag = 1;
break;
case 'p':
strlcat(diffargs, " -p", sizeof(diffargs));
diff_pflag = 1;
break;
case 'r':
if (rev1 == NULL) {
rev1 = optarg;
} else if (rev2 == NULL) {
rev2 = optarg;
} else {
fatal("no more than 2 revisions/dates can"
" be specified");
}
break;
case 'u':
strlcat(diffargs, " -u", sizeof(diffargs));
diff_format = D_UNIFIED;
break;
default:
fatal("%s", cvs_cmd_diff.cmd_synopsis);
}
}
argc -= optind;
argv += optind;
cr.enterdir = NULL;
cr.leavedir = NULL;
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
cvs_client_connect_to_server();
cr.fileproc = cvs_client_sendfile;
if (!(flags & CR_RECURSE_DIRS))
cvs_client_send_request("Argument -l");
switch (diff_format) {
case D_CONTEXT:
cvs_client_send_request("Argument -c");
break;
case D_RCSDIFF:
cvs_client_send_request("Argument -n");
break;
case D_UNIFIED:
cvs_client_send_request("Argument -u");
break;
default:
break;
}
if (Nflag == 1)
cvs_client_send_request("Argument -N");
if (diff_pflag == 1)
cvs_client_send_request("Argument -p");
if (rev1 != NULL)
cvs_client_send_request("Argument -r%s", rev1);
if (rev2 != NULL)
cvs_client_send_request("Argument -r%s", rev2);
} else {
cr.fileproc = cvs_diff_local;
}
cr.flags = flags;
diff_rev1 = diff_rev2 = NULL;
if (argc > 0)
cvs_file_run(argc, argv, &cr);
else
cvs_file_run(1, &arg, &cr);
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
cvs_client_send_files(argv, argc);
cvs_client_senddir(".");
cvs_client_send_request("diff");
cvs_client_get_responses();
}
return (0);
}
void
cvs_diff_local(struct cvs_file *cf)
{
RCSNUM *r1;
BUF *b1;
struct stat st;
struct timeval tv[2], tv2[2];
char rbuf[CVS_REV_BUFSZ], *p1, *p2;
r1 = NULL;
b1 = NULL;
cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path);
if (cf->file_type == CVS_DIR) {
if (verbosity > 1)
cvs_log(LP_NOTICE, "Diffing inside %s", cf->file_path);
return;
}
cvs_file_classify(cf, cvs_directory_tag);
if (cf->file_status == FILE_LOST) {
cvs_log(LP_ERR, "cannot find file %s", cf->file_path);
return;
} else if (cf->file_status == FILE_UNKNOWN) {
cvs_log(LP_ERR, "I know nothing about %s", cf->file_path);
return;
} else if (cf->file_status == FILE_ADDED && Nflag == 0) {
cvs_log(LP_ERR, "%s is a new entry, no comparison available",
cf->file_path);
return;
} else if (cf->file_status == FILE_REMOVED && Nflag == 0) {
cvs_log(LP_ERR, "%s was removed, no comparison available",
cf->file_path);
return;
} else if (cf->file_status == FILE_UPTODATE && rev1 == NULL &&
rev2 == NULL) {
return;
}
if (rev1 != NULL)
if ((diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs)) == NULL)
return;
if (rev2 != NULL)
if ((diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs)) == NULL)
return;
diff_file = cf->file_path;
cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path,
RCS_DIFF_DIV, cf->file_rpath);
(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
if (cf->file_status != FILE_ADDED) {
if (diff_rev1 != NULL)
r1 = diff_rev1;
else
r1 = cf->file_ent->ce_rev;
diff_rev1 = r1;
rcsnum_tostr(r1, rbuf , sizeof(rbuf));
tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1);
tv[0].tv_usec = 0;
tv[1] = tv[0];
cvs_printf("Retrieving revision %s\n", rbuf);
rcs_rev_write_stmp(cf->file_rcs, r1, p1, 0);
}
if (diff_rev2 != NULL && cf->file_status != FILE_ADDED &&
cf->file_status != FILE_REMOVED) {
rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
tv2[0].tv_usec = 0;
tv2[1] = tv2[0];
cvs_printf("Retrieving revision %s\n", rbuf);
rcs_rev_write_stmp(cf->file_rcs, diff_rev2, p2, 0);
} else if (cf->file_status != FILE_REMOVED) {
if (cvs_server_active == 1 &&
cf->file_status != FILE_MODIFIED) {
rcs_rev_write_stmp(cf->file_rcs,
cf->file_rcsrev, p2, 0);
} else {
if (fstat(cf->fd, &st) == -1)
fatal("fstat failed %s", strerror(errno));
if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
fatal("failed to load %s", cf->file_path);
tv2[0].tv_sec = st.st_mtime;
tv2[0].tv_usec = 0;
tv2[1] = tv2[0];
cvs_buf_write_stmp(b1, p2, tv2);
cvs_buf_free(b1);
}
}
cvs_printf("%s", diffargs);
if (cf->file_status != FILE_ADDED) {
rcsnum_tostr(r1, rbuf, sizeof(rbuf));
cvs_printf(" -r%s", rbuf);
if (diff_rev2 != NULL) {
rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
cvs_printf(" -r%s", rbuf);
}
}
cvs_printf(" %s\n", cf->file_path);
if (cf->file_status == FILE_ADDED) {
xfree(p1);
(void)xasprintf(&p1, "%s", CVS_PATH_DEVNULL);
} else if (cf->file_status == FILE_REMOVED) {
xfree(p2);
(void)xasprintf(&p2, "%s", CVS_PATH_DEVNULL);
}
if (cvs_diffreg(p1, p2, NULL) == D_ERROR)
fatal("cvs_diff_local: failed to get RCS patch");
cvs_worklist_run(&temp_files, cvs_worklist_unlink);
if (p1 != NULL)
xfree(p1);
if (p2 != NULL)
xfree(p2);
if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev)
rcsnum_free(diff_rev1);
if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev)
rcsnum_free(diff_rev2);
diff_rev1 = diff_rev2 = NULL;
}
|
