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