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