Annotation of src/usr.bin/rcs/rcsdiff.c, Revision 1.41
1.41 ! ray 1: /* $OpenBSD: rcsdiff.c,v 1.40 2006/03/20 16:18:13 niallo 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.4 niallo 41: RCSNUM *rev, *rev2, *frev;
1.1 joris 42: RCSFILE *file;
43: char fpath[MAXPATHLEN];
44:
45: rev = RCS_HEAD_REV;
1.4 niallo 46: rev2 = NULL;
1.7 niallo 47: status = 0;
1.1 joris 48:
1.16 xsa 49: strlcpy(diffargs, "diff", sizeof(diffargs));
50:
1.41 ! ray 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':
78: if (rev == RCS_HEAD_REV) {
1.27 xsa 79: if ((rev = rcsnum_parse(rcs_optarg)) == NULL)
80: fatal("bad revision number");
1.4 niallo 81: } else {
1.27 xsa 82: if ((rev2 = rcsnum_parse(rcs_optarg)) == NULL)
83: fatal("bad revision number");
1.4 niallo 84: }
1.19 xsa 85: break;
86: case 'T':
1.21 xsa 87: /*
88: * kept for compatibility
89: */
1.17 xsa 90: break;
91: case 'V':
92: printf("%s\n", rcs_version);
93: exit(0);
1.39 ray 94: /* NOTREACHED */
1.17 xsa 95: case 'x':
1.41 ! ray 96: /* Use blank extension if none given. */
! 97: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.36 joris 98: break;
99: case 'z':
100: timezone_flag = rcs_optarg;
1.4 niallo 101: break;
1.1 joris 102: default:
1.11 joris 103: (usage)();
104: exit (1);
1.1 joris 105: }
106: }
107:
1.11 joris 108: argc -= rcs_optind;
109: argv += rcs_optind;
1.1 joris 110:
111: if (argc == 0) {
112: cvs_log(LP_ERR, "no input file");
113: (usage)();
114: exit(1);
115: }
116:
117: for (i = 0; i < argc; i++) {
118: if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
119: continue;
120:
1.28 niallo 121: if ((file = rcs_open(fpath, RCS_READ|RCS_PARSE_FULLY)) == NULL)
1.1 joris 122: continue;
1.20 xsa 123:
124: if (kflag != RCS_KWEXP_ERR)
125: rcs_kwexp_set(file, kflag);
1.1 joris 126:
127: if (rev == RCS_HEAD_REV)
128: frev = file->rf_head;
129: else
130: frev = rev;
1.14 xsa 131:
132: if (verbose == 1) {
1.18 xsa 133: fprintf(stderr, "%s\n", RCS_DIFF_DIV);
134: fprintf(stderr, "RCS file: %s\n", fpath);
1.14 xsa 135: }
1.8 joris 136:
137: diff_file = argv[i];
1.1 joris 138:
1.4 niallo 139: if (rev2 == NULL) {
140: if (rcsdiff_file(file, frev, argv[i]) < 0) {
141: rcs_close(file);
1.7 niallo 142: status = 2;
1.4 niallo 143: continue;
144: }
145: } else {
1.38 niallo 146: if (rcsdiff_rev(file, rev, rev2) < 0) {
1.4 niallo 147: rcs_close(file);
1.7 niallo 148: status = 2;
1.4 niallo 149: continue;
150: }
1.1 joris 151: }
152:
153: rcs_close(file);
154: }
155:
1.26 niallo 156: return (status);
1.1 joris 157: }
158:
159: void
160: rcsdiff_usage(void)
161: {
1.9 deraadt 162: fprintf(stderr,
1.34 jmc 163: "usage: rcsdiff [-cnquV] [-kmode] [-rrev1 [-rrev2]] "
1.35 jmc 164: "[-xsuffixes] [-ztz] file ...\n");
1.1 joris 165: }
166:
167: static int
1.23 xsa 168: rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
1.1 joris 169: {
1.37 joris 170: int ret;
1.1 joris 171: char path1[MAXPATHLEN], path2[MAXPATHLEN];
172: BUF *b1, *b2;
173: char rbuf[64];
1.15 xsa 174: struct stat st;
1.24 niallo 175: struct timeval tv[2], tv2[2];
176: memset(&tv, 0, sizeof(tv));
177: memset(&tv2, 0, sizeof(tv2));
1.15 xsa 178:
1.37 joris 179: ret = -1;
180: b1 = b2 = NULL;
181:
1.15 xsa 182: if (stat(filename, &st) == -1) {
183: cvs_log(LP_ERRNO, "%s", filename);
1.37 joris 184: goto out;
1.15 xsa 185: }
1.1 joris 186:
187: rcsnum_tostr(rev, rbuf, sizeof(rbuf));
1.16 xsa 188: if (verbose == 1) {
1.18 xsa 189: fprintf(stderr, "retrieving revision %s\n", rbuf);
190: fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename);
1.16 xsa 191: }
1.1 joris 192:
1.23 xsa 193: if ((b1 = rcs_getrev(file, rev)) == NULL) {
1.31 niallo 194: cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf);
1.37 joris 195: goto out;
1.1 joris 196: }
1.37 joris 197:
1.31 niallo 198: b1 = rcs_kwexp_buf(b1, file, rev);
1.24 niallo 199: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
200: tv[1].tv_sec = tv[0].tv_sec;
1.1 joris 201:
202: if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
203: cvs_log(LP_ERR, "failed to load file: '%s'", filename);
1.37 joris 204: goto out;
1.4 niallo 205: }
1.37 joris 206:
1.24 niallo 207: tv2[0].tv_sec = st.st_mtime;
208: tv2[1].tv_sec = st.st_mtime;
1.4 niallo 209:
1.13 xsa 210: strlcpy(path1, rcs_tmpdir, sizeof(path1));
211: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.40 niallo 212: cvs_buf_write_stmp(b1, path1, 0600);
1.37 joris 213:
214: cvs_worklist_add(path1, &rcs_temp_files);
1.4 niallo 215: cvs_buf_free(b1);
1.37 joris 216: b1 = NULL;
217:
1.24 niallo 218: if (utimes(path1, (const struct timeval *)&tv) < 0)
219: cvs_log(LP_ERRNO, "error setting utimes");
1.4 niallo 220:
1.13 xsa 221: strlcpy(path2, rcs_tmpdir, sizeof(path2));
222: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.40 niallo 223: cvs_buf_write_stmp(b2, path2, 0600);
1.37 joris 224:
225: cvs_worklist_add(path2, &rcs_temp_files);
1.4 niallo 226: cvs_buf_free(b2);
1.37 joris 227: b2 = NULL;
228:
1.24 niallo 229: if (utimes(path2, (const struct timeval *)&tv2) < 0)
230: cvs_log(LP_ERRNO, "error setting utimes");
1.4 niallo 231:
232: cvs_diffreg(path1, path2, NULL);
1.37 joris 233: ret = 0;
234:
235: out:
236: cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
1.4 niallo 237:
1.37 joris 238: if (b1 != NULL)
239: cvs_buf_free(b1);
240: if (b2 != NULL)
241: cvs_buf_free(b2);
242:
243: return (ret);
1.4 niallo 244: }
245:
246: static int
1.38 niallo 247: rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
1.4 niallo 248: {
1.37 joris 249: int ret;
1.4 niallo 250: char path1[MAXPATHLEN], path2[MAXPATHLEN];
251: BUF *b1, *b2;
1.16 xsa 252: char rbuf1[64], rbuf2[64];
1.24 niallo 253: struct timeval tv[2], tv2[2];
254:
1.37 joris 255: ret = -1;
256: b1 = b2 = NULL;
1.24 niallo 257: memset(&tv, 0, sizeof(tv));
258: memset(&tv2, 0, sizeof(tv2));
1.4 niallo 259:
1.16 xsa 260: rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1));
1.10 xsa 261: if (verbose == 1)
1.16 xsa 262: printf("retrieving revision %s\n", rbuf1);
1.4 niallo 263:
1.23 xsa 264: if ((b1 = rcs_getrev(file, rev1)) == NULL) {
1.31 niallo 265: cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf1);
1.37 joris 266: goto out;
1.4 niallo 267: }
1.37 joris 268:
1.31 niallo 269: b1 = rcs_kwexp_buf(b1, file, rev1);
1.24 niallo 270: tv[0].tv_sec = (long)rcs_rev_getdate(file, rev1);
271: tv[1].tv_sec = tv[0].tv_sec;
1.4 niallo 272:
1.16 xsa 273: rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2));
1.10 xsa 274: if (verbose == 1)
1.18 xsa 275: fprintf(stderr, "retrieving revision %s\n", rbuf2);
1.4 niallo 276:
1.23 xsa 277: if ((b2 = rcs_getrev(file, rev2)) == NULL) {
1.31 niallo 278: cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf2);
1.37 joris 279: goto out;
1.1 joris 280: }
1.37 joris 281:
1.31 niallo 282: b2 = rcs_kwexp_buf(b2, file, rev2);
1.24 niallo 283: tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2);
284: tv2[1].tv_sec = tv2[0].tv_sec;
1.16 xsa 285:
286: if (verbose == 1)
1.33 xsa 287: fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2);
1.1 joris 288:
1.13 xsa 289: strlcpy(path1, rcs_tmpdir, sizeof(path1));
290: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.40 niallo 291: cvs_buf_write_stmp(b1, path1, 0600);
1.37 joris 292:
293: cvs_worklist_add(path1, &rcs_temp_files);
1.1 joris 294: cvs_buf_free(b1);
1.37 joris 295: b1 = NULL;
296:
1.24 niallo 297: if (utimes(path1, (const struct timeval *)&tv) < 0)
298: cvs_log(LP_ERRNO, "error setting utimes");
1.1 joris 299:
1.13 xsa 300: strlcpy(path2, rcs_tmpdir, sizeof(path2));
301: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.40 niallo 302: cvs_buf_write_stmp(b2, path2, 0600);
1.37 joris 303:
304: cvs_worklist_add(path2, &rcs_temp_files);
1.1 joris 305: cvs_buf_free(b2);
1.37 joris 306: b2 = NULL;
1.1 joris 307:
1.24 niallo 308: if (utimes(path2, (const struct timeval *)&tv2) < 0)
309: cvs_log(LP_ERRNO, "error setting utimes");
1.32 deraadt 310:
1.2 niallo 311: cvs_diffreg(path1, path2, NULL);
1.37 joris 312: ret = 0;
313:
314: out:
315: cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
316:
317: if (b1 != NULL)
318: cvs_buf_free(b1);
319: if (b2 != NULL)
320: cvs_buf_free(b2);
1.1 joris 321:
1.37 joris 322: return (ret);
1.1 joris 323: }
![[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