Annotation of src/usr.bin/cvs/diff.c, Revision 1.124
1.124 ! tobias 1: /* $OpenBSD: diff.c,v 1.123 2008/01/29 12:00:34 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>
19:
20: #include <errno.h>
21: #include <string.h>
22: #include <unistd.h>
1.1 jfb 23:
24: #include "cvs.h"
1.56 niallo 25: #include "diff.h"
1.108 joris 26: #include "remote.h"
1.86 joris 27:
1.91 joris 28: void cvs_diff_local(struct cvs_file *);
1.46 xsa 29:
1.97 joris 30: static int Nflag = 0;
31: static char *rev1 = NULL;
32: static char *rev2 = NULL;
1.94 joris 33:
1.36 jfb 34: struct cvs_cmd cvs_cmd_diff = {
1.124 ! tobias 35: CVS_OP_DIFF, CVS_USE_WDIR, "diff",
1.36 jfb 36: { "di", "dif" },
37: "Show differences between revisions",
1.122 tobias 38: "[-cilNnpRu] [[-D date] [-r rev] [-D date2 | -r rev2]] "
1.43 xsa 39: "[-k mode] [file ...]",
40: "cD:iklNnpr:Ru",
1.36 jfb 41: NULL,
1.91 joris 42: cvs_diff
1.36 jfb 43: };
44:
1.91 joris 45: int
46: cvs_diff(int argc, char **argv)
1.1 jfb 47: {
1.23 joris 48: int ch;
1.91 joris 49: char *arg = ".";
1.92 joris 50: int flags;
1.91 joris 51: struct cvs_recursion cr;
1.1 jfb 52:
1.92 joris 53: flags = CR_RECURSE_DIRS;
1.2 jfb 54: strlcpy(diffargs, argv[0], sizeof(diffargs));
1.1 jfb 55:
1.91 joris 56: while ((ch = getopt(argc, argv, cvs_cmd_diff.cmd_opts)) != -1) {
1.1 jfb 57: switch (ch) {
58: case 'c':
1.2 jfb 59: strlcat(diffargs, " -c", sizeof(diffargs));
1.58 niallo 60: diff_format = D_CONTEXT;
1.1 jfb 61: break;
1.92 joris 62: case 'l':
63: flags &= ~CR_RECURSE_DIRS;
64: break;
1.33 jfb 65: case 'n':
66: strlcat(diffargs, " -n", sizeof(diffargs));
1.58 niallo 67: diff_format = D_RCSDIFF;
1.33 jfb 68: break;
1.94 joris 69: case 'N':
70: strlcat(diffargs, " -N", sizeof(diffargs));
1.95 joris 71: Nflag = 1;
1.94 joris 72: break;
1.101 joris 73: case 'p':
74: strlcat(diffargs, " -p", sizeof(diffargs));
75: diff_pflag = 1;
1.122 tobias 76: break;
77: case 'R':
78: flags |= CR_RECURSE_DIRS;
1.101 joris 79: break;
1.1 jfb 80: case 'r':
1.97 joris 81: if (rev1 == NULL) {
82: rev1 = optarg;
83: } else if (rev2 == NULL) {
84: rev2 = optarg;
1.23 joris 85: } else {
1.91 joris 86: fatal("no more than 2 revisions/dates can"
87: " be specified");
1.1 jfb 88: }
1.32 joris 89: break;
1.1 jfb 90: case 'u':
1.2 jfb 91: strlcat(diffargs, " -u", sizeof(diffargs));
1.58 niallo 92: diff_format = D_UNIFIED;
1.1 jfb 93: break;
94: default:
1.91 joris 95: fatal("%s", cvs_cmd_diff.cmd_synopsis);
1.36 jfb 96: }
1.13 jfb 97: }
98:
1.91 joris 99: argc -= optind;
100: argv += optind;
1.1 jfb 101:
1.91 joris 102: cr.enterdir = NULL;
103: cr.leavedir = NULL;
1.108 joris 104:
105: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.110 joris 106: cvs_client_connect_to_server();
1.108 joris 107: cr.fileproc = cvs_client_sendfile;
108:
109: if (!(flags & CR_RECURSE_DIRS))
110: cvs_client_send_request("Argument -l");
111:
112: switch (diff_format) {
113: case D_CONTEXT:
114: cvs_client_send_request("Argument -c");
115: break;
116: case D_RCSDIFF:
117: cvs_client_send_request("Argument -n");
118: break;
119: case D_UNIFIED:
120: cvs_client_send_request("Argument -u");
121: break;
122: default:
123: break;
124: }
125:
126: if (Nflag == 1)
127: cvs_client_send_request("Argument -N");
128:
129: if (diff_pflag == 1)
130: cvs_client_send_request("Argument -p");
131:
132: if (rev1 != NULL)
133: cvs_client_send_request("Argument -r%s", rev1);
134: if (rev2 != NULL)
135: cvs_client_send_request("Argument -r%s", rev2);
136: } else {
137: cr.fileproc = cvs_diff_local;
138: }
139:
1.92 joris 140: cr.flags = flags;
1.7 jfb 141:
1.97 joris 142: diff_rev1 = diff_rev2 = NULL;
143:
1.91 joris 144: if (argc > 0)
145: cvs_file_run(argc, argv, &cr);
1.82 ray 146: else
1.91 joris 147: cvs_file_run(1, &arg, &cr);
1.108 joris 148:
149: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
150: cvs_client_send_files(argv, argc);
151: cvs_client_senddir(".");
152: cvs_client_send_request("diff");
153: cvs_client_get_responses();
154: }
1.36 jfb 155:
156: return (0);
157: }
158:
1.91 joris 159: void
160: cvs_diff_local(struct cvs_file *cf)
1.36 jfb 161: {
1.91 joris 162: RCSNUM *r1;
1.114 joris 163: BUF *b1;
1.91 joris 164: struct stat st;
1.69 niallo 165: struct timeval tv[2], tv2[2];
1.120 xsa 166: char rbuf[CVS_REV_BUFSZ], *p1, *p2;
1.111 xsa 167:
168: r1 = NULL;
1.114 joris 169: b1 = NULL;
1.69 niallo 170:
1.91 joris 171: cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path);
1.1 jfb 172:
1.91 joris 173: if (cf->file_type == CVS_DIR) {
1.46 xsa 174: if (verbosity > 1)
1.91 joris 175: cvs_log(LP_NOTICE, "Diffing inside %s", cf->file_path);
1.1 jfb 176: return;
177: }
178:
1.121 joris 179: cvs_file_classify(cf, cvs_directory_tag);
1.1 jfb 180:
1.91 joris 181: if (cf->file_status == FILE_LOST) {
182: cvs_log(LP_ERR, "cannot find file %s", cf->file_path);
1.1 jfb 183: return;
1.91 joris 184: } else if (cf->file_status == FILE_UNKNOWN) {
185: cvs_log(LP_ERR, "I know nothing about %s", cf->file_path);
1.1 jfb 186: return;
1.95 joris 187: } else if (cf->file_status == FILE_ADDED && Nflag == 0) {
1.94 joris 188: cvs_log(LP_ERR, "%s is a new entry, no comparison available",
189: cf->file_path);
1.1 jfb 190: return;
1.95 joris 191: } else if (cf->file_status == FILE_REMOVED && Nflag == 0) {
192: cvs_log(LP_ERR, "%s was removed, no comparison available",
193: cf->file_path);
194: return;
1.99 joris 195: } else if (cf->file_status == FILE_UPTODATE && rev1 == NULL &&
196: rev2 == NULL) {
1.94 joris 197: return;
198: }
1.97 joris 199:
200: if (rev1 != NULL)
1.115 niallo 201: if ((diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs)) == NULL)
1.121 joris 202: return;
203:
1.97 joris 204: if (rev2 != NULL)
1.123 tobias 205: if ((diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs)) ==
206: NULL) {
207: rcsnum_free(diff_rev1);
1.121 joris 208: return;
1.123 tobias 209: }
1.1 jfb 210:
1.91 joris 211: diff_file = cf->file_path;
212: cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path,
213: RCS_DIFF_DIV, cf->file_rpath);
1.1 jfb 214:
1.114 joris 215: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
216: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
217:
1.94 joris 218: if (cf->file_status != FILE_ADDED) {
219: if (diff_rev1 != NULL)
220: r1 = diff_rev1;
221: else
222: r1 = cf->file_ent->ce_rev;
1.1 jfb 223:
1.94 joris 224: diff_rev1 = r1;
225: rcsnum_tostr(r1, rbuf , sizeof(rbuf));
1.91 joris 226:
1.94 joris 227: tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1);
228: tv[0].tv_usec = 0;
229: tv[1] = tv[0];
1.114 joris 230:
1.119 joris 231: cvs_printf("Retrieving revision %s\n", rbuf);
1.114 joris 232: rcs_rev_write_stmp(cf->file_rcs, r1, p1, 0);
1.94 joris 233: }
1.91 joris 234:
1.95 joris 235: if (diff_rev2 != NULL && cf->file_status != FILE_ADDED &&
236: cf->file_status != FILE_REMOVED) {
1.91 joris 237: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
238:
239: tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
240: tv2[0].tv_usec = 0;
241: tv2[1] = tv2[0];
1.114 joris 242:
1.119 joris 243: cvs_printf("Retrieving revision %s\n", rbuf);
1.114 joris 244: rcs_rev_write_stmp(cf->file_rcs, diff_rev2, p2, 0);
1.95 joris 245: } else if (cf->file_status != FILE_REMOVED) {
1.121 joris 246: if (cvs_server_active == 1 &&
247: cf->file_status != FILE_MODIFIED) {
248: rcs_rev_write_stmp(cf->file_rcs,
249: cf->file_rcsrev, p2, 0);
250: } else {
251: if (fstat(cf->fd, &st) == -1)
252: fatal("fstat failed %s", strerror(errno));
253: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
254: fatal("failed to load %s", cf->file_path);
255:
256: tv2[0].tv_sec = st.st_mtime;
257: tv2[0].tv_usec = 0;
258: tv2[1] = tv2[0];
1.91 joris 259:
1.121 joris 260: cvs_buf_write_stmp(b1, p2, tv2);
261: cvs_buf_free(b1);
262: }
1.17 jfb 263: }
264:
1.91 joris 265: cvs_printf("%s", diffargs);
1.1 jfb 266:
1.94 joris 267: if (cf->file_status != FILE_ADDED) {
268: rcsnum_tostr(r1, rbuf, sizeof(rbuf));
269: cvs_printf(" -r%s", rbuf);
1.1 jfb 270:
1.94 joris 271: if (diff_rev2 != NULL) {
272: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
273: cvs_printf(" -r%s", rbuf);
274: }
1.1 jfb 275: }
276:
1.91 joris 277: cvs_printf(" %s\n", cf->file_path);
1.1 jfb 278:
1.114 joris 279: if (cf->file_status == FILE_ADDED) {
280: xfree(p1);
1.111 xsa 281: (void)xasprintf(&p1, "%s", CVS_PATH_DEVNULL);
1.114 joris 282: } else if (cf->file_status == FILE_REMOVED) {
283: xfree(p2);
1.111 xsa 284: (void)xasprintf(&p2, "%s", CVS_PATH_DEVNULL);
1.114 joris 285: }
1.111 xsa 286:
287: if (cvs_diffreg(p1, p2, NULL) == D_ERROR)
288: fatal("cvs_diff_local: failed to get RCS patch");
1.58 niallo 289:
1.91 joris 290: cvs_worklist_run(&temp_files, cvs_worklist_unlink);
1.111 xsa 291:
292: if (p1 != NULL)
293: xfree(p1);
294: if (p2 != NULL)
295: xfree(p2);
1.101 joris 296:
297: if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev)
298: rcsnum_free(diff_rev1);
299: if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev)
300: rcsnum_free(diff_rev2);
1.94 joris 301:
302: diff_rev1 = diff_rev2 = NULL;
1.1 jfb 303: }
![[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