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