Annotation of src/usr.bin/rcs/rcsprog.c, Revision 1.156
1.156 ! nicm 1: /* $OpenBSD: rcsprog.c,v 1.155 2015/01/16 06:40:11 deraadt 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;
1.154 deraadt 103: *cmd_argv = xreallocarray(*cmd_argv, cur,
1.144 tobias 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;
1.154 deraadt 112: *cmd_argv = xreallocarray(*cmd_argv, cur,
1.144 tobias 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:
1.152 otto 161: __dead void
1.1 deraadt 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.152 otto 168:
169: exit(1);
1.1 deraadt 170: }
171:
172: /*
173: * rcs_main()
174: *
175: * Handler for the `rcs' program.
176: * Returns 0 on success, or >0 on error.
177: */
178: int
179: rcs_main(int argc, char **argv)
180: {
1.129 ray 181: int fd;
1.112 xsa 182: int i, j, ch, flags, kflag, lkmode;
1.130 ray 183: const char *nflag, *oldfilename, *orange;
1.155 deraadt 184: char fpath[PATH_MAX];
1.130 ray 185: char *logstr, *logmsg, *descfile;
186: char *alist, *comment, *elist, *lrev, *urev;
1.1 deraadt 187: mode_t fmode;
1.129 ray 188: RCSFILE *file;
1.24 joris 189: RCSNUM *logrev;
1.39 xsa 190: struct rcs_access *acp;
1.48 xsa 191: time_t rcs_mtime = -1;
1.1 deraadt 192:
1.95 xsa 193: kflag = RCS_KWEXP_ERR;
1.134 xsa 194: lkmode = RCS_LOCK_INVAL;
1.89 niallo 195: fmode = S_IRUSR|S_IRGRP|S_IROTH;
1.58 niallo 196: flags = RCS_RDWR|RCS_PARSE_FULLY;
1.130 ray 197: lrev = urev = descfile = NULL;
198: logstr = alist = comment = elist = NULL;
199: nflag = oldfilename = orange = NULL;
1.111 xsa 200:
201: /* match GNU */
202: if (1 < argc && argv[1][0] != '-')
203: warnx("warning: No options were given; "
204: "this usage is obsolescent.");
1.1 deraadt 205:
1.51 xsa 206: while ((ch = rcs_getopt(argc, argv, RCSPROG_OPTSTRING)) != -1) {
1.1 deraadt 207: switch (ch) {
208: case 'A':
1.129 ray 209: oldfilename = rcs_optarg;
1.56 joris 210: rcsflags |= CO_ACLAPPEND;
1.1 deraadt 211: break;
212: case 'a':
1.28 joris 213: alist = rcs_optarg;
1.1 deraadt 214: break;
215: case 'c':
1.28 joris 216: comment = rcs_optarg;
1.1 deraadt 217: break;
218: case 'e':
1.28 joris 219: elist = rcs_optarg;
1.87 ray 220: rcsflags |= RCSPROG_EFLAG;
1.1 deraadt 221: break;
222: case 'i':
223: flags |= RCS_CREATE;
224: break;
225: case 'k':
1.28 joris 226: kflag = rcs_kflag_get(rcs_optarg);
1.1 deraadt 227: if (RCS_KWEXP_INVAL(kflag)) {
1.114 xsa 228: warnx("invalid RCS keyword substitution mode");
229: (usage)();
1.1 deraadt 230: }
231: break;
232: case 'L':
233: if (lkmode == RCS_LOCK_LOOSE)
1.146 tobias 234: warnx("-U overridden by -L");
1.1 deraadt 235: lkmode = RCS_LOCK_STRICT;
236: break;
1.92 ray 237: case 'l':
1.153 otto 238: if (rcsflags & RCSPROG_UFLAG)
239: warnx("-u overridden by -l");
1.92 ray 240: lrev = rcs_optarg;
1.153 otto 241: rcsflags &= ~RCSPROG_UFLAG;
1.92 ray 242: rcsflags |= RCSPROG_LFLAG;
243: break;
1.24 joris 244: case 'm':
1.156 ! nicm 245: free(logstr);
1.53 joris 246: logstr = xstrdup(rcs_optarg);
1.24 joris 247: break;
1.1 deraadt 248: case 'M':
249: /* ignore for the moment */
250: break;
1.56 joris 251: case 'n':
1.130 ray 252: nflag = rcs_optarg;
1.56 joris 253: break;
254: case 'N':
1.130 ray 255: nflag = rcs_optarg;
1.87 ray 256: rcsflags |= RCSPROG_NFLAG;
1.56 joris 257: break;
1.101 joris 258: case 'o':
1.130 ray 259: orange = rcs_optarg;
1.101 joris 260: break;
1.12 joris 261: case 'q':
1.108 xsa 262: rcsflags |= QUIET;
1.46 xsa 263: break;
1.56 joris 264: case 't':
265: descfile = rcs_optarg;
1.113 ray 266: rcsflags |= DESCRIPTION;
1.56 joris 267: break;
1.46 xsa 268: case 'T':
1.56 joris 269: rcsflags |= PRESERVETIME;
1.12 joris 270: break;
1.1 deraadt 271: case 'U':
272: if (lkmode == RCS_LOCK_STRICT)
1.146 tobias 273: warnx("-L overridden by -U");
1.1 deraadt 274: lkmode = RCS_LOCK_LOOSE;
275: break;
1.92 ray 276: case 'u':
1.153 otto 277: if (rcsflags & RCSPROG_LFLAG)
278: warnx("-l overridden by -u");
1.92 ray 279: urev = rcs_optarg;
1.153 otto 280: rcsflags &= ~RCSPROG_LFLAG;
1.92 ray 281: rcsflags |= RCSPROG_UFLAG;
282: break;
1.1 deraadt 283: case 'V':
284: printf("%s\n", rcs_version);
285: exit(0);
1.45 xsa 286: case 'x':
1.85 ray 287: /* Use blank extension if none given. */
288: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.51 xsa 289: break;
290: case 'z':
291: /*
292: * kept for compatibility
293: */
1.45 xsa 294: break;
1.1 deraadt 295: default:
1.2 deraadt 296: (usage)();
1.1 deraadt 297: }
298: }
299:
1.28 joris 300: argc -= rcs_optind;
301: argv += rcs_optind;
1.30 joris 302:
1.1 deraadt 303: if (argc == 0) {
1.110 xsa 304: warnx("no input file");
1.5 joris 305: (usage)();
1.1 deraadt 306: }
307:
308: for (i = 0; i < argc; i++) {
1.128 ray 309: fd = rcs_choosefile(argv[i], fpath, sizeof(fpath));
310: if (fd < 0 && !(flags & RCS_CREATE)) {
1.133 niallo 311: warn("%s", fpath);
1.8 joris 312: continue;
1.128 ray 313: }
1.6 joris 314:
1.108 xsa 315: if (!(rcsflags & QUIET))
1.125 xsa 316: (void)fprintf(stderr, "RCS file: %s\n", fpath);
1.48 xsa 317:
1.132 ray 318: if ((file = rcs_open(fpath, fd, flags, fmode)) == NULL) {
319: close(fd);
1.6 joris 320: continue;
1.132 ray 321: }
1.1 deraadt 322:
1.132 ray 323: if (rcsflags & DESCRIPTION) {
324: if (rcs_set_description(file, descfile) == -1) {
325: warn("%s", descfile);
326: rcs_close(file);
327: continue;
328: }
329: }
330: else if (flags & RCS_CREATE) {
331: if (rcs_set_description(file, NULL) == -1) {
332: warn("stdin");
333: rcs_close(file);
334: continue;
335: }
336: }
1.56 joris 337:
338: if (rcsflags & PRESERVETIME)
1.118 joris 339: rcs_mtime = rcs_get_mtime(file);
1.48 xsa 340:
1.56 joris 341: if (nflag != NULL)
342: rcs_attach_symbol(file, nflag);
343:
1.24 joris 344: if (logstr != NULL) {
345: if ((logmsg = strchr(logstr, ':')) == NULL) {
1.110 xsa 346: warnx("missing log message");
1.24 joris 347: rcs_close(file);
348: continue;
349: }
350:
351: *logmsg++ = '\0';
352: if ((logrev = rcsnum_parse(logstr)) == NULL) {
1.116 xsa 353: warnx("`%s' bad revision number", logstr);
1.24 joris 354: rcs_close(file);
355: continue;
356: }
357:
358: if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
1.116 xsa 359: warnx("failed to set logmsg for `%s' to `%s'",
1.24 joris 360: logstr, logmsg);
361: rcs_close(file);
1.25 joris 362: rcsnum_free(logrev);
1.24 joris 363: continue;
364: }
365:
366: rcsnum_free(logrev);
1.39 xsa 367: }
368:
369: /* entries to add from <oldfile> */
1.56 joris 370: if (rcsflags & CO_ACLAPPEND) {
1.129 ray 371: RCSFILE *oldfile;
372: int ofd;
1.155 deraadt 373: char ofpath[PATH_MAX];
1.129 ray 374:
375: ofd = rcs_choosefile(oldfilename, ofpath, sizeof(ofpath));
376: if (ofd < 0) {
377: if (!(flags & RCS_CREATE))
1.133 niallo 378: warn("%s", ofpath);
1.129 ray 379: exit(1);
380: }
1.118 joris 381: if ((oldfile = rcs_open(ofpath, ofd, RCS_READ)) == NULL)
1.39 xsa 382: exit(1);
383:
384: TAILQ_FOREACH(acp, &(oldfile->rf_access), ra_list)
385: rcs_access_add(file, acp->ra_name);
386:
387: rcs_close(oldfile);
1.129 ray 388: (void)close(ofd);
1.24 joris 389: }
390:
1.1 deraadt 391: /* entries to add to the access list */
392: if (alist != NULL) {
1.117 joris 393: struct rcs_argvector *aargv;
1.1 deraadt 394:
1.117 joris 395: aargv = rcs_strsplit(alist, ",");
1.86 pat 396: for (j = 0; aargv->argv[j] != NULL; j++)
397: rcs_access_add(file, aargv->argv[j]);
1.1 deraadt 398:
1.117 joris 399: rcs_argv_destroy(aargv);
1.1 deraadt 400: }
401:
402: if (comment != NULL)
403: rcs_comment_set(file, comment);
1.82 xsa 404:
405: if (elist != NULL) {
1.117 joris 406: struct rcs_argvector *eargv;
1.82 xsa 407:
1.117 joris 408: eargv = rcs_strsplit(elist, ",");
1.86 pat 409: for (j = 0; eargv->argv[j] != NULL; j++)
410: rcs_access_remove(file, eargv->argv[j]);
1.82 xsa 411:
1.117 joris 412: rcs_argv_destroy(eargv);
1.87 ray 413: } else if (rcsflags & RCSPROG_EFLAG) {
1.82 xsa 414: struct rcs_access *rap;
415:
416: /* XXX rcs_access_remove(file, NULL); ?? */
417: while (!TAILQ_EMPTY(&(file->rf_access))) {
418: rap = TAILQ_FIRST(&(file->rf_access));
419: TAILQ_REMOVE(&(file->rf_access), rap, ra_list);
1.156 ! nicm 420: free(rap->ra_name);
! 421: free(rap);
1.82 xsa 422: }
423: /* not synced anymore */
424: file->rf_flags &= ~RCS_SYNCED;
425: }
1.1 deraadt 426:
1.95 xsa 427: rcs_kwexp_set(file, kflag);
1.1 deraadt 428:
1.134 xsa 429: if (lkmode != RCS_LOCK_INVAL)
1.84 xsa 430: (void)rcs_lock_setmode(file, lkmode);
1.92 ray 431:
432: if (rcsflags & RCSPROG_LFLAG) {
433: RCSNUM *rev;
434: const char *username;
1.139 xsa 435: char rev_str[RCS_REV_BUFSZ];
1.92 ray 436:
1.141 joris 437: if (file->rf_head == NULL) {
438: warnx("%s contains no revisions", fpath);
439: rcs_close(file);
440: continue;
441: }
442:
1.92 ray 443: if ((username = getlogin()) == NULL)
1.115 xsa 444: err(1, "getlogin");
1.92 ray 445: if (lrev == NULL) {
446: rev = rcsnum_alloc();
447: rcsnum_cpy(file->rf_head, rev, 0);
448: } else if ((rev = rcsnum_parse(lrev)) == NULL) {
1.110 xsa 449: warnx("unable to unlock file");
1.92 ray 450: rcs_close(file);
451: continue;
452: }
1.98 ray 453: rcsnum_tostr(rev, rev_str, sizeof(rev_str));
1.92 ray 454: /* Make sure revision exists. */
455: if (rcs_findrev(file, rev) == NULL)
1.115 xsa 456: errx(1, "%s: cannot lock nonexisting "
457: "revision %s", fpath, rev_str);
1.98 ray 458: if (rcs_lock_add(file, username, rev) != -1 &&
1.108 xsa 459: !(rcsflags & QUIET))
1.127 xsa 460: (void)fprintf(stderr, "%s locked\n", rev_str);
1.92 ray 461: rcsnum_free(rev);
462: }
463:
464: if (rcsflags & RCSPROG_UFLAG) {
465: RCSNUM *rev;
466: const char *username;
1.139 xsa 467: char rev_str[RCS_REV_BUFSZ];
1.141 joris 468:
469: if (file->rf_head == NULL) {
470: warnx("%s contains no revisions", fpath);
471: rcs_close(file);
472: continue;
473: }
1.92 ray 474:
475: if ((username = getlogin()) == NULL)
1.115 xsa 476: err(1, "getlogin");
1.92 ray 477: if (urev == NULL) {
478: rev = rcsnum_alloc();
479: rcsnum_cpy(file->rf_head, rev, 0);
480: } else if ((rev = rcsnum_parse(urev)) == NULL) {
1.110 xsa 481: warnx("unable to unlock file");
1.92 ray 482: rcs_close(file);
483: continue;
484: }
1.98 ray 485: rcsnum_tostr(rev, rev_str, sizeof(rev_str));
1.92 ray 486: /* Make sure revision exists. */
487: if (rcs_findrev(file, rev) == NULL)
1.115 xsa 488: errx(1, "%s: cannot unlock nonexisting "
489: "revision %s", fpath, rev_str);
1.98 ray 490: if (rcs_lock_remove(file, username, rev) == -1 &&
1.108 xsa 491: !(rcsflags & QUIET))
1.110 xsa 492: warnx("%s: warning: No locks are set.", fpath);
1.127 xsa 493: else {
494: if (!(rcsflags & QUIET))
495: (void)fprintf(stderr,
496: "%s unlocked\n", rev_str);
497: }
1.92 ray 498: rcsnum_free(rev);
499: }
1.1 deraadt 500:
1.101 joris 501: if (orange != NULL) {
1.123 joris 502: struct rcs_delta *rdp, *nrdp;
1.139 xsa 503: char b[RCS_REV_BUFSZ];
1.101 joris 504:
505: rcs_rev_select(file, orange);
1.123 joris 506: for (rdp = TAILQ_FIRST(&(file->rf_delta));
507: rdp != NULL; rdp = nrdp) {
508: nrdp = TAILQ_NEXT(rdp, rd_list);
509:
1.101 joris 510: /*
511: * Delete selected revisions.
512: */
513: if (rdp->rd_flags & RCS_RD_SELECT) {
514: rcsnum_tostr(rdp->rd_num, b, sizeof(b));
1.125 xsa 515: if (!(rcsflags & QUIET)) {
516: (void)fprintf(stderr, "deleting"
517: " revision %s\n", b);
518: }
1.101 joris 519: (void)rcs_rev_remove(file, rdp->rd_num);
520: }
521: }
522: }
523:
1.118 joris 524: rcs_write(file);
1.48 xsa 525:
1.56 joris 526: if (rcsflags & PRESERVETIME)
1.118 joris 527: rcs_set_mtime(file, rcs_mtime);
528:
529: rcs_close(file);
1.9 joris 530:
1.108 xsa 531: if (!(rcsflags & QUIET))
1.125 xsa 532: (void)fprintf(stderr, "done\n");
1.1 deraadt 533: }
1.56 joris 534:
1.1 deraadt 535: return (0);
1.56 joris 536: }
537:
538: static void
539: rcs_attach_symbol(RCSFILE *file, const char *symname)
540: {
541: char *rnum;
542: RCSNUM *rev;
1.139 xsa 543: char rbuf[RCS_REV_BUFSZ];
1.56 joris 544: int rm;
545:
546: rm = 0;
547: rev = NULL;
548: if ((rnum = strrchr(symname, ':')) != NULL) {
549: if (rnum[1] == '\0')
550: rev = file->rf_head;
551: *(rnum++) = '\0';
552: } else {
553: rm = 1;
554: }
555:
556: if (rev == NULL && rm != 1) {
557: if ((rev = rcsnum_parse(rnum)) == NULL)
1.115 xsa 558: errx(1, "bad revision %s", rnum);
1.56 joris 559: }
560:
1.87 ray 561: if (rcsflags & RCSPROG_NFLAG)
1.56 joris 562: rm = 1;
563:
564: if (rm == 1) {
565: if (rcs_sym_remove(file, symname) < 0) {
1.102 deraadt 566: if (rcs_errno == RCS_ERR_NOENT &&
1.87 ray 567: !(rcsflags & RCSPROG_NFLAG))
1.115 xsa 568: warnx("cannot delete nonexisting symbol %s",
1.110 xsa 569: symname);
1.56 joris 570: } else {
1.87 ray 571: if (rcsflags & RCSPROG_NFLAG)
1.56 joris 572: rm = 0;
573: }
574: }
575:
576: if (rm == 0) {
1.102 deraadt 577: if (rcs_sym_add(file, symname, rev) < 0 &&
578: rcs_errno == RCS_ERR_DUPENT) {
1.56 joris 579: rcsnum_tostr(rcs_sym_getrev(file, symname),
580: rbuf, sizeof(rbuf));
1.115 xsa 581: errx(1, "symbolic name %s already bound to %s",
1.56 joris 582: symname, rbuf);
583: }
584: }
1.1 deraadt 585: }