Annotation of src/usr.bin/cvs/diff.c, Revision 1.94
1.94 ! joris 1: /* $OpenBSD: diff.c,v 1.93 2006/05/27 17:52:27 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.94 ! joris 28: int include_added_files = 0;
! 29:
1.36 jfb 30: struct cvs_cmd cvs_cmd_diff = {
31: CVS_OP_DIFF, CVS_REQ_DIFF, "diff",
32: { "di", "dif" },
33: "Show differences between revisions",
1.43 xsa 34: "[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] "
35: "[-k mode] [file ...]",
36: "cD:iklNnpr:Ru",
1.36 jfb 37: NULL,
1.91 joris 38: cvs_diff
1.36 jfb 39: };
40:
1.91 joris 41: int
42: cvs_diff(int argc, char **argv)
1.1 jfb 43: {
1.23 joris 44: int ch;
1.91 joris 45: char *arg = ".";
1.92 joris 46: int flags;
1.91 joris 47: struct cvs_recursion cr;
1.1 jfb 48:
1.92 joris 49: flags = CR_RECURSE_DIRS;
1.2 jfb 50: strlcpy(diffargs, argv[0], sizeof(diffargs));
1.1 jfb 51:
1.91 joris 52: while ((ch = getopt(argc, argv, cvs_cmd_diff.cmd_opts)) != -1) {
1.1 jfb 53: switch (ch) {
54: case 'c':
1.2 jfb 55: strlcat(diffargs, " -c", sizeof(diffargs));
1.58 niallo 56: diff_format = D_CONTEXT;
1.1 jfb 57: break;
1.92 joris 58: case 'l':
59: flags &= ~CR_RECURSE_DIRS;
60: break;
1.33 jfb 61: case 'n':
62: strlcat(diffargs, " -n", sizeof(diffargs));
1.58 niallo 63: diff_format = D_RCSDIFF;
1.33 jfb 64: break;
1.94 ! joris 65: case 'N':
! 66: strlcat(diffargs, " -N", sizeof(diffargs));
! 67: include_added_files = 1;
! 68: break;
1.1 jfb 69: case 'r':
1.91 joris 70: if (diff_rev1 == NULL) {
71: diff_rev1 = rcsnum_parse(optarg);
72: if (diff_rev1 == NULL)
73: fatal("rcsnum_parse failed");
74: } else if (diff_rev2 == NULL) {
75: diff_rev2 = rcsnum_parse(optarg);
76: if (diff_rev2 == NULL)
77: fatal("rcsnum_parse failed");
1.23 joris 78: } else {
1.91 joris 79: fatal("no more than 2 revisions/dates can"
80: " be specified");
1.1 jfb 81: }
1.32 joris 82: break;
1.1 jfb 83: case 'u':
1.2 jfb 84: strlcat(diffargs, " -u", sizeof(diffargs));
1.58 niallo 85: diff_format = D_UNIFIED;
1.1 jfb 86: break;
87: default:
1.91 joris 88: fatal("%s", cvs_cmd_diff.cmd_synopsis);
1.36 jfb 89: }
1.13 jfb 90: }
91:
1.91 joris 92: argc -= optind;
93: argv += optind;
1.1 jfb 94:
1.91 joris 95: cr.enterdir = NULL;
96: cr.leavedir = NULL;
97: cr.local = cvs_diff_local;
98: cr.remote = NULL;
1.92 joris 99: cr.flags = flags;
1.7 jfb 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.91 joris 127: cvs_file_classify(cf);
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.94 ! joris 135: } else if (cf->file_status == FILE_ADDED && include_added_files == 0) {
! 136: cvs_log(LP_ERR, "%s is a new entry, no comparison available",
! 137: cf->file_path);
1.1 jfb 138: return;
1.94 ! joris 139: } else if (cf->file_status == FILE_UPTODATE && diff_rev2 == NULL) {
! 140: return;
! 141: }
1.1 jfb 142:
1.91 joris 143: diff_file = cf->file_path;
144: cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path,
145: RCS_DIFF_DIV, cf->file_rpath);
1.1 jfb 146:
1.94 ! joris 147: if (cf->file_status != FILE_ADDED) {
! 148: if (diff_rev1 != NULL)
! 149: r1 = diff_rev1;
! 150: else
! 151: r1 = cf->file_ent->ce_rev;
1.1 jfb 152:
1.94 ! joris 153: diff_rev1 = r1;
! 154: rcsnum_tostr(r1, rbuf , sizeof(rbuf));
! 155: cvs_printf("retrieving revision %s\n", rbuf);
! 156: if ((b1 = rcs_getrev(cf->file_rcs, r1)) == NULL)
! 157: fatal("failed to retrieve revision %s", rbuf);
1.91 joris 158:
1.94 ! joris 159: b1 = rcs_kwexp_buf(b1, cf->file_rcs, r1);
1.93 joris 160:
1.94 ! joris 161: tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1);
! 162: tv[0].tv_usec = 0;
! 163: tv[1] = tv[0];
! 164: }
1.91 joris 165:
1.94 ! joris 166: if (diff_rev2 != NULL && cf->file_status != FILE_ADDED) {
1.91 joris 167: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
168: cvs_printf("retrieving revision %s\n", rbuf);
169: if ((b2 = rcs_getrev(cf->file_rcs, diff_rev2)) == NULL)
170: fatal("failed to retrieve revision %s", rbuf);
1.93 joris 171:
172: b2 = rcs_kwexp_buf(b2, cf->file_rcs, diff_rev2);
1.91 joris 173:
174: tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
175: tv2[0].tv_usec = 0;
176: tv2[1] = tv2[0];
1.1 jfb 177: } else {
1.91 joris 178: if (fstat(cf->fd, &st) == -1)
179: fatal("fstat failed %s", strerror(errno));
180: if ((b2 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
181: fatal("failed to load %s", cf->file_path);
182:
183: st.st_mtime = cvs_hack_time(st.st_mtime, 1);
184: if (st.st_mtime == 0)
185: fatal("cvs_diff_local: to gmt failed");
1.1 jfb 186:
1.91 joris 187: tv2[0].tv_sec = st.st_mtime;
188: tv2[0].tv_usec = 0;
189: tv2[1] = tv2[0];
1.17 jfb 190: }
191:
1.91 joris 192: cvs_printf("%s", diffargs);
1.1 jfb 193:
1.94 ! joris 194: if (cf->file_status != FILE_ADDED) {
! 195: rcsnum_tostr(r1, rbuf, sizeof(rbuf));
! 196: cvs_printf(" -r%s", rbuf);
1.1 jfb 197:
1.94 ! joris 198: if (diff_rev2 != NULL) {
! 199: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
! 200: cvs_printf(" -r%s", rbuf);
! 201: }
1.1 jfb 202: }
203:
1.91 joris 204: cvs_printf(" %s\n", cf->file_path);
1.1 jfb 205:
1.94 ! joris 206: if (cf->file_status != FILE_ADDED) {
! 207: len = strlcpy(p1, cvs_tmpdir, sizeof(p1));
! 208: if (len >= sizeof(p1))
1.91 joris 209: fatal("cvs_diff_local: truncation");
1.1 jfb 210:
1.94 ! joris 211: len = strlcat(p1, "/diff1.XXXXXXXXXX", sizeof(p1));
! 212: if (len >= sizeof(p1))
! 213: fatal("cvs_diff_local: truncation");
1.1 jfb 214:
1.94 ! joris 215: cvs_buf_write_stmp(b1, p1, 0600, tv);
! 216: cvs_buf_free(b1);
! 217: } else {
! 218: len = strlcpy(p1, CVS_PATH_DEVNULL, sizeof(p1));
! 219: if (len >= sizeof(p1))
! 220: fatal("cvs_diff_local: truncation");
! 221: }
1.1 jfb 222:
1.91 joris 223: len = strlcpy(p2, cvs_tmpdir, sizeof(p2));
224: if (len >= sizeof(p2))
225: fatal("cvs_diff_local: truncation");
226:
227: len = strlcat(p2, "/diff2.XXXXXXXXXX", sizeof(p2));
228: if (len >= sizeof(p2))
229: fatal("cvs_diff_local: truncation");
1.1 jfb 230:
1.91 joris 231: cvs_buf_write_stmp(b2, p2, 0600, tv2);
232: cvs_buf_free(b2);
1.58 niallo 233:
1.91 joris 234: cvs_diffreg(p1, p2, NULL);
235: cvs_worklist_run(&temp_files, cvs_worklist_unlink);
1.94 ! joris 236:
! 237: diff_rev1 = diff_rev2 = NULL;
1.1 jfb 238: }
![[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