Annotation of src/usr.bin/rcs/rcsdiff.c, Revision 1.52
1.52 ! xsa 1: /* $OpenBSD: rcsdiff.c,v 1.51 2006/04/19 06:53:41 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.25 xsa 41: int 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.16 xsa 50: strlcpy(diffargs, "diff", sizeof(diffargs));
51:
1.43 xsa 52: while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) {
1.1 joris 53: switch (ch) {
1.3 joris 54: case 'c':
1.16 xsa 55: strlcat(diffargs, " -c", sizeof(diffargs));
1.3 joris 56: diff_format = D_CONTEXT;
57: break;
1.18 xsa 58: case 'k':
59: kflag = rcs_kflag_get(rcs_optarg);
60: if (RCS_KWEXP_INVAL(kflag)) {
1.52 ! xsa 61: warnx("invalid RCS keyword expansion mode");
1.18 xsa 62: (usage)();
63: exit(1);
64: }
65: break;
1.3 joris 66: case 'n':
1.16 xsa 67: strlcat(diffargs, " -n", sizeof(diffargs));
1.3 joris 68: diff_format = D_RCSDIFF;
69: break;
1.1 joris 70: case 'q':
1.51 xsa 71: flags |= QUIET;
1.3 joris 72: break;
73: case 'u':
1.16 xsa 74: strlcat(diffargs, " -u", sizeof(diffargs));
1.3 joris 75: diff_format = D_UNIFIED;
1.1 joris 76: break;
1.4 niallo 77: case 'r':
1.46 ray 78: rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg);
1.19 xsa 79: break;
80: case 'T':
1.21 xsa 81: /*
82: * kept for compatibility
83: */
1.17 xsa 84: break;
85: case 'V':
86: printf("%s\n", rcs_version);
87: exit(0);
1.39 ray 88: /* NOTREACHED */
1.17 xsa 89: case 'x':
1.41 ray 90: /* Use blank extension if none given. */
91: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.36 joris 92: break;
93: case 'z':
94: timezone_flag = rcs_optarg;
1.4 niallo 95: break;
1.1 joris 96: default:
1.11 joris 97: (usage)();
98: exit (1);
1.1 joris 99: }
100: }
101:
1.11 joris 102: argc -= rcs_optind;
103: argv += rcs_optind;
1.1 joris 104:
105: if (argc == 0) {
1.52 ! xsa 106: warnx("no input file");
1.1 joris 107: (usage)();
108: exit(1);
109: }
110:
111: for (i = 0; i < argc; i++) {
112: if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
113: continue;
114:
1.28 niallo 115: if ((file = rcs_open(fpath, RCS_READ|RCS_PARSE_FULLY)) == NULL)
1.1 joris 116: continue;
1.20 xsa 117:
1.44 xsa 118: rcs_kwexp_set(file, kflag);
1.1 joris 119:
1.46 ray 120: if (rev_str1 != NULL) {
1.47 ray 121: if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
1.46 ray 122: fatal("bad revision number");
123: }
124: if (rev_str2 != NULL) {
1.47 ray 125: if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
1.46 ray 126: fatal("bad revision number");
127: }
1.14 xsa 128:
1.51 xsa 129: if (!(flags & QUIET)) {
1.18 xsa 130: fprintf(stderr, "%s\n", RCS_DIFF_DIV);
131: fprintf(stderr, "RCS file: %s\n", fpath);
1.14 xsa 132: }
1.8 joris 133:
134: diff_file = argv[i];
1.1 joris 135:
1.46 ray 136: /* No revisions given. */
137: if (rev_str1 == NULL) {
138: if (rcsdiff_file(file, file->rf_head, argv[i]) < 0)
1.7 niallo 139: status = 2;
1.46 ray 140: /* One revision given. */
141: } else if (rev_str2 == NULL) {
142: if (rcsdiff_file(file, rev1, argv[i]) < 0)
143: status = 2;
144: /* Two revisions given. */
1.4 niallo 145: } else {
1.46 ray 146: if (rcsdiff_rev(file, rev1, rev2) < 0)
1.7 niallo 147: status = 2;
1.1 joris 148: }
149:
150: rcs_close(file);
1.46 ray 151:
152: if (rev1 != NULL) {
153: rcsnum_free(rev1);
154: rev1 = NULL;
155: }
156: if (rev2 != NULL) {
157: rcsnum_free(rev2);
158: rev2 = NULL;
159: }
1.1 joris 160: }
161:
1.26 niallo 162: return (status);
1.1 joris 163: }
164:
165: void
166: rcsdiff_usage(void)
167: {
1.9 deraadt 168: fprintf(stderr,
1.34 jmc 169: "usage: rcsdiff [-cnquV] [-kmode] [-rrev1 [-rrev2]] "
1.35 jmc 170: "[-xsuffixes] [-ztz] file ...\n");
1.1 joris 171: }
172:
173: static int
1.23 xsa 174: rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
1.1 joris 175: {
1.37 joris 176: int ret;
1.49 joris 177: time_t t;
1.1 joris 178: char path1[MAXPATHLEN], path2[MAXPATHLEN];
179: BUF *b1, *b2;
180: char rbuf[64];
1.49 joris 181: struct tm *tb;
1.15 xsa 182: struct stat st;
1.24 niallo 183: struct timeval tv[2], tv2[2];
1.49 joris 184:
1.24 niallo 185: memset(&tv, 0, sizeof(tv));
186: memset(&tv2, 0, sizeof(tv2));
1.15 xsa 187:
1.37 joris 188: ret = -1;
189: b1 = b2 = NULL;
190:
1.49 joris 191: diff_rev1 = rev;
192: diff_rev2 = NULL;
193:
1.15 xsa 194: if (stat(filename, &st) == -1) {
1.52 ! xsa 195: warn("%s", filename);
1.37 joris 196: goto out;
1.15 xsa 197: }
1.1 joris 198:
199: rcsnum_tostr(rev, rbuf, sizeof(rbuf));
1.51 xsa 200: if (!(flags & QUIET)) {
1.18 xsa 201: fprintf(stderr, "retrieving revision %s\n", rbuf);
202: fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
1.16 xsa 203: }
1.1 joris 204:
1.23 xsa 205: if ((b1 = rcs_getrev(file, rev)) == NULL) {
1.52 ! xsa 206: warnx("failed to retrieve revision %s", rbuf);
1.37 joris 207: goto out;
1.1 joris 208: }
1.37 joris 209:
1.31 niallo 210: b1 = rcs_kwexp_buf(b1, file, rev);
1.24 niallo 211: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
212: tv[1].tv_sec = tv[0].tv_sec;
1.1 joris 213:
214: if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
1.52 ! xsa 215: warnx("failed to load file: `%s'", filename);
1.37 joris 216: goto out;
1.4 niallo 217: }
1.37 joris 218:
1.49 joris 219: /* XXX - GNU uses GMT */
220: tb = gmtime(&st.st_mtime);
221: t = mktime(tb);
222:
223: tv2[0].tv_sec = t;
1.50 deraadt 224: tv2[1].tv_sec = t;
1.4 niallo 225:
1.13 xsa 226: strlcpy(path1, rcs_tmpdir, sizeof(path1));
227: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.40 niallo 228: cvs_buf_write_stmp(b1, path1, 0600);
1.37 joris 229:
1.4 niallo 230: cvs_buf_free(b1);
1.37 joris 231: b1 = NULL;
232:
1.24 niallo 233: if (utimes(path1, (const struct timeval *)&tv) < 0)
1.52 ! xsa 234: warn("utimes");
1.4 niallo 235:
1.13 xsa 236: strlcpy(path2, rcs_tmpdir, sizeof(path2));
237: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.40 niallo 238: cvs_buf_write_stmp(b2, path2, 0600);
1.37 joris 239:
1.4 niallo 240: cvs_buf_free(b2);
1.37 joris 241: b2 = NULL;
242:
1.24 niallo 243: if (utimes(path2, (const struct timeval *)&tv2) < 0)
1.52 ! xsa 244: warn("utimes");
1.4 niallo 245:
246: cvs_diffreg(path1, path2, NULL);
1.37 joris 247: ret = 0;
248:
249: out:
250: if (b1 != NULL)
251: cvs_buf_free(b1);
252: if (b2 != NULL)
253: cvs_buf_free(b2);
254:
255: return (ret);
1.4 niallo 256: }
257:
258: static int
1.38 niallo 259: rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
1.4 niallo 260: {
1.37 joris 261: int ret;
1.4 niallo 262: char path1[MAXPATHLEN], path2[MAXPATHLEN];
263: BUF *b1, *b2;
1.16 xsa 264: char rbuf1[64], rbuf2[64];
1.24 niallo 265: struct timeval tv[2], tv2[2];
266:
1.37 joris 267: ret = -1;
268: b1 = b2 = NULL;
1.24 niallo 269: memset(&tv, 0, sizeof(tv));
270: memset(&tv2, 0, sizeof(tv2));
1.4 niallo 271:
1.49 joris 272: diff_rev1 = rev1;
273: diff_rev2 = rev2;
274:
1.16 xsa 275: rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1));
1.51 xsa 276: if (!(flags & QUIET))
1.49 joris 277: fprintf(stderr, "retrieving revision %s\n", rbuf1);
1.4 niallo 278:
1.23 xsa 279: if ((b1 = rcs_getrev(file, rev1)) == NULL) {
1.52 ! xsa 280: warnx("failed to retrieve revision %s", rbuf1);
1.37 joris 281: goto out;
1.4 niallo 282: }
1.37 joris 283:
1.31 niallo 284: b1 = rcs_kwexp_buf(b1, file, rev1);
1.24 niallo 285: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev1);
286: tv[1].tv_sec = tv[0].tv_sec;
1.4 niallo 287:
1.16 xsa 288: rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2));
1.51 xsa 289: if (!(flags & QUIET))
1.18 xsa 290: fprintf(stderr, "retrieving revision %s\n", rbuf2);
1.4 niallo 291:
1.23 xsa 292: if ((b2 = rcs_getrev(file, rev2)) == NULL) {
1.52 ! xsa 293: warnx("failed to retrieve revision %s", rbuf2);
1.37 joris 294: goto out;
1.1 joris 295: }
1.37 joris 296:
1.31 niallo 297: b2 = rcs_kwexp_buf(b2, file, rev2);
1.24 niallo 298: tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2);
299: tv2[1].tv_sec = tv2[0].tv_sec;
1.16 xsa 300:
1.51 xsa 301: if (!(flags & QUIET))
1.33 xsa 302: fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2);
1.1 joris 303:
1.13 xsa 304: strlcpy(path1, rcs_tmpdir, sizeof(path1));
305: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.40 niallo 306: cvs_buf_write_stmp(b1, path1, 0600);
1.37 joris 307:
1.1 joris 308: cvs_buf_free(b1);
1.37 joris 309: b1 = NULL;
310:
1.24 niallo 311: if (utimes(path1, (const struct timeval *)&tv) < 0)
1.52 ! xsa 312: warn("utimes");
1.1 joris 313:
1.13 xsa 314: strlcpy(path2, rcs_tmpdir, sizeof(path2));
315: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.40 niallo 316: cvs_buf_write_stmp(b2, path2, 0600);
1.37 joris 317:
1.1 joris 318: cvs_buf_free(b2);
1.37 joris 319: b2 = NULL;
1.1 joris 320:
1.24 niallo 321: if (utimes(path2, (const struct timeval *)&tv2) < 0)
1.52 ! xsa 322: warn("utimes");
1.32 deraadt 323:
1.2 niallo 324: cvs_diffreg(path1, path2, NULL);
1.37 joris 325: ret = 0;
326:
327: out:
328: if (b1 != NULL)
329: cvs_buf_free(b1);
330: if (b2 != NULL)
331: cvs_buf_free(b2);
1.1 joris 332:
1.37 joris 333: return (ret);
1.1 joris 334: }
![[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