Annotation of src/usr.bin/cvs/diff.c, Revision 1.128
1.128 ! tobias 1: /* $OpenBSD: diff.c,v 1.127 2008/02/04 21:25:32 tobias Exp $ */
1.1 jfb 2: /*
1.91 joris 3: * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.1 jfb 4: *
1.91 joris 5: * Permission to use, copy, modify, and distribute this software for any
6: * purpose with or without fee is hereby granted, provided that the above
7: * copyright notice and this permission notice appear in all copies.
8: *
9: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1.1 jfb 16: */
17:
1.118 otto 18: #include <sys/stat.h>
1.125 tobias 19: #include <sys/time.h>
1.118 otto 20:
21: #include <errno.h>
1.125 tobias 22: #include <stdlib.h>
1.118 otto 23: #include <string.h>
24: #include <unistd.h>
1.1 jfb 25:
26: #include "cvs.h"
1.56 niallo 27: #include "diff.h"
1.108 joris 28: #include "remote.h"
1.86 joris 29:
1.91 joris 30: void cvs_diff_local(struct cvs_file *);
1.46 xsa 31:
1.126 tobias 32: static int Nflag = 0;
33: static int force_head = 0;
34: static char *koptstr;
35: static char *rev1 = NULL;
36: static char *rev2 = NULL;
1.94 joris 37:
1.36 jfb 38: struct cvs_cmd cvs_cmd_diff = {
1.124 tobias 39: CVS_OP_DIFF, CVS_USE_WDIR, "diff",
1.36 jfb 40: { "di", "dif" },
41: "Show differences between revisions",
1.122 tobias 42: "[-cilNnpRu] [[-D date] [-r rev] [-D date2 | -r rev2]] "
1.43 xsa 43: "[-k mode] [file ...]",
1.126 tobias 44: "cfD:ik:lNnpr:Ru",
1.125 tobias 45: NULL,
46: cvs_diff
47: };
48:
49: struct cvs_cmd cvs_cmd_rdiff = {
50: CVS_OP_RDIFF, 0, "rdiff",
51: { "patch", "pa" },
52: "Show differences between revisions",
53: "[-flR] [-c | -u] [-s | -t] [-V ver] -D date | -r rev\n"
54: "[-D date2 | -r rev2] [-k mode] module ...",
1.126 tobias 55: "cfD:k:lr:RuV:",
1.36 jfb 56: NULL,
1.91 joris 57: cvs_diff
1.36 jfb 58: };
59:
1.91 joris 60: int
61: cvs_diff(int argc, char **argv)
1.1 jfb 62: {
1.127 tobias 63: int ch, flags;
1.91 joris 64: char *arg = ".";
65: struct cvs_recursion cr;
1.1 jfb 66:
1.92 joris 67: flags = CR_RECURSE_DIRS;
1.128 ! tobias 68: strlcpy(diffargs, cvs_cmdop == CVS_OP_DIFF ? "diff" : "rdiff",
! 69: sizeof(diffargs));
1.1 jfb 70:
1.127 tobias 71: while ((ch = getopt(argc, argv, cvs_cmdop == CVS_OP_DIFF ?
72: cvs_cmd_diff.cmd_opts : cvs_cmd_rdiff.cmd_opts)) != -1) {
1.1 jfb 73: switch (ch) {
74: case 'c':
1.2 jfb 75: strlcat(diffargs, " -c", sizeof(diffargs));
1.58 niallo 76: diff_format = D_CONTEXT;
1.1 jfb 77: break;
1.125 tobias 78: case 'f':
79: force_head = 1;
80: break;
81: case 'i':
82: strlcat(diffargs, " -i", sizeof(diffargs));
83: diff_iflag = 1;
84: break;
1.126 tobias 85: case 'k':
86: koptstr = optarg;
87: kflag = rcs_kflag_get(koptstr);
88: if (RCS_KWEXP_INVAL(kflag)) {
89: cvs_log(LP_ERR,
90: "invalid RCS keyword expension mode");
91: fatal("%s", cvs_cmd_add.cmd_synopsis);
92: }
93: break;
1.92 joris 94: case 'l':
95: flags &= ~CR_RECURSE_DIRS;
96: break;
1.33 jfb 97: case 'n':
98: strlcat(diffargs, " -n", sizeof(diffargs));
1.58 niallo 99: diff_format = D_RCSDIFF;
1.33 jfb 100: break;
1.94 joris 101: case 'N':
1.95 joris 102: Nflag = 1;
1.94 joris 103: break;
1.101 joris 104: case 'p':
105: strlcat(diffargs, " -p", sizeof(diffargs));
106: diff_pflag = 1;
1.122 tobias 107: break;
108: case 'R':
109: flags |= CR_RECURSE_DIRS;
1.101 joris 110: break;
1.1 jfb 111: case 'r':
1.97 joris 112: if (rev1 == NULL) {
113: rev1 = optarg;
114: } else if (rev2 == NULL) {
115: rev2 = optarg;
1.23 joris 116: } else {
1.91 joris 117: fatal("no more than 2 revisions/dates can"
118: " be specified");
1.1 jfb 119: }
1.32 joris 120: break;
1.1 jfb 121: case 'u':
1.2 jfb 122: strlcat(diffargs, " -u", sizeof(diffargs));
1.58 niallo 123: diff_format = D_UNIFIED;
1.1 jfb 124: break;
1.126 tobias 125: case 'V':
126: fatal("the -V option is obsolete "
127: "and should not be used");
1.1 jfb 128: default:
1.91 joris 129: fatal("%s", cvs_cmd_diff.cmd_synopsis);
1.36 jfb 130: }
1.13 jfb 131: }
132:
1.91 joris 133: argc -= optind;
134: argv += optind;
1.1 jfb 135:
1.91 joris 136: cr.enterdir = NULL;
137: cr.leavedir = NULL;
1.108 joris 138:
1.125 tobias 139: if (cvs_cmdop == CVS_OP_RDIFF) {
140: if (rev1 == NULL)
141: fatal("must specify at least one revision/date!");
142:
143: if (!diff_format) {
144: strlcat(diffargs, " -c", sizeof(diffargs));
145: diff_format = D_CONTEXT;
146: }
147:
148: flags |= CR_REPO;
149: }
150:
1.108 joris 151: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.110 joris 152: cvs_client_connect_to_server();
1.108 joris 153: cr.fileproc = cvs_client_sendfile;
154:
155: if (!(flags & CR_RECURSE_DIRS))
156: cvs_client_send_request("Argument -l");
157:
1.126 tobias 158: if (kflag)
159: cvs_client_send_request("Argument -k%s", koptstr);
160:
1.108 joris 161: switch (diff_format) {
162: case D_CONTEXT:
163: cvs_client_send_request("Argument -c");
164: break;
165: case D_RCSDIFF:
166: cvs_client_send_request("Argument -n");
167: break;
168: case D_UNIFIED:
169: cvs_client_send_request("Argument -u");
170: break;
171: default:
172: break;
173: }
174:
175: if (Nflag == 1)
176: cvs_client_send_request("Argument -N");
177:
178: if (diff_pflag == 1)
179: cvs_client_send_request("Argument -p");
180:
181: if (rev1 != NULL)
182: cvs_client_send_request("Argument -r%s", rev1);
183: if (rev2 != NULL)
184: cvs_client_send_request("Argument -r%s", rev2);
185: } else {
1.125 tobias 186: if (cvs_cmdop == CVS_OP_RDIFF &&
187: chdir(current_cvsroot->cr_dir) == -1)
188: fatal("cvs_diff: %s", strerror(errno));
189:
1.108 joris 190: cr.fileproc = cvs_diff_local;
191: }
192:
1.92 joris 193: cr.flags = flags;
1.7 jfb 194:
1.97 joris 195: diff_rev1 = diff_rev2 = NULL;
196:
1.125 tobias 197: if (cvs_cmdop == CVS_OP_DIFF ||
198: current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
199: if (argc > 0)
200: cvs_file_run(argc, argv, &cr);
201: else
202: cvs_file_run(1, &arg, &cr);
203: }
1.108 joris 204:
205: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
206: cvs_client_send_files(argv, argc);
207: cvs_client_senddir(".");
1.125 tobias 208:
209: cvs_client_send_request((cvs_cmdop == CVS_OP_RDIFF) ?
210: "rdiff" : "diff");
211:
1.108 joris 212: cvs_client_get_responses();
213: }
1.36 jfb 214:
215: return (0);
216: }
217:
1.91 joris 218: void
219: cvs_diff_local(struct cvs_file *cf)
1.36 jfb 220: {
1.91 joris 221: RCSNUM *r1;
1.114 joris 222: BUF *b1;
1.91 joris 223: struct stat st;
1.69 niallo 224: struct timeval tv[2], tv2[2];
1.120 xsa 225: char rbuf[CVS_REV_BUFSZ], *p1, *p2;
1.111 xsa 226:
227: r1 = NULL;
1.114 joris 228: b1 = NULL;
1.69 niallo 229:
1.91 joris 230: cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path);
1.1 jfb 231:
1.91 joris 232: if (cf->file_type == CVS_DIR) {
1.46 xsa 233: if (verbosity > 1)
1.91 joris 234: cvs_log(LP_NOTICE, "Diffing inside %s", cf->file_path);
1.1 jfb 235: return;
236: }
237:
1.121 joris 238: cvs_file_classify(cf, cvs_directory_tag);
1.1 jfb 239:
1.91 joris 240: if (cf->file_status == FILE_LOST) {
241: cvs_log(LP_ERR, "cannot find file %s", cf->file_path);
1.1 jfb 242: return;
1.91 joris 243: } else if (cf->file_status == FILE_UNKNOWN) {
244: cvs_log(LP_ERR, "I know nothing about %s", cf->file_path);
1.1 jfb 245: return;
1.95 joris 246: } else if (cf->file_status == FILE_ADDED && Nflag == 0) {
1.94 joris 247: cvs_log(LP_ERR, "%s is a new entry, no comparison available",
248: cf->file_path);
1.1 jfb 249: return;
1.95 joris 250: } else if (cf->file_status == FILE_REMOVED && Nflag == 0) {
251: cvs_log(LP_ERR, "%s was removed, no comparison available",
252: cf->file_path);
253: return;
1.99 joris 254: } else if (cf->file_status == FILE_UPTODATE && rev1 == NULL &&
255: rev2 == NULL) {
1.94 joris 256: return;
257: }
1.126 tobias 258:
259: if (kflag)
260: rcs_kwexp_set(cf->file_rcs, kflag);
1.97 joris 261:
262: if (rev1 != NULL)
1.125 tobias 263: if ((diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs)) ==
264: NULL) {
265: if (cvs_cmdop == CVS_OP_DIFF) {
266: cvs_log(LP_ERR, "tag %s is not in file %s",
267: rev1, cf->file_path);
268: return;
269: }
270: if (force_head) {
271: /* -f is not allowed for unknown symbols */
272: diff_rev1 = rcsnum_parse(rev1);
273: if (diff_rev1 == NULL)
274: fatal("no such tag %s", rev1);
275: rcsnum_free(diff_rev1);
276:
277: diff_rev1 = rcsnum_alloc();
278: rcsnum_cpy(cf->file_rcs->rf_head, diff_rev1, 0);
279: }
280: }
1.121 joris 281:
1.97 joris 282: if (rev2 != NULL)
1.123 tobias 283: if ((diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs)) ==
284: NULL) {
1.125 tobias 285: if (cvs_cmdop == CVS_OP_DIFF) {
286: rcsnum_free(diff_rev1);
287: cvs_log(LP_ERR, "tag %s is not in file %s",
288: rev2, cf->file_path);
289: return;
290: }
291: if (force_head) {
292: /* -f is not allowed for unknown symbols */
293: diff_rev2 = rcsnum_parse(rev2);
294: if (diff_rev2 == NULL)
295: fatal("no such tag %s", rev2);
296: rcsnum_free(diff_rev2);
297:
298: diff_rev2 = rcsnum_alloc();
299: rcsnum_cpy(cf->file_rcs->rf_head, diff_rev2, 0);
300: }
1.123 tobias 301: }
1.1 jfb 302:
1.125 tobias 303: if (cvs_cmdop == CVS_OP_RDIFF && diff_rev1 == NULL && diff_rev2 == NULL)
304: return;
305:
1.91 joris 306: diff_file = cf->file_path;
1.125 tobias 307:
308: cvs_printf("Index: %s\n", cf->file_path);
309: if (cvs_cmdop == CVS_OP_DIFF)
310: cvs_printf("%s\nRCS file: %s\n", RCS_DIFF_DIV, cf->file_rpath);
1.1 jfb 311:
1.114 joris 312: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
313: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
314:
1.94 joris 315: if (cf->file_status != FILE_ADDED) {
316: if (diff_rev1 != NULL)
317: r1 = diff_rev1;
1.125 tobias 318: else if (cf->file_ent != NULL)
319: r1 = cf->file_ent->ce_rev;
1.94 joris 320: else
1.125 tobias 321: r1 = NULL;
1.1 jfb 322:
1.94 joris 323: diff_rev1 = r1;
1.91 joris 324:
1.125 tobias 325: if (diff_rev1 != NULL) {
326: (void)rcsnum_tostr(r1, rbuf, sizeof(rbuf));
1.114 joris 327:
1.125 tobias 328: tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1);
329: tv[0].tv_usec = 0;
330: tv[1] = tv[0];
331:
332: if (cvs_cmdop == CVS_OP_DIFF)
333: cvs_printf("retrieving revision %s\n", rbuf);
334: rcs_rev_write_stmp(cf->file_rcs, r1, p1, 0);
335: if (utimes(p1, tv) == -1)
336: fatal("cvs_diff_local: utimes failed");
337: }
1.94 joris 338: }
1.91 joris 339:
1.95 joris 340: if (diff_rev2 != NULL && cf->file_status != FILE_ADDED &&
341: cf->file_status != FILE_REMOVED) {
1.125 tobias 342: (void)rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
1.91 joris 343:
344: tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
345: tv2[0].tv_usec = 0;
346: tv2[1] = tv2[0];
1.114 joris 347:
1.125 tobias 348: if (cvs_cmdop == CVS_OP_DIFF)
349: cvs_printf("retrieving revision %s\n", rbuf);
1.114 joris 350: rcs_rev_write_stmp(cf->file_rcs, diff_rev2, p2, 0);
1.125 tobias 351: if (utimes(p2, tv2) == -1)
352: fatal("cvs_diff_local: utimes failed");
1.95 joris 353: } else if (cf->file_status != FILE_REMOVED) {
1.125 tobias 354: if (cvs_cmdop == CVS_OP_RDIFF || (cvs_server_active == 1 &&
355: cf->file_status != FILE_MODIFIED)) {
356: if (diff_rev2 != NULL) {
357: tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs,
358: cf->file_rcsrev);
359: tv2[0].tv_usec = 0;
360: tv2[1] = tv2[0];
361:
362: rcs_rev_write_stmp(cf->file_rcs,
363: cf->file_rcsrev, p2, 0);
364: if (utimes(p2, tv2) == -1)
365: fatal("cvs_diff_local: utimes failed");
366: }
1.121 joris 367: } else {
368: if (fstat(cf->fd, &st) == -1)
369: fatal("fstat failed %s", strerror(errno));
370: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
371: fatal("failed to load %s", cf->file_path);
372:
373: tv2[0].tv_sec = st.st_mtime;
374: tv2[0].tv_usec = 0;
375: tv2[1] = tv2[0];
1.91 joris 376:
1.121 joris 377: cvs_buf_write_stmp(b1, p2, tv2);
378: cvs_buf_free(b1);
379: }
1.17 jfb 380: }
381:
1.125 tobias 382: if (cvs_cmdop == CVS_OP_DIFF) {
383: cvs_printf("%s", diffargs);
384:
385: if (cf->file_status != FILE_ADDED) {
386: (void)rcsnum_tostr(r1, rbuf, sizeof(rbuf));
387: cvs_printf(" -r%s", rbuf);
388:
389: if (diff_rev2 != NULL) {
390: (void)rcsnum_tostr(diff_rev2, rbuf,
391: sizeof(rbuf));
392: cvs_printf(" -r%s", rbuf);
393: }
394: }
1.1 jfb 395:
1.125 tobias 396: if (diff_rev2 == NULL)
397: cvs_printf(" %s\n", cf->file_name);
398: } else {
399: cvs_printf("diff ");
400: switch (diff_format) {
401: case D_CONTEXT:
402: cvs_printf("-c ");
403: break;
404: case D_RCSDIFF:
405: cvs_printf("-n ");
406: break;
407: case D_UNIFIED:
408: cvs_printf("-u ");
409: break;
410: default:
411: break;
412: }
413: if (diff_rev1 == NULL) {
414: cvs_printf("%s ", CVS_PATH_DEVNULL);
415: } else {
416: (void)rcsnum_tostr(diff_rev1, rbuf, sizeof(rbuf));
417: cvs_printf("%s:%s ", cf->file_path, rbuf);
418: }
1.1 jfb 419:
1.125 tobias 420: if (diff_rev2 == NULL) {
421: cvs_printf("%s:removed\n", cf->file_path);
422: } else {
423: (void)rcsnum_tostr(diff_rev2 != NULL ? diff_rev2 :
424: cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
425: cvs_printf("%s:%s\n", cf->file_path, rbuf);
1.94 joris 426: }
1.1 jfb 427: }
428:
1.125 tobias 429: if (cf->file_status == FILE_ADDED ||
430: (cvs_cmdop == CVS_OP_RDIFF && diff_rev1 == NULL)) {
1.114 joris 431: xfree(p1);
1.111 xsa 432: (void)xasprintf(&p1, "%s", CVS_PATH_DEVNULL);
1.125 tobias 433: } else if (cf->file_status == FILE_REMOVED ||
434: (cvs_cmdop == CVS_OP_RDIFF && diff_rev2 == NULL)) {
1.114 joris 435: xfree(p2);
1.111 xsa 436: (void)xasprintf(&p2, "%s", CVS_PATH_DEVNULL);
1.114 joris 437: }
1.111 xsa 438:
439: if (cvs_diffreg(p1, p2, NULL) == D_ERROR)
440: fatal("cvs_diff_local: failed to get RCS patch");
1.58 niallo 441:
1.91 joris 442: cvs_worklist_run(&temp_files, cvs_worklist_unlink);
1.111 xsa 443:
444: if (p1 != NULL)
445: xfree(p1);
446: if (p2 != NULL)
447: xfree(p2);
1.101 joris 448:
1.125 tobias 449: if (diff_rev1 != NULL && diff_rev1 != cf->file_rcs->rf_head &&
450: (cf->file_ent != NULL && diff_rev1 != cf->file_ent->ce_rev))
1.101 joris 451: rcsnum_free(diff_rev1);
1.125 tobias 452: if (diff_rev2 != NULL)
1.101 joris 453: rcsnum_free(diff_rev2);
1.94 joris 454:
455: diff_rev1 = diff_rev2 = NULL;
1.1 jfb 456: }
![[BACK]](/icons/back.gif){kind=icon}
Return to diff.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs