Annotation of src/usr.bin/rcs/rcsdiff.c, Revision 1.60
1.60 ! xsa 1: /* $OpenBSD: rcsdiff.c,v 1.59 2006/04/29 05:31:28 ray 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.7 niallo 48: status = 0;
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. */
146: if (rev_str1 == NULL) {
147: if (rcsdiff_file(file, file->rf_head, argv[i]) < 0)
1.7 niallo 148: status = 2;
1.46 ray 149: /* One revision given. */
150: } else if (rev_str2 == NULL) {
151: if (rcsdiff_file(file, rev1, argv[i]) < 0)
152: status = 2;
153: /* Two revisions given. */
1.4 niallo 154: } else {
1.46 ray 155: if (rcsdiff_rev(file, rev1, rev2) < 0)
1.7 niallo 156: status = 2;
1.1 joris 157: }
158:
159: rcs_close(file);
1.46 ray 160:
161: if (rev1 != NULL) {
162: rcsnum_free(rev1);
163: rev1 = NULL;
164: }
165: if (rev2 != NULL) {
166: rcsnum_free(rev2);
167: rev2 = NULL;
168: }
1.1 joris 169: }
170:
1.26 niallo 171: return (status);
1.1 joris 172: }
173:
174: void
175: rcsdiff_usage(void)
176: {
1.9 deraadt 177: fprintf(stderr,
1.55 jmc 178: "usage: rcsdiff [-cnquV] [-kmode] [-rrev] "
1.35 jmc 179: "[-xsuffixes] [-ztz] file ...\n");
1.1 joris 180: }
181:
182: static int
1.23 xsa 183: rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
1.1 joris 184: {
1.58 joris 185: int ret, fd;
1.49 joris 186: time_t t;
1.58 joris 187: struct stat st;
1.60 ! xsa 188: char *path1, *path2;
1.1 joris 189: BUF *b1, *b2;
190: char rbuf[64];
1.49 joris 191: struct tm *tb;
1.24 niallo 192: struct timeval tv[2], tv2[2];
1.49 joris 193:
1.24 niallo 194: memset(&tv, 0, sizeof(tv));
195: memset(&tv2, 0, sizeof(tv2));
1.15 xsa 196:
1.37 joris 197: ret = -1;
198: b1 = b2 = NULL;
199:
1.49 joris 200: diff_rev1 = rev;
201: diff_rev2 = NULL;
202:
1.58 joris 203: if ((fd = open(filename, O_RDONLY)) == -1) {
1.52 xsa 204: warn("%s", filename);
1.37 joris 205: goto out;
1.15 xsa 206: }
1.1 joris 207:
208: rcsnum_tostr(rev, rbuf, sizeof(rbuf));
1.51 xsa 209: if (!(flags & QUIET)) {
1.18 xsa 210: fprintf(stderr, "retrieving revision %s\n", rbuf);
211: fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
1.16 xsa 212: }
1.1 joris 213:
1.23 xsa 214: if ((b1 = rcs_getrev(file, rev)) == NULL) {
1.52 xsa 215: warnx("failed to retrieve revision %s", rbuf);
1.37 joris 216: goto out;
1.1 joris 217: }
1.37 joris 218:
1.31 niallo 219: b1 = rcs_kwexp_buf(b1, file, rev);
1.24 niallo 220: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
221: tv[1].tv_sec = tv[0].tv_sec;
1.1 joris 222:
1.57 joris 223: if ((b2 = rcs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
1.52 xsa 224: warnx("failed to load file: `%s'", filename);
1.37 joris 225: goto out;
1.4 niallo 226: }
1.37 joris 227:
1.49 joris 228: /* XXX - GNU uses GMT */
1.58 joris 229: if (fstat(fd, &st) == -1)
230: err(1, "%s", filename);
231:
1.49 joris 232: tb = gmtime(&st.st_mtime);
233: t = mktime(tb);
234:
235: tv2[0].tv_sec = t;
1.50 deraadt 236: tv2[1].tv_sec = t;
1.4 niallo 237:
1.60 ! xsa 238: (void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 239: rcs_buf_write_stmp(b1, path1, 0600);
1.37 joris 240:
1.57 joris 241: rcs_buf_free(b1);
1.37 joris 242: b1 = NULL;
243:
1.24 niallo 244: if (utimes(path1, (const struct timeval *)&tv) < 0)
1.52 xsa 245: warn("utimes");
1.4 niallo 246:
1.60 ! xsa 247: (void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 248: rcs_buf_write_stmp(b2, path2, 0600);
1.37 joris 249:
1.57 joris 250: rcs_buf_free(b2);
1.37 joris 251: b2 = NULL;
252:
1.24 niallo 253: if (utimes(path2, (const struct timeval *)&tv2) < 0)
1.52 xsa 254: warn("utimes");
1.4 niallo 255:
1.57 joris 256: rcs_diffreg(path1, path2, NULL);
1.37 joris 257: ret = 0;
258:
259: out:
1.58 joris 260: if (fd != -1)
261: (void)close(fd);
1.37 joris 262: if (b1 != NULL)
1.57 joris 263: rcs_buf_free(b1);
1.37 joris 264: if (b2 != NULL)
1.57 joris 265: rcs_buf_free(b2);
1.60 ! xsa 266: if (path1 != NULL)
! 267: xfree(path1);
! 268: if (path2 != NULL)
! 269: xfree(path2);
1.37 joris 270:
271: return (ret);
1.4 niallo 272: }
273:
274: static int
1.38 niallo 275: rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
1.4 niallo 276: {
1.37 joris 277: int ret;
1.60 ! xsa 278: char *path1, *path2;
1.4 niallo 279: BUF *b1, *b2;
1.16 xsa 280: char rbuf1[64], rbuf2[64];
1.24 niallo 281: struct timeval tv[2], tv2[2];
282:
1.37 joris 283: ret = -1;
284: b1 = b2 = NULL;
1.24 niallo 285: memset(&tv, 0, sizeof(tv));
286: memset(&tv2, 0, sizeof(tv2));
1.4 niallo 287:
1.49 joris 288: diff_rev1 = rev1;
289: diff_rev2 = rev2;
290:
1.16 xsa 291: rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1));
1.51 xsa 292: if (!(flags & QUIET))
1.49 joris 293: fprintf(stderr, "retrieving revision %s\n", rbuf1);
1.4 niallo 294:
1.23 xsa 295: if ((b1 = rcs_getrev(file, rev1)) == NULL) {
1.52 xsa 296: warnx("failed to retrieve revision %s", rbuf1);
1.37 joris 297: goto out;
1.4 niallo 298: }
1.37 joris 299:
1.31 niallo 300: b1 = rcs_kwexp_buf(b1, file, rev1);
1.24 niallo 301: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev1);
302: tv[1].tv_sec = tv[0].tv_sec;
1.4 niallo 303:
1.16 xsa 304: rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2));
1.51 xsa 305: if (!(flags & QUIET))
1.18 xsa 306: fprintf(stderr, "retrieving revision %s\n", rbuf2);
1.4 niallo 307:
1.23 xsa 308: if ((b2 = rcs_getrev(file, rev2)) == NULL) {
1.52 xsa 309: warnx("failed to retrieve revision %s", rbuf2);
1.37 joris 310: goto out;
1.1 joris 311: }
1.37 joris 312:
1.31 niallo 313: b2 = rcs_kwexp_buf(b2, file, rev2);
1.24 niallo 314: tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2);
315: tv2[1].tv_sec = tv2[0].tv_sec;
1.16 xsa 316:
1.51 xsa 317: if (!(flags & QUIET))
1.33 xsa 318: fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2);
1.1 joris 319:
1.60 ! xsa 320: (void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 321: rcs_buf_write_stmp(b1, path1, 0600);
1.37 joris 322:
1.57 joris 323: rcs_buf_free(b1);
1.37 joris 324: b1 = NULL;
325:
1.24 niallo 326: if (utimes(path1, (const struct timeval *)&tv) < 0)
1.52 xsa 327: warn("utimes");
1.1 joris 328:
1.60 ! xsa 329: (void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
1.57 joris 330: rcs_buf_write_stmp(b2, path2, 0600);
1.37 joris 331:
1.57 joris 332: rcs_buf_free(b2);
1.37 joris 333: b2 = NULL;
1.1 joris 334:
1.24 niallo 335: if (utimes(path2, (const struct timeval *)&tv2) < 0)
1.52 xsa 336: warn("utimes");
1.32 deraadt 337:
1.57 joris 338: rcs_diffreg(path1, path2, NULL);
1.37 joris 339: ret = 0;
340:
341: out:
342: if (b1 != NULL)
1.57 joris 343: rcs_buf_free(b1);
1.37 joris 344: if (b2 != NULL)
1.57 joris 345: rcs_buf_free(b2);
1.60 ! xsa 346: if (path1 != NULL)
! 347: xfree(path1);
! 348: if (path2 != NULL)
! 349: xfree(path2);
1.1 joris 350:
1.37 joris 351: return (ret);
1.1 joris 352: }
![[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