Annotation of src/usr.bin/rcs/rcsdiff.c, Revision 1.10
1.10 ! xsa 1: /* $OpenBSD: rcsdiff.c,v 1.9 2005/10/12 17:13:30 deraadt 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:
27: #include <sys/param.h>
28: #include <sys/stat.h>
29:
30: #include <stdio.h>
31: #include <stdlib.h>
32: #include <string.h>
33: #include <unistd.h>
34:
35: #include "log.h"
36: #include "rcs.h"
1.2 niallo 37: #include "diff.h"
1.1 joris 38: #include "rcsprog.h"
39:
40: static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *);
1.4 niallo 41: static int rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev, RCSNUM *rev2);
1.1 joris 42:
43: int
44: rcsdiff_main(int argc, char **argv)
45: {
1.7 niallo 46: int i, ch, status;
1.4 niallo 47: RCSNUM *rev, *rev2, *frev;
1.1 joris 48: RCSFILE *file;
49: char fpath[MAXPATHLEN];
50:
51: rev = RCS_HEAD_REV;
1.4 niallo 52: rev2 = NULL;
1.7 niallo 53: status = 0;
1.1 joris 54:
1.4 niallo 55: while ((ch = getopt(argc, argv, "cnqr:uV")) != -1) {
1.1 joris 56: switch (ch) {
1.3 joris 57: case 'c':
58: diff_format = D_CONTEXT;
59: break;
60: case 'n':
61: diff_format = D_RCSDIFF;
62: break;
1.1 joris 63: case 'q':
64: verbose = 0;
1.3 joris 65: break;
66: case 'u':
67: diff_format = D_UNIFIED;
1.1 joris 68: break;
69: case 'V':
70: printf("%s\n", rcs_version);
71: exit(0);
1.4 niallo 72: case 'r':
73: if (rev == RCS_HEAD_REV) {
74: if ((rev = rcsnum_parse(optarg)) == NULL) {
75: cvs_log(LP_ERR, "bad revision number");
76: exit(1);
77: }
78: } else {
79: if ((rev2 = rcsnum_parse(optarg)) == NULL) {
80: cvs_log(LP_ERR, "bad revision number");
81: exit(1);
82: }
83: }
84: break;
1.1 joris 85: default:
86: break;
87: }
88: }
89:
90: argc -= optind;
91: argv += optind;
92:
93: if (argc == 0) {
94: cvs_log(LP_ERR, "no input file");
95: (usage)();
96: exit(1);
97: }
98:
99: for (i = 0; i < argc; i++) {
1.10 ! xsa 100: if (verbose == 1)
1.1 joris 101: cvs_printf("%s\n", RCS_DIFF_DIV);
102:
103: if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
104: continue;
105:
106: if ((file = rcs_open(fpath, RCS_READ)) == NULL)
107: continue;
108:
109: if (rev == RCS_HEAD_REV)
110: frev = file->rf_head;
111: else
112: frev = rev;
1.8 joris 113:
114: diff_file = argv[i];
1.1 joris 115:
1.4 niallo 116: if (rev2 == NULL) {
117: if (rcsdiff_file(file, frev, argv[i]) < 0) {
118: cvs_log(LP_ERR, "failed to rcsdiff");
119: rcs_close(file);
1.7 niallo 120: status = 2;
1.4 niallo 121: continue;
122: }
123: } else {
124: if (rcsdiff_rev(file, rev, rev2) < 0) {
125: cvs_log(LP_ERR, "failed to rcsdiff");
126: rcs_close(file);
1.7 niallo 127: status = 2;
1.4 niallo 128: continue;
129: }
1.1 joris 130: }
131:
132: rcs_close(file);
133: }
134:
1.7 niallo 135: exit(status);
1.1 joris 136: }
137:
138: void
139: rcsdiff_usage(void)
140: {
1.9 deraadt 141: fprintf(stderr,
142: "usage: rcsdiff [-cnquV] [-r rev1 [-r rev2]] file ...\n");
1.1 joris 143: }
144:
145: static int
146: rcsdiff_file(RCSFILE *rfp, RCSNUM *rev, const char *filename)
147: {
148: char path1[MAXPATHLEN], path2[MAXPATHLEN];
149: BUF *b1, *b2;
150: char rbuf[64];
151:
152: rcsnum_tostr(rev, rbuf, sizeof(rbuf));
1.10 ! xsa 153: if (verbose == 1)
1.1 joris 154: printf("retrieving revision %s\n", rbuf);
155:
156: if ((b1 = rcs_getrev(rfp, rev)) == NULL) {
157: cvs_log(LP_ERR, "failed to retrieve revision");
158: return (-1);
159: }
160:
161: if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
162: cvs_log(LP_ERR, "failed to load file: '%s'", filename);
163: cvs_buf_free(b1);
1.4 niallo 164: return (-1);
165: }
166:
167: strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
168: if (cvs_buf_write_stmp(b1, path1, 0600) == -1) {
169: cvs_log(LP_ERRNO, "could not write temporary file");
170: cvs_buf_free(b1);
171: cvs_buf_free(b2);
172: return (-1);
173: }
174: cvs_buf_free(b1);
175:
176: strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
177: if (cvs_buf_write_stmp(b2, path2, 0600) == -1) {
178: cvs_buf_free(b2);
179: (void)unlink(path1);
180: return (-1);
181: }
182: cvs_buf_free(b2);
183:
184: cvs_diffreg(path1, path2, NULL);
185: (void)unlink(path1);
186: (void)unlink(path2);
187:
188: return (0);
189: }
190:
191: static int
192: rcsdiff_rev(RCSFILE *rfp, RCSNUM *rev1, RCSNUM *rev2)
193: {
194: char path1[MAXPATHLEN], path2[MAXPATHLEN];
195: BUF *b1, *b2;
196: char rbuf[64];
197:
198: rcsnum_tostr(rev1, rbuf, sizeof(rbuf));
1.10 ! xsa 199: if (verbose == 1)
1.4 niallo 200: printf("retrieving revision %s\n", rbuf);
201:
202: if ((b1 = rcs_getrev(rfp, rev1)) == NULL) {
203: cvs_log(LP_ERR, "failed to retrieve revision");
204: return (-1);
205: }
206:
207: rcsnum_tostr(rev2, rbuf, sizeof(rbuf));
1.10 ! xsa 208: if (verbose == 1)
1.4 niallo 209: printf("retrieving revision %s\n", rbuf);
210:
211: if ((b2 = rcs_getrev(rfp, rev2)) == NULL) {
212: cvs_log(LP_ERR, "failed to retrieve revision");
1.1 joris 213: return (-1);
214: }
215:
216: strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
217: if (cvs_buf_write_stmp(b1, path1, 0600) == -1) {
218: cvs_log(LP_ERRNO, "could not write temporary file");
219: cvs_buf_free(b1);
220: cvs_buf_free(b2);
221: return (-1);
222: }
223: cvs_buf_free(b1);
224:
225: strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
226: if (cvs_buf_write_stmp(b2, path2, 0600) == -1) {
227: cvs_buf_free(b2);
228: (void)unlink(path1);
229: return (-1);
230: }
231: cvs_buf_free(b2);
232:
1.2 niallo 233: cvs_diffreg(path1, path2, NULL);
1.1 joris 234: (void)unlink(path1);
235: (void)unlink(path2);
236:
237: return (0);
238: }
![[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