Annotation of src/usr.bin/rcs/rcsmerge.c, Revision 1.50
1.50 ! xsa 1: /* $OpenBSD: rcsmerge.c,v 1.49 2006/10/12 17:20:12 niallo Exp $ */
1.1 xsa 2: /*
1.14 xsa 3: * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
1.1 xsa 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.50 ! xsa 27: #include <err.h>
! 28: #include <stdio.h>
! 29: #include <stdlib.h>
! 30: #include <string.h>
! 31: #include <unistd.h>
1.1 xsa 32:
1.13 xsa 33: #include "rcsprog.h"
1.1 xsa 34: #include "diff.h"
35:
36: int
37: rcsmerge_main(int argc, char **argv)
38: {
1.44 xsa 39: int fd, ch, flags, kflag, status;
1.47 ray 40: char fpath[MAXPATHLEN], r1[16], r2[16], *rev_str1, *rev_str2;
1.1 xsa 41: RCSFILE *file;
1.24 ray 42: RCSNUM *rev1, *rev2;
1.2 joris 43: BUF *bp;
1.1 xsa 44:
1.27 xsa 45: flags = 0;
46: kflag = RCS_KWEXP_ERR;
1.44 xsa 47: status = D_ERROR;
1.24 ray 48: rev1 = rev2 = NULL;
49: rev_str1 = rev_str2 = NULL;
1.1 xsa 50:
1.34 ray 51: while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) {
1.1 xsa 52: switch (ch) {
1.48 xsa 53: case 'A':
54: /*
55: * kept for compatibility
56: */
57: break;
58: case 'E':
59: flags |= MERGE_EFLAG;
60: flags |= MERGE_OFLAG;
61: break;
62: case 'e':
63: flags |= MERGE_EFLAG;
1.14 xsa 64: break;
1.1 xsa 65: case 'k':
66: kflag = rcs_kflag_get(rcs_optarg);
67: if (RCS_KWEXP_INVAL(kflag)) {
1.31 xsa 68: warnx("invalid RCS keyword substitution mode");
1.1 xsa 69: (usage)();
1.38 xsa 70: exit(D_ERROR);
1.1 xsa 71: }
72: break;
1.2 joris 73: case 'p':
1.24 ray 74: rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg);
1.28 xsa 75: flags |= PIPEOUT;
1.2 joris 76: break;
1.1 xsa 77: case 'q':
1.24 ray 78: rcs_setrevstr2(&rev_str1, &rev_str2, rcs_optarg);
1.27 xsa 79: flags |= QUIET;
1.1 xsa 80: break;
81: case 'r':
1.34 ray 82: rcs_setrevstr2(&rev_str1, &rev_str2,
83: rcs_optarg ? rcs_optarg : "");
1.1 xsa 84: break;
85: case 'T':
86: /*
87: * kept for compatibility
88: */
89: break;
90: case 'V':
91: printf("%s\n", rcs_version);
92: exit(0);
1.9 xsa 93: case 'x':
1.23 ray 94: /* Use blank extension if none given. */
95: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.17 joris 96: break;
97: case 'z':
98: timezone_flag = rcs_optarg;
1.9 xsa 99: break;
1.1 xsa 100: default:
1.26 ray 101: (usage)();
1.38 xsa 102: exit(D_ERROR);
1.1 xsa 103: }
104: }
105:
106: argc -= rcs_optind;
107: argv += rcs_optind;
108:
1.44 xsa 109: if (rev_str1 == NULL) {
110: warnx("no base revision number given");
1.1 xsa 111: (usage)();
1.38 xsa 112: exit(D_ERROR);
1.1 xsa 113: }
114:
1.44 xsa 115: if (argc < 1) {
116: warnx("no input file");
1.2 joris 117: (usage)();
1.38 xsa 118: exit(D_ERROR);
1.2 joris 119: }
120:
1.44 xsa 121: if (argc > 2 || (argc == 2 && argv[1] != NULL))
122: warnx("warning: excess arguments ignored");
123:
1.46 ray 124: if ((fd = rcs_choosefile(argv[0], fpath, sizeof(fpath))) < 0)
1.49 niallo 125: err(status, "%s", fpath);
1.24 ray 126:
1.44 xsa 127: if (!(flags & QUIET))
128: (void)fprintf(stderr, "RCS file: %s\n", fpath);
1.8 xsa 129:
1.44 xsa 130: if ((file = rcs_open(fpath, fd, RCS_READ)) == NULL)
131: return (status);
132:
133: if (strcmp(rev_str1, "") == 0) {
134: rev1 = rcsnum_alloc();
135: rcsnum_cpy(file->rf_head, rev1, 0);
136: } else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
137: errx(D_ERROR, "invalid revision: %s", rev_str1);
138:
139: if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) {
140: if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
141: errx(D_ERROR, "invalid revision: %s", rev_str2);
142: } else {
143: rev2 = rcsnum_alloc();
144: rcsnum_cpy(file->rf_head, rev2, 0);
145: }
1.15 xsa 146:
1.44 xsa 147: if (rcsnum_cmp(rev1, rev2, 0) == 0)
148: goto out;
1.2 joris 149:
1.48 xsa 150: if ((bp = rcs_diff3(file, argv[0], rev1, rev2, flags)) == NULL)
1.45 xsa 151: errx(D_ERROR, "failed to merge");
1.2 joris 152:
1.44 xsa 153: if (!(flags & QUIET)) {
154: (void)rcsnum_tostr(rev1, r1, sizeof(r1));
155: (void)rcsnum_tostr(rev2, r2, sizeof(r2));
156:
157: (void)fprintf(stderr, "Merging differences between %s and "
158: "%s into %s%s\n", r1, r2, argv[0],
159: (flags & PIPEOUT) ? "; result to stdout":"");
160: }
1.41 xsa 161:
1.44 xsa 162: if (diff3_conflicts != 0)
163: status = D_OVERLAPS;
164: else
165: status = 0;
166:
1.47 ray 167: if (flags & PIPEOUT)
168: rcs_buf_write_fd(bp, STDOUT_FILENO);
169: else {
1.44 xsa 170: /* XXX mode */
171: if (rcs_buf_write(bp, argv[0], 0644) < 0)
172: warnx("rcs_buf_write failed");
1.2 joris 173:
1.1 xsa 174: }
1.47 ray 175:
176: rcs_buf_free(bp);
1.44 xsa 177:
178: out:
179: rcs_close(file);
180:
181: if (rev1 != NULL)
182: rcsnum_free(rev1);
183: if (rev2 != NULL)
184: rcsnum_free(rev2);
1.1 xsa 185:
1.41 xsa 186: return (status);
1.1 xsa 187: }
188:
189: void
190: rcsmerge_usage(void)
191: {
192: fprintf(stderr,
1.43 jmc 193: "usage: rcsmerge [-EV] [-kmode] [-p[rev]] [-q[rev]]\n"
1.32 jmc 194: " [-xsuffixes] [-ztz] -rrev file ...\n");
1.1 xsa 195: }
![[BACK]](/icons/back.gif){kind=icon}
Return to rcsmerge.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs