Annotation of src/usr.bin/rcs/rcsmerge.c, Revision 1.57
1.57 ! guenther 1: /* $OpenBSD: rcsmerge.c,v 1.56 2015/11/02 16:45:21 nicm 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>
1.57 ! guenther 31: #include <time.h>
1.50 xsa 32: #include <unistd.h>
1.1 xsa 33:
1.13 xsa 34: #include "rcsprog.h"
1.1 xsa 35: #include "diff.h"
36:
37: int
38: rcsmerge_main(int argc, char **argv)
39: {
1.44 xsa 40: int fd, ch, flags, kflag, status;
1.55 deraadt 41: char fpath[PATH_MAX], r1[RCS_REV_BUFSZ], r2[RCS_REV_BUFSZ];
1.51 xsa 42: char *rev_str1, *rev_str2;
1.1 xsa 43: RCSFILE *file;
1.24 ray 44: RCSNUM *rev1, *rev2;
1.2 joris 45: BUF *bp;
1.1 xsa 46:
1.27 xsa 47: flags = 0;
1.44 xsa 48: status = D_ERROR;
1.24 ray 49: rev1 = rev2 = NULL;
50: rev_str1 = rev_str2 = NULL;
1.1 xsa 51:
1.34 ray 52: while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) {
1.1 xsa 53: switch (ch) {
1.48 xsa 54: case 'A':
55: /*
56: * kept for compatibility
57: */
58: break;
59: case 'E':
60: flags |= MERGE_EFLAG;
61: flags |= MERGE_OFLAG;
62: break;
63: case 'e':
64: flags |= MERGE_EFLAG;
1.14 xsa 65: break;
1.1 xsa 66: case 'k':
67: kflag = rcs_kflag_get(rcs_optarg);
68: if (RCS_KWEXP_INVAL(kflag)) {
1.31 xsa 69: warnx("invalid RCS keyword substitution mode");
1.1 xsa 70: (usage)();
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.1 xsa 102: }
103: }
104:
105: argc -= rcs_optind;
106: argv += rcs_optind;
107:
1.44 xsa 108: if (rev_str1 == NULL) {
109: warnx("no base revision number given");
1.1 xsa 110: (usage)();
111: }
112:
1.44 xsa 113: if (argc < 1) {
114: warnx("no input file");
1.2 joris 115: (usage)();
116: }
117:
1.44 xsa 118: if (argc > 2 || (argc == 2 && argv[1] != NULL))
119: warnx("warning: excess arguments ignored");
120:
1.46 ray 121: if ((fd = rcs_choosefile(argv[0], fpath, sizeof(fpath))) < 0)
1.49 niallo 122: err(status, "%s", fpath);
1.24 ray 123:
1.44 xsa 124: if (!(flags & QUIET))
125: (void)fprintf(stderr, "RCS file: %s\n", fpath);
1.8 xsa 126:
1.44 xsa 127: if ((file = rcs_open(fpath, fd, RCS_READ)) == NULL)
128: return (status);
129:
130: if (strcmp(rev_str1, "") == 0) {
131: rev1 = rcsnum_alloc();
132: rcsnum_cpy(file->rf_head, rev1, 0);
133: } else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
134: errx(D_ERROR, "invalid revision: %s", rev_str1);
135:
136: if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) {
137: if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
138: errx(D_ERROR, "invalid revision: %s", rev_str2);
139: } else {
140: rev2 = rcsnum_alloc();
141: rcsnum_cpy(file->rf_head, rev2, 0);
142: }
1.15 xsa 143:
1.44 xsa 144: if (rcsnum_cmp(rev1, rev2, 0) == 0)
145: goto out;
1.2 joris 146:
1.48 xsa 147: if ((bp = rcs_diff3(file, argv[0], rev1, rev2, flags)) == NULL)
1.45 xsa 148: errx(D_ERROR, "failed to merge");
1.2 joris 149:
1.44 xsa 150: if (!(flags & QUIET)) {
151: (void)rcsnum_tostr(rev1, r1, sizeof(r1));
152: (void)rcsnum_tostr(rev2, r2, sizeof(r2));
153:
154: (void)fprintf(stderr, "Merging differences between %s and "
155: "%s into %s%s\n", r1, r2, argv[0],
156: (flags & PIPEOUT) ? "; result to stdout":"");
157: }
1.41 xsa 158:
1.44 xsa 159: if (diff3_conflicts != 0)
160: status = D_OVERLAPS;
161: else
162: status = 0;
163:
1.47 ray 164: if (flags & PIPEOUT)
1.52 ray 165: buf_write_fd(bp, STDOUT_FILENO);
1.47 ray 166: else {
1.44 xsa 167: /* XXX mode */
1.52 ray 168: if (buf_write(bp, argv[0], 0644) < 0)
169: warnx("buf_write failed");
1.2 joris 170:
1.1 xsa 171: }
1.47 ray 172:
1.52 ray 173: buf_free(bp);
1.44 xsa 174:
175: out:
176: rcs_close(file);
1.56 nicm 177: rcsnum_free(rev1);
178: rcsnum_free(rev2);
1.41 xsa 179: return (status);
1.1 xsa 180: }
181:
1.53 otto 182: __dead void
1.1 xsa 183: rcsmerge_usage(void)
184: {
185: fprintf(stderr,
1.43 jmc 186: "usage: rcsmerge [-EV] [-kmode] [-p[rev]] [-q[rev]]\n"
1.32 jmc 187: " [-xsuffixes] [-ztz] -rrev file ...\n");
1.53 otto 188:
189: exit(D_ERROR);
1.1 xsa 190: }
![[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