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