Annotation of src/usr.bin/rcs/rcsdiff.c, Revision 1.46
1.46 ! ray 1: /* $OpenBSD: rcsdiff.c,v 1.45 2006/04/10 19:49:45 joris 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.18 xsa 35: static int kflag = RCS_KWEXP_ERR;
36:
1.1 joris 37: int
38: rcsdiff_main(int argc, char **argv)
39: {
1.25 xsa 40: int i, ch, status;
1.46 ! ray 41: RCSNUM *rev1, *rev2;
1.1 joris 42: RCSFILE *file;
1.46 ! ray 43: char fpath[MAXPATHLEN], *rev_str1, *rev_str2;
1.1 joris 44:
1.46 ! ray 45: rev1 = rev2 = NULL;
! 46: rev_str1 = rev_str2 = NULL;
1.7 niallo 47: status = 0;
1.1 joris 48:
1.16 xsa 49: strlcpy(diffargs, "diff", sizeof(diffargs));
50:
1.43 xsa 51: while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) {
1.1 joris 52: switch (ch) {
1.3 joris 53: case 'c':
1.16 xsa 54: strlcat(diffargs, " -c", sizeof(diffargs));
1.3 joris 55: diff_format = D_CONTEXT;
56: break;
1.18 xsa 57: case 'k':
58: kflag = rcs_kflag_get(rcs_optarg);
59: if (RCS_KWEXP_INVAL(kflag)) {
60: cvs_log(LP_ERR,
61: "invalid RCS keyword expansion mode");
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':
71: verbose = 0;
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) {
106: cvs_log(LP_ERR, "no input file");
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) {
! 121: if ((rev1 = rcsnum_parse(rev_str1)) == NULL)
! 122: fatal("bad revision number");
! 123: }
! 124: if (rev_str2 != NULL) {
! 125: if ((rev2 = rcsnum_parse(rev_str2)) == NULL)
! 126: fatal("bad revision number");
! 127: }
1.14 xsa 128:
129: if (verbose == 1) {
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.1 joris 177: char path1[MAXPATHLEN], path2[MAXPATHLEN];
178: BUF *b1, *b2;
179: char rbuf[64];
1.15 xsa 180: struct stat st;
1.24 niallo 181: struct timeval tv[2], tv2[2];
182: memset(&tv, 0, sizeof(tv));
183: memset(&tv2, 0, sizeof(tv2));
1.15 xsa 184:
1.37 joris 185: ret = -1;
186: b1 = b2 = NULL;
187:
1.15 xsa 188: if (stat(filename, &st) == -1) {
189: cvs_log(LP_ERRNO, "%s", filename);
1.37 joris 190: goto out;
1.15 xsa 191: }
1.1 joris 192:
193: rcsnum_tostr(rev, rbuf, sizeof(rbuf));
1.16 xsa 194: if (verbose == 1) {
1.18 xsa 195: fprintf(stderr, "retrieving revision %s\n", rbuf);
196: fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
1.16 xsa 197: }
1.1 joris 198:
1.23 xsa 199: if ((b1 = rcs_getrev(file, rev)) == NULL) {
1.31 niallo 200: cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf);
1.37 joris 201: goto out;
1.1 joris 202: }
1.37 joris 203:
1.31 niallo 204: b1 = rcs_kwexp_buf(b1, file, rev);
1.24 niallo 205: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
206: tv[1].tv_sec = tv[0].tv_sec;
1.1 joris 207:
208: if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
209: cvs_log(LP_ERR, "failed to load file: '%s'", filename);
1.37 joris 210: goto out;
1.4 niallo 211: }
1.37 joris 212:
1.24 niallo 213: tv2[0].tv_sec = st.st_mtime;
214: tv2[1].tv_sec = st.st_mtime;
1.4 niallo 215:
1.13 xsa 216: strlcpy(path1, rcs_tmpdir, sizeof(path1));
217: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.40 niallo 218: cvs_buf_write_stmp(b1, path1, 0600);
1.37 joris 219:
1.4 niallo 220: cvs_buf_free(b1);
1.37 joris 221: b1 = NULL;
222:
1.24 niallo 223: if (utimes(path1, (const struct timeval *)&tv) < 0)
224: cvs_log(LP_ERRNO, "error setting utimes");
1.4 niallo 225:
1.13 xsa 226: strlcpy(path2, rcs_tmpdir, sizeof(path2));
227: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.40 niallo 228: cvs_buf_write_stmp(b2, path2, 0600);
1.37 joris 229:
1.4 niallo 230: cvs_buf_free(b2);
1.37 joris 231: b2 = NULL;
232:
1.24 niallo 233: if (utimes(path2, (const struct timeval *)&tv2) < 0)
234: cvs_log(LP_ERRNO, "error setting utimes");
1.4 niallo 235:
236: cvs_diffreg(path1, path2, NULL);
1.37 joris 237: ret = 0;
238:
239: out:
240: cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
1.4 niallo 241:
1.37 joris 242: if (b1 != NULL)
243: cvs_buf_free(b1);
244: if (b2 != NULL)
245: cvs_buf_free(b2);
246:
247: return (ret);
1.4 niallo 248: }
249:
250: static int
1.38 niallo 251: rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
1.4 niallo 252: {
1.37 joris 253: int ret;
1.4 niallo 254: char path1[MAXPATHLEN], path2[MAXPATHLEN];
255: BUF *b1, *b2;
1.16 xsa 256: char rbuf1[64], rbuf2[64];
1.24 niallo 257: struct timeval tv[2], tv2[2];
258:
1.37 joris 259: ret = -1;
260: b1 = b2 = NULL;
1.24 niallo 261: memset(&tv, 0, sizeof(tv));
262: memset(&tv2, 0, sizeof(tv2));
1.4 niallo 263:
1.16 xsa 264: rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1));
1.10 xsa 265: if (verbose == 1)
1.16 xsa 266: printf("retrieving revision %s\n", rbuf1);
1.4 niallo 267:
1.23 xsa 268: if ((b1 = rcs_getrev(file, rev1)) == NULL) {
1.31 niallo 269: cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf1);
1.37 joris 270: goto out;
1.4 niallo 271: }
1.37 joris 272:
1.31 niallo 273: b1 = rcs_kwexp_buf(b1, file, rev1);
1.24 niallo 274: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev1);
275: tv[1].tv_sec = tv[0].tv_sec;
1.4 niallo 276:
1.16 xsa 277: rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2));
1.10 xsa 278: if (verbose == 1)
1.18 xsa 279: fprintf(stderr, "retrieving revision %s\n", rbuf2);
1.4 niallo 280:
1.23 xsa 281: if ((b2 = rcs_getrev(file, rev2)) == NULL) {
1.31 niallo 282: cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf2);
1.37 joris 283: goto out;
1.1 joris 284: }
1.37 joris 285:
1.31 niallo 286: b2 = rcs_kwexp_buf(b2, file, rev2);
1.24 niallo 287: tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2);
288: tv2[1].tv_sec = tv2[0].tv_sec;
1.16 xsa 289:
290: if (verbose == 1)
1.33 xsa 291: fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2);
1.1 joris 292:
1.13 xsa 293: strlcpy(path1, rcs_tmpdir, sizeof(path1));
294: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.40 niallo 295: cvs_buf_write_stmp(b1, path1, 0600);
1.37 joris 296:
1.1 joris 297: cvs_buf_free(b1);
1.37 joris 298: b1 = NULL;
299:
1.24 niallo 300: if (utimes(path1, (const struct timeval *)&tv) < 0)
301: cvs_log(LP_ERRNO, "error setting utimes");
1.1 joris 302:
1.13 xsa 303: strlcpy(path2, rcs_tmpdir, sizeof(path2));
304: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.40 niallo 305: cvs_buf_write_stmp(b2, path2, 0600);
1.37 joris 306:
1.1 joris 307: cvs_buf_free(b2);
1.37 joris 308: b2 = NULL;
1.1 joris 309:
1.24 niallo 310: if (utimes(path2, (const struct timeval *)&tv2) < 0)
311: cvs_log(LP_ERRNO, "error setting utimes");
1.32 deraadt 312:
1.2 niallo 313: cvs_diffreg(path1, path2, NULL);
1.37 joris 314: ret = 0;
315:
316: out:
317: cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
318:
319: if (b1 != NULL)
320: cvs_buf_free(b1);
321: if (b2 != NULL)
322: cvs_buf_free(b2);
1.1 joris 323:
1.37 joris 324: return (ret);
1.1 joris 325: }
![[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