Annotation of src/usr.bin/rcs/rcsdiff.c, Revision 1.61
1.61 ! xsa 1: /* $OpenBSD: rcsdiff.c,v 1.60 2006/05/04 07:06:58 xsa Exp $ */
1.1 joris 2: /*
3: * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
4: * All rights reserved.
5: *
6: * Redistribution and use in source and binary forms, with or without
7: * modification, are permitted provided that the following conditions
8: * are met:
9: *
10: * 1. Redistributions of source code must retain the above copyright
11: * notice, this list of conditions and the following disclaimer.
12: * 2. The name of the author may not be used to endorse or promote products
13: * derived from this software without specific prior written permission.
14: *
15: * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
16: * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
17: * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
18: * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19: * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20: * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
21: * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
22: * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23: * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
24: * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25: */
26:
1.29 xsa 27: #include "includes.h"
1.1 joris 28:
1.30 xsa 29: #include "rcsprog.h"
1.2 niallo 30: #include "diff.h"
1.1 joris 31:
32: static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *);
1.38 niallo 33: static int rcsdiff_rev(RCSFILE *, RCSNUM *, RCSNUM *);
1.1 joris 34:
1.51 xsa 35: static int flags = 0;
1.18 xsa 36: static int kflag = RCS_KWEXP_ERR;
37:
1.1 joris 38: int
39: rcsdiff_main(int argc, char **argv)
40: {
1.58 joris 41: int fd, i, ch, status;
1.46 ray 42: RCSNUM *rev1, *rev2;
1.1 joris 43: RCSFILE *file;
1.46 ray 44: char fpath[MAXPATHLEN], *rev_str1, *rev_str2;
1.1 joris 45:
1.46 ray 46: rev1 = rev2 = NULL;
47: rev_str1 = rev_str2 = NULL;
1.61 ! xsa 48: status = D_SAME;
1.1 joris 49:
1.59 ray 50: if (strlcpy(diffargs, "diff", sizeof(diffargs)) >= sizeof(diffargs))
51: errx(1, "diffargs too long");
1.16 xsa 52:
1.43 xsa 53: while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) {
1.1 joris 54: switch (ch) {
1.3 joris 55: case 'c':
1.59 ray 56: if (strlcat(diffargs, " -c", sizeof(diffargs)) >=
57: sizeof(diffargs))
58: errx(1, "diffargs too long");
1.3 joris 59: diff_format = D_CONTEXT;
60: break;
1.18 xsa 61: case 'k':
62: kflag = rcs_kflag_get(rcs_optarg);
63: if (RCS_KWEXP_INVAL(kflag)) {
1.54 xsa 64: warnx("invalid RCS keyword substitution mode");
1.18 xsa 65: (usage)();
66: exit(1);
67: }
68: break;
1.3 joris 69: case 'n':
1.59 ray 70: if (strlcat(diffargs, " -n", sizeof(diffargs)) >=
71: sizeof(diffargs))
72: errx(1, "diffargs too long");
1.3 joris 73: diff_format = D_RCSDIFF;
74: break;
1.1 joris 75: case 'q':
1.51 xsa 76: flags |= QUIET;
1.3 joris 77: break;
1.4 niallo 78: case 'r':
1.46 ray 79: rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg);
1.19 xsa 80: break;
81: case 'T':
1.21 xsa 82: /*
83: * kept for compatibility
84: */
1.17 xsa 85: break;
1.59 ray 86: case 'u':
87: if (strlcat(diffargs, " -u", sizeof(diffargs)) >=
88: sizeof(diffargs))
89: errx(1, "diffargs too long");
90: diff_format = D_UNIFIED;
91: break;
1.17 xsa 92: case 'V':
93: printf("%s\n", rcs_version);
94: exit(0);
1.39 ray 95: /* NOTREACHED */
1.17 xsa 96: case 'x':
1.41 ray 97: /* Use blank extension if none given. */
98: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.36 joris 99: break;
100: case 'z':
101: timezone_flag = rcs_optarg;
1.4 niallo 102: break;
1.1 joris 103: default:
1.11 joris 104: (usage)();
105: exit (1);
1.1 joris 106: }
107: }
108:
1.11 joris 109: argc -= rcs_optind;
110: argv += rcs_optind;
1.1 joris 111:
112: if (argc == 0) {
1.52 xsa 113: warnx("no input file");
1.1 joris 114: (usage)();
115: exit(1);
116: }
117:
118: for (i = 0; i < argc; i++) {
1.58 joris 119: fd = rcs_statfile(argv[i], fpath, sizeof(fpath), flags);
120: if (fd < 0)
1.1 joris 121: continue;
122:
1.58 joris 123: if ((file = rcs_open(fpath, fd,
124: RCS_READ|RCS_PARSE_FULLY)) == NULL)
1.1 joris 125: continue;
1.20 xsa 126:
1.44 xsa 127: rcs_kwexp_set(file, kflag);
1.1 joris 128:
1.46 ray 129: if (rev_str1 != NULL) {
1.47 ray 130: if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
1.56 xsa 131: errx(1, "bad revision number");
1.46 ray 132: }
133: if (rev_str2 != NULL) {
1.47 ray 134: if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
1.56 xsa 135: errx(1, "bad revision number");
1.46 ray 136: }
1.14 xsa 137:
1.51 xsa 138: if (!(flags & QUIET)) {
1.18 xsa 139: fprintf(stderr, "%s\n", RCS_DIFF_DIV);
140: fprintf(stderr, "RCS file: %s\n", fpath);
1.14 xsa 141: }
1.8 joris 142:
143: diff_file = argv[i];
1.1 joris 144:
1.46 ray 145: /* No revisions given. */
1.61 ! xsa 146: if (rev_str1 == NULL)
! 147: status = rcsdiff_file(file, file->rf_head, argv[i]);
1.46 ray 148: /* One revision given. */
1.61 ! xsa 149: else if (rev_str2 == NULL)
! 150: status = rcsdiff_file(file, rev1, argv[i]);
1.46 ray 151: /* Two revisions given. */
1.61 ! xsa 152: else
! 153: status = rcsdiff_rev(file, rev1, rev2);
1.1 joris 154:
155: rcs_close(file);
1.46 ray 156:
157: if (rev1 != NULL) {
158: rcsnum_free(rev1);
159: rev1 = NULL;
160: }
161: if (rev2 != NULL) {
162: rcsnum_free(rev2);
163: rev2 = NULL;
164: }
1.1 joris 165: }
166:
1.26 niallo 167: return (status);
1.1 joris 168: }
169:
170: void
171: rcsdiff_usage(void)
172: {
1.9 deraadt 173: fprintf(stderr,
1.55 jmc 174: "usage: rcsdiff [-cnquV] [-kmode] [-rrev] "
1.35 jmc 175: "[-xsuffixes] [-ztz] file ...\n");
1.1 joris 176: }
177:
178: static int
1.23 xsa 179: rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
1.1 joris 180: {
1.58 joris 181: int ret, fd;
1.49 joris 182: time_t t;
1.58 joris 183: struct stat st;
1.60 xsa 184: char *path1, *path2;
1.1 joris 185: BUF *b1, *b2;
186: char rbuf[64];
1.49 joris 187: struct tm *tb;
1.24 niallo 188: struct timeval tv[2], tv2[2];
1.49 joris 189:
1.24 niallo 190: memset(&tv, 0, sizeof(tv));
191: memset(&tv2, 0, sizeof(tv2));
1.15 xsa 192:
1.61 ! xsa 193: ret = D_ERROR;
1.37 joris 194: b1 = b2 = NULL;
195:
1.49 joris 196: diff_rev1 = rev;
197: diff_rev2 = NULL;
198:
1.58 joris 199: if ((fd = open(filename, O_RDONLY)) == -1) {
1.52 xsa 200: warn("%s", filename);
1.37 joris 201: goto out;
1.15 xsa 202: }
1.1 joris 203:
204: rcsnum_tostr(rev, rbuf, sizeof(rbuf));
1.51 xsa 205: if (!(flags & QUIET)) {
1.18 xsa 206: fprintf(stderr, "retrieving revision %s\n", rbuf);
207: fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
1.16 xsa 208: }
1.1 joris 209:
1.23 xsa 210: if ((b1 = rcs_getrev(file, rev)) == NULL) {
1.52 xsa 211: warnx("failed to retrieve revision %s", rbuf);
1.37 joris 212: goto out;
1.1 joris 213: }
1.37 joris 214:
1.31 niallo 215: b1 = rcs_kwexp_buf(b1, file, rev);
1.24 niallo 216: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
217: tv[1].tv_sec = tv[0].tv_sec;
1.1 joris 218:
1.57 joris 219: if ((b2 = rcs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
1.52 xsa 220: warnx("failed to load file: `%s'", filename);
1.37 joris 221: goto out;
1.4 niallo 222: }
1.37 joris 223:
1.49 joris 224: /* XXX - GNU uses GMT */
1.58 joris 225: if (fstat(fd, &st) == -1)
226: err(1, "%s", filename);
227:
1.49 joris 228: tb = gmtime(&st.st_mtime);
229: t = mktime(tb);
230:
231: tv2[0].tv_sec = t;
1.50 deraadt 232: tv2[1].tv_sec = t;
1.4 niallo 233:
1.60 xsa 234: (void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 235: rcs_buf_write_stmp(b1, path1, 0600);
1.37 joris 236:
1.57 joris 237: rcs_buf_free(b1);
1.37 joris 238: b1 = NULL;
239:
1.24 niallo 240: if (utimes(path1, (const struct timeval *)&tv) < 0)
1.52 xsa 241: warn("utimes");
1.4 niallo 242:
1.60 xsa 243: (void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 244: rcs_buf_write_stmp(b2, path2, 0600);
1.37 joris 245:
1.57 joris 246: rcs_buf_free(b2);
1.37 joris 247: b2 = NULL;
248:
1.24 niallo 249: if (utimes(path2, (const struct timeval *)&tv2) < 0)
1.52 xsa 250: warn("utimes");
1.4 niallo 251:
1.61 ! xsa 252: ret = rcs_diffreg(path1, path2, NULL);
1.37 joris 253:
254: out:
1.58 joris 255: if (fd != -1)
256: (void)close(fd);
1.37 joris 257: if (b1 != NULL)
1.57 joris 258: rcs_buf_free(b1);
1.37 joris 259: if (b2 != NULL)
1.57 joris 260: rcs_buf_free(b2);
1.60 xsa 261: if (path1 != NULL)
262: xfree(path1);
263: if (path2 != NULL)
264: xfree(path2);
1.37 joris 265:
266: return (ret);
1.4 niallo 267: }
268:
269: static int
1.38 niallo 270: rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
1.4 niallo 271: {
1.37 joris 272: int ret;
1.60 xsa 273: char *path1, *path2;
1.4 niallo 274: BUF *b1, *b2;
1.16 xsa 275: char rbuf1[64], rbuf2[64];
1.24 niallo 276: struct timeval tv[2], tv2[2];
277:
1.61 ! xsa 278: ret = D_ERROR;
1.37 joris 279: b1 = b2 = NULL;
1.24 niallo 280: memset(&tv, 0, sizeof(tv));
281: memset(&tv2, 0, sizeof(tv2));
1.4 niallo 282:
1.49 joris 283: diff_rev1 = rev1;
284: diff_rev2 = rev2;
285:
1.16 xsa 286: rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1));
1.51 xsa 287: if (!(flags & QUIET))
1.49 joris 288: fprintf(stderr, "retrieving revision %s\n", rbuf1);
1.4 niallo 289:
1.23 xsa 290: if ((b1 = rcs_getrev(file, rev1)) == NULL) {
1.52 xsa 291: warnx("failed to retrieve revision %s", rbuf1);
1.37 joris 292: goto out;
1.4 niallo 293: }
1.37 joris 294:
1.31 niallo 295: b1 = rcs_kwexp_buf(b1, file, rev1);
1.24 niallo 296: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev1);
297: tv[1].tv_sec = tv[0].tv_sec;
1.4 niallo 298:
1.16 xsa 299: rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2));
1.51 xsa 300: if (!(flags & QUIET))
1.18 xsa 301: fprintf(stderr, "retrieving revision %s\n", rbuf2);
1.4 niallo 302:
1.23 xsa 303: if ((b2 = rcs_getrev(file, rev2)) == NULL) {
1.52 xsa 304: warnx("failed to retrieve revision %s", rbuf2);
1.37 joris 305: goto out;
1.1 joris 306: }
1.37 joris 307:
1.31 niallo 308: b2 = rcs_kwexp_buf(b2, file, rev2);
1.24 niallo 309: tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2);
310: tv2[1].tv_sec = tv2[0].tv_sec;
1.16 xsa 311:
1.51 xsa 312: if (!(flags & QUIET))
1.33 xsa 313: fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2);
1.1 joris 314:
1.60 xsa 315: (void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 316: rcs_buf_write_stmp(b1, path1, 0600);
1.37 joris 317:
1.57 joris 318: rcs_buf_free(b1);
1.37 joris 319: b1 = NULL;
320:
1.24 niallo 321: if (utimes(path1, (const struct timeval *)&tv) < 0)
1.52 xsa 322: warn("utimes");
1.1 joris 323:
1.60 xsa 324: (void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 325: rcs_buf_write_stmp(b2, path2, 0600);
1.37 joris 326:
1.57 joris 327: rcs_buf_free(b2);
1.37 joris 328: b2 = NULL;
1.1 joris 329:
1.24 niallo 330: if (utimes(path2, (const struct timeval *)&tv2) < 0)
1.52 xsa 331: warn("utimes");
1.32 deraadt 332:
1.61 ! xsa 333: ret = rcs_diffreg(path1, path2, NULL);
1.37 joris 334:
335: out:
336: if (b1 != NULL)
1.57 joris 337: rcs_buf_free(b1);
1.37 joris 338: if (b2 != NULL)
1.57 joris 339: rcs_buf_free(b2);
1.60 xsa 340: if (path1 != NULL)
341: xfree(path1);
342: if (path2 != NULL)
343: xfree(path2);
1.1 joris 344:
1.37 joris 345: return (ret);
1.1 joris 346: }
![[BACK]](/icons/back.gif){kind=icon}
Return to rcsdiff.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs