Annotation of src/usr.bin/rcs/rcsprog.c, Revision 1.151
1.151 ! sobrado 1: /* $OpenBSD: rcsprog.c,v 1.150 2010/12/06 22:47:56 chl Exp $ */
1.1 deraadt 2: /*
3: * Copyright (c) 2005 Jean-Francois Brousseau <jfb@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:
1.137 xsa 27: #include <sys/stat.h>
28:
29: #include <err.h>
1.150 chl 30: #include <signal.h>
1.137 xsa 31: #include <stdio.h>
32: #include <stdlib.h>
33: #include <string.h>
34: #include <unistd.h>
1.1 deraadt 35:
1.9 joris 36: #include "rcsprog.h"
1.1 deraadt 37:
1.106 ray 38: #define RCSPROG_OPTSTRING "A:a:b::c:e::ik:Ll::m:Mn:N:o:qt::TUu::Vx::z::"
1.56 joris 39:
1.147 joris 40: const char rcs_version[] = "OpenRCS 4.5";
1.1 deraadt 41:
1.91 ray 42: int rcsflags;
1.36 xsa 43: int rcs_optind;
1.28 joris 44: char *rcs_optarg;
1.149 tobias 45: char *rcs_suffixes = RCS_DEFAULT_SUFFIX;
1.36 xsa 46: char *rcs_tmpdir = RCS_TMPDIR_DEFAULT;
1.28 joris 47:
1.1 deraadt 48: struct rcs_prog {
1.26 deraadt 49: char *prog_name;
50: int (*prog_hdlr)(int, char **);
51: void (*prog_usage)(void);
1.1 deraadt 52: } programs[] = {
1.2 deraadt 53: { "rcs", rcs_main, rcs_usage },
1.17 joris 54: { "ci", checkin_main, checkin_usage },
1.11 joris 55: { "co", checkout_main, checkout_usage },
1.20 joris 56: { "rcsclean", rcsclean_main, rcsclean_usage },
1.18 joris 57: { "rcsdiff", rcsdiff_main, rcsdiff_usage },
1.33 xsa 58: { "rcsmerge", rcsmerge_main, rcsmerge_usage },
1.21 joris 59: { "rlog", rlog_main, rlog_usage },
1.22 joris 60: { "ident", ident_main, ident_usage },
1.126 xsa 61: { "merge", merge_main, merge_usage },
1.1 deraadt 62: };
1.31 joris 63:
1.148 ray 64: struct wklhead temp_files;
1.68 joris 65:
66: void sighdlr(int);
1.101 joris 67: static void rcs_attach_symbol(RCSFILE *, const char *);
1.56 joris 68:
1.78 ray 69: /* ARGSUSED */
1.31 joris 70: void
1.68 joris 71: sighdlr(int sig)
72: {
1.148 ray 73: worklist_clean(&temp_files, worklist_unlink);
1.68 joris 74: _exit(1);
75: }
76:
1.9 joris 77: int
1.144 tobias 78: build_cmd(char ***cmd_argv, char **argv, int argc)
1.29 joris 79: {
1.144 tobias 80: int cmd_argc, i, cur;
81: char *cp, *rcsinit, *linebuf, *lp;
1.29 joris 82:
1.144 tobias 83: if ((rcsinit = getenv("RCSINIT")) == NULL) {
84: *cmd_argv = argv;
85: return argc;
86: }
87:
88: cur = argc + 2;
89: cmd_argc = 0;
90: *cmd_argv = xcalloc(cur, sizeof(char *));
91: (*cmd_argv)[cmd_argc++] = argv[0];
1.29 joris 92:
1.144 tobias 93: linebuf = xstrdup(rcsinit);
1.29 joris 94: for (lp = linebuf; lp != NULL;) {
1.61 xsa 95: cp = strsep(&lp, " \t\b\f\n\r\t\v");
1.29 joris 96: if (cp == NULL)
97: break;
1.144 tobias 98: if (*cp == '\0')
1.29 joris 99: continue;
100:
1.144 tobias 101: if (cmd_argc == cur) {
102: cur += 8;
103: *cmd_argv = xrealloc(*cmd_argv, cur,
104: sizeof(char *));
1.29 joris 105: }
106:
1.144 tobias 107: (*cmd_argv)[cmd_argc++] = cp;
1.29 joris 108: }
109:
1.144 tobias 110: if (cmd_argc + argc > cur) {
111: cur = cmd_argc + argc + 1;
112: *cmd_argv = xrealloc(*cmd_argv, cur,
113: sizeof(char *));
1.29 joris 114: }
115:
1.144 tobias 116: for (i = 1; i < argc; i++)
117: (*cmd_argv)[cmd_argc++] = argv[i];
118:
119: (*cmd_argv)[cmd_argc] = NULL;
120:
121: return cmd_argc;
1.29 joris 122: }
123:
124: int
1.1 deraadt 125: main(int argc, char **argv)
126: {
127: u_int i;
1.144 tobias 128: char **cmd_argv;
1.29 joris 129: int ret, cmd_argc;
1.1 deraadt 130:
131: ret = -1;
1.28 joris 132: rcs_optind = 1;
1.148 ray 133: SLIST_INIT(&temp_files);
1.1 deraadt 134:
1.144 tobias 135: cmd_argc = build_cmd(&cmd_argv, argv, argc);
1.36 xsa 136:
137: if ((rcs_tmpdir = getenv("TMPDIR")) == NULL)
138: rcs_tmpdir = RCS_TMPDIR_DEFAULT;
1.68 joris 139:
140: signal(SIGHUP, sighdlr);
141: signal(SIGINT, sighdlr);
142: signal(SIGQUIT, sighdlr);
143: signal(SIGABRT, sighdlr);
144: signal(SIGALRM, sighdlr);
145: signal(SIGTERM, sighdlr);
1.29 joris 146:
1.1 deraadt 147: for (i = 0; i < (sizeof(programs)/sizeof(programs[0])); i++)
1.2 deraadt 148: if (strcmp(__progname, programs[i].prog_name) == 0) {
149: usage = programs[i].prog_usage;
1.29 joris 150: ret = programs[i].prog_hdlr(cmd_argc, cmd_argv);
1.2 deraadt 151: break;
152: }
1.100 joris 153:
154: /* clean up temporary files */
1.148 ray 155: worklist_run(&temp_files, worklist_unlink);
1.1 deraadt 156:
1.23 niallo 157: exit(ret);
1.1 deraadt 158: }
159:
160:
161: void
162: rcs_usage(void)
163: {
164: fprintf(stderr,
1.135 niallo 165: "usage: rcs [-IiLqTUV] [-Aoldfile] [-ausers] [-b[rev]]\n"
1.92 ray 166: " [-cstring] [-e[users]] [-kmode] [-l[rev]] [-mrev:msg]\n"
1.151 ! sobrado 167: " [-orev] [-t[str]] [-u[rev]] [-xsuffixes] file ...\n");
1.1 deraadt 168: }
169:
170: /*
171: * rcs_main()
172: *
173: * Handler for the `rcs' program.
174: * Returns 0 on success, or >0 on error.
175: */
176: int
177: rcs_main(int argc, char **argv)
178: {
1.129 ray 179: int fd;
1.112 xsa 180: int i, j, ch, flags, kflag, lkmode;
1.130 ray 181: const char *nflag, *oldfilename, *orange;
1.129 ray 182: char fpath[MAXPATHLEN];
1.130 ray 183: char *logstr, *logmsg, *descfile;
184: char *alist, *comment, *elist, *lrev, *urev;
1.1 deraadt 185: mode_t fmode;
1.129 ray 186: RCSFILE *file;
1.24 joris 187: RCSNUM *logrev;
1.39 xsa 188: struct rcs_access *acp;
1.48 xsa 189: time_t rcs_mtime = -1;
1.1 deraadt 190:
1.95 xsa 191: kflag = RCS_KWEXP_ERR;
1.134 xsa 192: lkmode = RCS_LOCK_INVAL;
1.89 niallo 193: fmode = S_IRUSR|S_IRGRP|S_IROTH;
1.58 niallo 194: flags = RCS_RDWR|RCS_PARSE_FULLY;
1.130 ray 195: lrev = urev = descfile = NULL;
196: logstr = alist = comment = elist = NULL;
197: nflag = oldfilename = orange = NULL;
1.111 xsa 198:
199: /* match GNU */
200: if (1 < argc && argv[1][0] != '-')
201: warnx("warning: No options were given; "
202: "this usage is obsolescent.");
1.1 deraadt 203:
1.51 xsa 204: while ((ch = rcs_getopt(argc, argv, RCSPROG_OPTSTRING)) != -1) {
1.1 deraadt 205: switch (ch) {
206: case 'A':
1.129 ray 207: oldfilename = rcs_optarg;
1.56 joris 208: rcsflags |= CO_ACLAPPEND;
1.1 deraadt 209: break;
210: case 'a':
1.28 joris 211: alist = rcs_optarg;
1.1 deraadt 212: break;
213: case 'c':
1.28 joris 214: comment = rcs_optarg;
1.1 deraadt 215: break;
216: case 'e':
1.28 joris 217: elist = rcs_optarg;
1.87 ray 218: rcsflags |= RCSPROG_EFLAG;
1.1 deraadt 219: break;
220: case 'i':
221: flags |= RCS_CREATE;
222: break;
223: case 'k':
1.28 joris 224: kflag = rcs_kflag_get(rcs_optarg);
1.1 deraadt 225: if (RCS_KWEXP_INVAL(kflag)) {
1.114 xsa 226: warnx("invalid RCS keyword substitution mode");
227: (usage)();
1.1 deraadt 228: exit(1);
229: }
230: break;
231: case 'L':
232: if (lkmode == RCS_LOCK_LOOSE)
1.146 tobias 233: warnx("-U overridden by -L");
1.1 deraadt 234: lkmode = RCS_LOCK_STRICT;
235: break;
1.92 ray 236: case 'l':
237: /* XXX - Check with -u flag. */
238: lrev = rcs_optarg;
239: rcsflags |= RCSPROG_LFLAG;
240: break;
1.24 joris 241: case 'm':
1.131 ray 242: if (logstr != NULL)
243: xfree(logstr);
1.53 joris 244: logstr = xstrdup(rcs_optarg);
1.24 joris 245: break;
1.1 deraadt 246: case 'M':
247: /* ignore for the moment */
248: break;
1.56 joris 249: case 'n':
1.130 ray 250: nflag = rcs_optarg;
1.56 joris 251: break;
252: case 'N':
1.130 ray 253: nflag = rcs_optarg;
1.87 ray 254: rcsflags |= RCSPROG_NFLAG;
1.56 joris 255: break;
1.101 joris 256: case 'o':
1.130 ray 257: orange = rcs_optarg;
1.101 joris 258: break;
1.12 joris 259: case 'q':
1.108 xsa 260: rcsflags |= QUIET;
1.46 xsa 261: break;
1.56 joris 262: case 't':
263: descfile = rcs_optarg;
1.113 ray 264: rcsflags |= DESCRIPTION;
1.56 joris 265: break;
1.46 xsa 266: case 'T':
1.56 joris 267: rcsflags |= PRESERVETIME;
1.12 joris 268: break;
1.1 deraadt 269: case 'U':
270: if (lkmode == RCS_LOCK_STRICT)
1.146 tobias 271: warnx("-L overridden by -U");
1.1 deraadt 272: lkmode = RCS_LOCK_LOOSE;
273: break;
1.92 ray 274: case 'u':
275: /* XXX - Check with -l flag. */
276: urev = rcs_optarg;
277: rcsflags |= RCSPROG_UFLAG;
278: break;
1.1 deraadt 279: case 'V':
280: printf("%s\n", rcs_version);
281: exit(0);
1.45 xsa 282: case 'x':
1.85 ray 283: /* Use blank extension if none given. */
284: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.51 xsa 285: break;
286: case 'z':
287: /*
288: * kept for compatibility
289: */
1.45 xsa 290: break;
1.1 deraadt 291: default:
1.2 deraadt 292: (usage)();
1.1 deraadt 293: exit(1);
294: }
295: }
296:
1.28 joris 297: argc -= rcs_optind;
298: argv += rcs_optind;
1.30 joris 299:
1.1 deraadt 300: if (argc == 0) {
1.110 xsa 301: warnx("no input file");
1.5 joris 302: (usage)();
1.1 deraadt 303: exit(1);
304: }
305:
306: for (i = 0; i < argc; i++) {
1.128 ray 307: fd = rcs_choosefile(argv[i], fpath, sizeof(fpath));
308: if (fd < 0 && !(flags & RCS_CREATE)) {
1.133 niallo 309: warn("%s", fpath);
1.8 joris 310: continue;
1.128 ray 311: }
1.6 joris 312:
1.108 xsa 313: if (!(rcsflags & QUIET))
1.125 xsa 314: (void)fprintf(stderr, "RCS file: %s\n", fpath);
1.48 xsa 315:
1.132 ray 316: if ((file = rcs_open(fpath, fd, flags, fmode)) == NULL) {
317: close(fd);
1.6 joris 318: continue;
1.132 ray 319: }
1.1 deraadt 320:
1.132 ray 321: if (rcsflags & DESCRIPTION) {
322: if (rcs_set_description(file, descfile) == -1) {
323: warn("%s", descfile);
324: rcs_close(file);
325: continue;
326: }
327: }
328: else if (flags & RCS_CREATE) {
329: if (rcs_set_description(file, NULL) == -1) {
330: warn("stdin");
331: rcs_close(file);
332: continue;
333: }
334: }
1.56 joris 335:
336: if (rcsflags & PRESERVETIME)
1.118 joris 337: rcs_mtime = rcs_get_mtime(file);
1.48 xsa 338:
1.56 joris 339: if (nflag != NULL)
340: rcs_attach_symbol(file, nflag);
341:
1.24 joris 342: if (logstr != NULL) {
343: if ((logmsg = strchr(logstr, ':')) == NULL) {
1.110 xsa 344: warnx("missing log message");
1.24 joris 345: rcs_close(file);
346: continue;
347: }
348:
349: *logmsg++ = '\0';
350: if ((logrev = rcsnum_parse(logstr)) == NULL) {
1.116 xsa 351: warnx("`%s' bad revision number", logstr);
1.24 joris 352: rcs_close(file);
353: continue;
354: }
355:
356: if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
1.116 xsa 357: warnx("failed to set logmsg for `%s' to `%s'",
1.24 joris 358: logstr, logmsg);
359: rcs_close(file);
1.25 joris 360: rcsnum_free(logrev);
1.24 joris 361: continue;
362: }
363:
364: rcsnum_free(logrev);
1.39 xsa 365: }
366:
367: /* entries to add from <oldfile> */
1.56 joris 368: if (rcsflags & CO_ACLAPPEND) {
1.129 ray 369: RCSFILE *oldfile;
370: int ofd;
371: char ofpath[MAXPATHLEN];
372:
373: ofd = rcs_choosefile(oldfilename, ofpath, sizeof(ofpath));
374: if (ofd < 0) {
375: if (!(flags & RCS_CREATE))
1.133 niallo 376: warn("%s", ofpath);
1.129 ray 377: exit(1);
378: }
1.118 joris 379: if ((oldfile = rcs_open(ofpath, ofd, RCS_READ)) == NULL)
1.39 xsa 380: exit(1);
381:
382: TAILQ_FOREACH(acp, &(oldfile->rf_access), ra_list)
383: rcs_access_add(file, acp->ra_name);
384:
385: rcs_close(oldfile);
1.129 ray 386: (void)close(ofd);
1.24 joris 387: }
388:
1.1 deraadt 389: /* entries to add to the access list */
390: if (alist != NULL) {
1.117 joris 391: struct rcs_argvector *aargv;
1.1 deraadt 392:
1.117 joris 393: aargv = rcs_strsplit(alist, ",");
1.86 pat 394: for (j = 0; aargv->argv[j] != NULL; j++)
395: rcs_access_add(file, aargv->argv[j]);
1.1 deraadt 396:
1.117 joris 397: rcs_argv_destroy(aargv);
1.1 deraadt 398: }
399:
400: if (comment != NULL)
401: rcs_comment_set(file, comment);
1.82 xsa 402:
403: if (elist != NULL) {
1.117 joris 404: struct rcs_argvector *eargv;
1.82 xsa 405:
1.117 joris 406: eargv = rcs_strsplit(elist, ",");
1.86 pat 407: for (j = 0; eargv->argv[j] != NULL; j++)
408: rcs_access_remove(file, eargv->argv[j]);
1.82 xsa 409:
1.117 joris 410: rcs_argv_destroy(eargv);
1.87 ray 411: } else if (rcsflags & RCSPROG_EFLAG) {
1.82 xsa 412: struct rcs_access *rap;
413:
414: /* XXX rcs_access_remove(file, NULL); ?? */
415: while (!TAILQ_EMPTY(&(file->rf_access))) {
416: rap = TAILQ_FIRST(&(file->rf_access));
417: TAILQ_REMOVE(&(file->rf_access), rap, ra_list);
418: xfree(rap->ra_name);
419: xfree(rap);
420: }
421: /* not synced anymore */
422: file->rf_flags &= ~RCS_SYNCED;
423: }
1.1 deraadt 424:
1.95 xsa 425: rcs_kwexp_set(file, kflag);
1.1 deraadt 426:
1.134 xsa 427: if (lkmode != RCS_LOCK_INVAL)
1.84 xsa 428: (void)rcs_lock_setmode(file, lkmode);
1.92 ray 429:
430: if (rcsflags & RCSPROG_LFLAG) {
431: RCSNUM *rev;
432: const char *username;
1.139 xsa 433: char rev_str[RCS_REV_BUFSZ];
1.92 ray 434:
1.141 joris 435: if (file->rf_head == NULL) {
436: warnx("%s contains no revisions", fpath);
437: rcs_close(file);
438: continue;
439: }
440:
1.92 ray 441: if ((username = getlogin()) == NULL)
1.115 xsa 442: err(1, "getlogin");
1.92 ray 443: if (lrev == NULL) {
444: rev = rcsnum_alloc();
445: rcsnum_cpy(file->rf_head, rev, 0);
446: } else if ((rev = rcsnum_parse(lrev)) == NULL) {
1.110 xsa 447: warnx("unable to unlock file");
1.92 ray 448: rcs_close(file);
449: continue;
450: }
1.98 ray 451: rcsnum_tostr(rev, rev_str, sizeof(rev_str));
1.92 ray 452: /* Make sure revision exists. */
453: if (rcs_findrev(file, rev) == NULL)
1.115 xsa 454: errx(1, "%s: cannot lock nonexisting "
455: "revision %s", fpath, rev_str);
1.98 ray 456: if (rcs_lock_add(file, username, rev) != -1 &&
1.108 xsa 457: !(rcsflags & QUIET))
1.127 xsa 458: (void)fprintf(stderr, "%s locked\n", rev_str);
1.92 ray 459: rcsnum_free(rev);
460: }
461:
462: if (rcsflags & RCSPROG_UFLAG) {
463: RCSNUM *rev;
464: const char *username;
1.139 xsa 465: char rev_str[RCS_REV_BUFSZ];
1.141 joris 466:
467: if (file->rf_head == NULL) {
468: warnx("%s contains no revisions", fpath);
469: rcs_close(file);
470: continue;
471: }
1.92 ray 472:
473: if ((username = getlogin()) == NULL)
1.115 xsa 474: err(1, "getlogin");
1.92 ray 475: if (urev == NULL) {
476: rev = rcsnum_alloc();
477: rcsnum_cpy(file->rf_head, rev, 0);
478: } else if ((rev = rcsnum_parse(urev)) == NULL) {
1.110 xsa 479: warnx("unable to unlock file");
1.92 ray 480: rcs_close(file);
481: continue;
482: }
1.98 ray 483: rcsnum_tostr(rev, rev_str, sizeof(rev_str));
1.92 ray 484: /* Make sure revision exists. */
485: if (rcs_findrev(file, rev) == NULL)
1.115 xsa 486: errx(1, "%s: cannot unlock nonexisting "
487: "revision %s", fpath, rev_str);
1.98 ray 488: if (rcs_lock_remove(file, username, rev) == -1 &&
1.108 xsa 489: !(rcsflags & QUIET))
1.110 xsa 490: warnx("%s: warning: No locks are set.", fpath);
1.127 xsa 491: else {
492: if (!(rcsflags & QUIET))
493: (void)fprintf(stderr,
494: "%s unlocked\n", rev_str);
495: }
1.92 ray 496: rcsnum_free(rev);
497: }
1.1 deraadt 498:
1.101 joris 499: if (orange != NULL) {
1.123 joris 500: struct rcs_delta *rdp, *nrdp;
1.139 xsa 501: char b[RCS_REV_BUFSZ];
1.101 joris 502:
503: rcs_rev_select(file, orange);
1.123 joris 504: for (rdp = TAILQ_FIRST(&(file->rf_delta));
505: rdp != NULL; rdp = nrdp) {
506: nrdp = TAILQ_NEXT(rdp, rd_list);
507:
1.101 joris 508: /*
509: * Delete selected revisions.
510: */
511: if (rdp->rd_flags & RCS_RD_SELECT) {
512: rcsnum_tostr(rdp->rd_num, b, sizeof(b));
1.125 xsa 513: if (!(rcsflags & QUIET)) {
514: (void)fprintf(stderr, "deleting"
515: " revision %s\n", b);
516: }
1.101 joris 517: (void)rcs_rev_remove(file, rdp->rd_num);
518: }
519: }
520: }
521:
1.118 joris 522: rcs_write(file);
1.48 xsa 523:
1.56 joris 524: if (rcsflags & PRESERVETIME)
1.118 joris 525: rcs_set_mtime(file, rcs_mtime);
526:
527: rcs_close(file);
1.9 joris 528:
1.108 xsa 529: if (!(rcsflags & QUIET))
1.125 xsa 530: (void)fprintf(stderr, "done\n");
1.1 deraadt 531: }
1.56 joris 532:
1.1 deraadt 533: return (0);
1.56 joris 534: }
535:
536: static void
537: rcs_attach_symbol(RCSFILE *file, const char *symname)
538: {
539: char *rnum;
540: RCSNUM *rev;
1.139 xsa 541: char rbuf[RCS_REV_BUFSZ];
1.56 joris 542: int rm;
543:
544: rm = 0;
545: rev = NULL;
546: if ((rnum = strrchr(symname, ':')) != NULL) {
547: if (rnum[1] == '\0')
548: rev = file->rf_head;
549: *(rnum++) = '\0';
550: } else {
551: rm = 1;
552: }
553:
554: if (rev == NULL && rm != 1) {
555: if ((rev = rcsnum_parse(rnum)) == NULL)
1.115 xsa 556: errx(1, "bad revision %s", rnum);
1.56 joris 557: }
558:
1.87 ray 559: if (rcsflags & RCSPROG_NFLAG)
1.56 joris 560: rm = 1;
561:
562: if (rm == 1) {
563: if (rcs_sym_remove(file, symname) < 0) {
1.102 deraadt 564: if (rcs_errno == RCS_ERR_NOENT &&
1.87 ray 565: !(rcsflags & RCSPROG_NFLAG))
1.115 xsa 566: warnx("cannot delete nonexisting symbol %s",
1.110 xsa 567: symname);
1.56 joris 568: } else {
1.87 ray 569: if (rcsflags & RCSPROG_NFLAG)
1.56 joris 570: rm = 0;
571: }
572: }
573:
574: if (rm == 0) {
1.102 deraadt 575: if (rcs_sym_add(file, symname, rev) < 0 &&
576: rcs_errno == RCS_ERR_DUPENT) {
1.56 joris 577: rcsnum_tostr(rcs_sym_getrev(file, symname),
578: rbuf, sizeof(rbuf));
1.115 xsa 579: errx(1, "symbolic name %s already bound to %s",
1.56 joris 580: symname, rbuf);
581: }
582: }
1.1 deraadt 583: }