Annotation of src/usr.bin/cvs/diff.c, Revision 1.101
1.101 ! joris 1: /* $OpenBSD: diff.c,v 1.100 2006/05/31 07:21:25 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.101 ! joris 71: case 'p':
! 72: strlcat(diffargs, " -p", sizeof(diffargs));
! 73: diff_pflag = 1;
! 74: break;
1.1 jfb 75: case 'r':
1.97 joris 76: if (rev1 == NULL) {
77: rev1 = optarg;
78: } else if (rev2 == NULL) {
79: rev2 = optarg;
1.23 joris 80: } else {
1.91 joris 81: fatal("no more than 2 revisions/dates can"
82: " be specified");
1.1 jfb 83: }
1.32 joris 84: break;
1.1 jfb 85: case 'u':
1.2 jfb 86: strlcat(diffargs, " -u", sizeof(diffargs));
1.58 niallo 87: diff_format = D_UNIFIED;
1.1 jfb 88: break;
89: default:
1.91 joris 90: fatal("%s", cvs_cmd_diff.cmd_synopsis);
1.36 jfb 91: }
1.13 jfb 92: }
93:
1.91 joris 94: argc -= optind;
95: argv += optind;
1.1 jfb 96:
1.91 joris 97: cr.enterdir = NULL;
98: cr.leavedir = NULL;
99: cr.local = cvs_diff_local;
100: cr.remote = NULL;
1.92 joris 101: cr.flags = flags;
1.7 jfb 102:
1.97 joris 103: diff_rev1 = diff_rev2 = NULL;
104:
1.91 joris 105: if (argc > 0)
106: cvs_file_run(argc, argv, &cr);
1.82 ray 107: else
1.91 joris 108: cvs_file_run(1, &arg, &cr);
1.36 jfb 109:
110: return (0);
111: }
112:
1.91 joris 113: void
114: cvs_diff_local(struct cvs_file *cf)
1.36 jfb 115: {
1.91 joris 116: size_t len;
117: RCSNUM *r1;
1.36 jfb 118: BUF *b1, *b2;
1.91 joris 119: struct stat st;
1.69 niallo 120: struct timeval tv[2], tv2[2];
1.91 joris 121: char rbuf[16], p1[MAXPATHLEN], p2[MAXPATHLEN];
1.69 niallo 122:
1.91 joris 123: cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path);
1.1 jfb 124:
1.91 joris 125: if (cf->file_type == CVS_DIR) {
1.46 xsa 126: if (verbosity > 1)
1.91 joris 127: cvs_log(LP_NOTICE, "Diffing inside %s", cf->file_path);
1.1 jfb 128: return;
129: }
130:
1.98 joris 131: cvs_file_classify(cf, NULL, 0);
1.1 jfb 132:
1.91 joris 133: if (cf->file_status == FILE_LOST) {
134: cvs_log(LP_ERR, "cannot find file %s", cf->file_path);
1.1 jfb 135: return;
1.91 joris 136: } else if (cf->file_status == FILE_UNKNOWN) {
137: cvs_log(LP_ERR, "I know nothing about %s", cf->file_path);
1.1 jfb 138: return;
1.95 joris 139: } else if (cf->file_status == FILE_ADDED && Nflag == 0) {
1.94 joris 140: cvs_log(LP_ERR, "%s is a new entry, no comparison available",
141: cf->file_path);
1.1 jfb 142: return;
1.95 joris 143: } else if (cf->file_status == FILE_REMOVED && Nflag == 0) {
144: cvs_log(LP_ERR, "%s was removed, no comparison available",
145: cf->file_path);
146: return;
1.99 joris 147: } else if (cf->file_status == FILE_UPTODATE && rev1 == NULL &&
148: rev2 == NULL) {
1.94 joris 149: return;
150: }
1.97 joris 151:
152: if (rev1 != NULL)
153: diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs);
154: if (rev2 != NULL)
155: diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs);
1.1 jfb 156:
1.91 joris 157: diff_file = cf->file_path;
158: cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path,
159: RCS_DIFF_DIV, cf->file_rpath);
1.1 jfb 160:
1.94 joris 161: if (cf->file_status != FILE_ADDED) {
162: if (diff_rev1 != NULL)
163: r1 = diff_rev1;
164: else
165: r1 = cf->file_ent->ce_rev;
1.1 jfb 166:
1.94 joris 167: diff_rev1 = r1;
168: rcsnum_tostr(r1, rbuf , sizeof(rbuf));
169: cvs_printf("retrieving revision %s\n", rbuf);
170: if ((b1 = rcs_getrev(cf->file_rcs, r1)) == NULL)
171: fatal("failed to retrieve revision %s", rbuf);
1.91 joris 172:
1.94 joris 173: b1 = rcs_kwexp_buf(b1, cf->file_rcs, r1);
1.93 joris 174:
1.94 joris 175: tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1);
176: tv[0].tv_usec = 0;
177: tv[1] = tv[0];
178: }
1.91 joris 179:
1.95 joris 180: if (diff_rev2 != NULL && cf->file_status != FILE_ADDED &&
181: cf->file_status != FILE_REMOVED) {
1.91 joris 182: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
183: cvs_printf("retrieving revision %s\n", rbuf);
184: if ((b2 = rcs_getrev(cf->file_rcs, diff_rev2)) == NULL)
185: fatal("failed to retrieve revision %s", rbuf);
1.93 joris 186:
187: b2 = rcs_kwexp_buf(b2, cf->file_rcs, diff_rev2);
1.91 joris 188:
189: tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
190: tv2[0].tv_usec = 0;
191: tv2[1] = tv2[0];
1.95 joris 192: } else if (cf->file_status != FILE_REMOVED) {
1.91 joris 193: if (fstat(cf->fd, &st) == -1)
194: fatal("fstat failed %s", strerror(errno));
195: if ((b2 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
196: fatal("failed to load %s", cf->file_path);
197:
198: st.st_mtime = cvs_hack_time(st.st_mtime, 1);
199: if (st.st_mtime == 0)
200: fatal("cvs_diff_local: to gmt failed");
1.1 jfb 201:
1.91 joris 202: tv2[0].tv_sec = st.st_mtime;
203: tv2[0].tv_usec = 0;
204: tv2[1] = tv2[0];
1.100 joris 205:
206: diff_rev2 = cf->file_rcsrev;
1.17 jfb 207: }
208:
1.91 joris 209: cvs_printf("%s", diffargs);
1.1 jfb 210:
1.94 joris 211: if (cf->file_status != FILE_ADDED) {
212: rcsnum_tostr(r1, rbuf, sizeof(rbuf));
213: cvs_printf(" -r%s", rbuf);
1.1 jfb 214:
1.94 joris 215: if (diff_rev2 != NULL) {
216: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
217: cvs_printf(" -r%s", rbuf);
218: }
1.1 jfb 219: }
220:
1.91 joris 221: cvs_printf(" %s\n", cf->file_path);
1.1 jfb 222:
1.94 joris 223: if (cf->file_status != FILE_ADDED) {
224: len = strlcpy(p1, cvs_tmpdir, sizeof(p1));
225: if (len >= sizeof(p1))
1.91 joris 226: fatal("cvs_diff_local: truncation");
1.1 jfb 227:
1.94 joris 228: len = strlcat(p1, "/diff1.XXXXXXXXXX", sizeof(p1));
229: if (len >= sizeof(p1))
230: fatal("cvs_diff_local: truncation");
1.1 jfb 231:
1.94 joris 232: cvs_buf_write_stmp(b1, p1, 0600, tv);
233: cvs_buf_free(b1);
234: } else {
235: len = strlcpy(p1, CVS_PATH_DEVNULL, sizeof(p1));
236: if (len >= sizeof(p1))
237: fatal("cvs_diff_local: truncation");
238: }
1.1 jfb 239:
1.95 joris 240: if (cf->file_status != FILE_REMOVED) {
241: len = strlcpy(p2, cvs_tmpdir, sizeof(p2));
242: if (len >= sizeof(p2))
243: fatal("cvs_diff_local: truncation");
1.91 joris 244:
1.95 joris 245: len = strlcat(p2, "/diff2.XXXXXXXXXX", sizeof(p2));
246: if (len >= sizeof(p2))
247: fatal("cvs_diff_local: truncation");
1.1 jfb 248:
1.95 joris 249: cvs_buf_write_stmp(b2, p2, 0600, tv2);
250: cvs_buf_free(b2);
251: } else {
252: len = strlcpy(p2, CVS_PATH_DEVNULL, sizeof(p2));
253: if (len >= sizeof(p2))
254: fatal("cvs_diff_local: truncation");
255: }
1.58 niallo 256:
1.91 joris 257: cvs_diffreg(p1, p2, NULL);
258: cvs_worklist_run(&temp_files, cvs_worklist_unlink);
1.101 ! joris 259:
! 260: if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev)
! 261: rcsnum_free(diff_rev1);
! 262: if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev)
! 263: rcsnum_free(diff_rev2);
1.94 joris 264:
265: diff_rev1 = diff_rev2 = NULL;
1.1 jfb 266: }
![[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