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