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