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