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