![[BACK]](/icons/back.gif){kind=icon}
Return to rcsprog.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs|
Return to rcsprog.c CVS log | Up to [local] / src / usr.bin / rcs |
1.74 ! ray 1: /* $OpenBSD: rcsprog.c,v 1.73 2006/03/15 02:46:14 ray 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.59 xsa 27: #include "includes.h"
1.1 deraadt 28:
1.9 joris 29: #include "rcsprog.h"
1.1 deraadt 30:
1.29 joris 31: #define RCS_CMD_MAXARG 128
1.56 joris 32: #define RCSPROG_OPTSTRING "A:a:b::c:e::hik:Lm:Mn:N:qt::TUVx:z:"
33:
34: #define DESC_PROMPT "enter description, terminated with single '.' " \
35: "or end of file:\nNOTE: This is NOT the log message!" \
36: "\n>> "
1.29 joris 37:
1.1 deraadt 38: const char rcs_version[] = "OpenCVS RCS version 3.6";
1.12 joris 39: int verbose = 1;
1.34 joris 40: int pipeout = 0;
1.1 deraadt 41:
1.56 joris 42: #define RCS_NFLAG 1
43: #define RCS_TFLAG 2
44: static int rcsflags = 0;
45:
1.36 xsa 46: int rcs_optind;
1.28 joris 47: char *rcs_optarg;
1.42 xsa 48: char *rcs_suffixes;
1.36 xsa 49: char *rcs_tmpdir = RCS_TMPDIR_DEFAULT;
1.28 joris 50:
1.1 deraadt 51: struct rcs_prog {
1.26 deraadt 52: char *prog_name;
53: int (*prog_hdlr)(int, char **);
54: void (*prog_usage)(void);
1.1 deraadt 55: } programs[] = {
1.2 deraadt 56: { "rcs", rcs_main, rcs_usage },
1.17 joris 57: { "ci", checkin_main, checkin_usage },
1.11 joris 58: { "co", checkout_main, checkout_usage },
1.20 joris 59: { "rcsclean", rcsclean_main, rcsclean_usage },
1.18 joris 60: { "rcsdiff", rcsdiff_main, rcsdiff_usage },
1.33 xsa 61: { "rcsmerge", rcsmerge_main, rcsmerge_usage },
1.21 joris 62: { "rlog", rlog_main, rlog_usage },
1.22 joris 63: { "ident", ident_main, ident_usage },
1.1 deraadt 64: };
1.31 joris 65:
1.68 joris 66: struct cvs_wklhead rcs_temp_files;
67:
68: void sighdlr(int);
1.56 joris 69: static void rcs_set_description(RCSFILE *, const char *);
70: static void rcs_attach_symbol(RCSFILE *, const char *);
71:
1.31 joris 72: void
1.68 joris 73: sighdlr(int sig)
74: {
75: cvs_worklist_clean(&rcs_temp_files, cvs_worklist_unlink);
76: _exit(1);
77: }
78:
79: void
1.31 joris 80: rcs_set_rev(const char *str, RCSNUM **rev)
81: {
1.32 joris 82: if (str == NULL)
83: return;
84:
1.52 joris 85: if ((*rev != NULL) && (*rev != RCS_HEAD_REV))
1.31 joris 86: cvs_log(LP_WARN, "redefinition of revision number");
87:
1.55 xsa 88: if ((*rev = rcsnum_parse(str)) == NULL)
89: fatal("bad revision number '%s'", str);
1.47 xsa 90: }
91:
92: /*
93: * rcs_get_mtime()
94: *
95: * Get <filename> last modified time.
96: * Returns last modified time on success, or -1 on failure.
97: */
98: time_t
99: rcs_get_mtime(const char *filename)
100: {
101: struct stat st;
102: time_t mtime;
103:
104: if (stat(filename, &st) == -1) {
105: cvs_log(LP_ERRNO, "failed to stat `%s'", filename);
106: return (-1);
107: }
108: mtime = (time_t)st.st_mtimespec.tv_sec;
109:
110: return (mtime);
111: }
112:
113: /*
114: * rcs_set_mtime()
115: *
116: * Set <filename> last modified time to <mtime> if it's not set to -1.
117: * Returns 0 on success, or -1 on failure.
118: */
119: int
120: rcs_set_mtime(const char *filename, time_t mtime)
121: {
122: static struct timeval tv[2];
123:
124: if (mtime == -1)
125: return (0);
126:
127: tv[0].tv_sec = mtime;
128: tv[1].tv_sec = tv[0].tv_sec;
129:
130: if (utimes(filename, tv) == -1) {
131: cvs_log(LP_ERRNO, "error setting utimes");
132: return (-1);
133: }
134:
135: return (0);
1.31 joris 136: }
1.1 deraadt 137:
1.9 joris 138: int
1.29 joris 139: rcs_init(char *envstr, char **argv, int argvlen)
140: {
141: u_int i;
142: int argc, error;
143: char linebuf[256], *lp, *cp;
144:
145: strlcpy(linebuf, envstr, sizeof(linebuf));
146: memset(argv, 0, argvlen * sizeof(char *));
147:
148: error = argc = 0;
149: for (lp = linebuf; lp != NULL;) {
1.61 xsa 150: cp = strsep(&lp, " \t\b\f\n\r\t\v");
1.29 joris 151: if (cp == NULL)
152: break;
153: else if (*cp == '\0')
154: continue;
155:
156: if (argc == argvlen) {
157: error++;
158: break;
159: }
160:
1.53 joris 161: argv[argc] = xstrdup(cp);
1.29 joris 162: argc++;
163: }
164:
165: if (error != 0) {
166: for (i = 0; i < (u_int)argc; i++)
1.53 joris 167: xfree(argv[i]);
1.29 joris 168: argc = -1;
169: }
170:
171: return (argc);
172: }
173:
174: int
1.28 joris 175: rcs_getopt(int argc, char **argv, const char *optstr)
176: {
177: char *a;
178: const char *c;
179: static int i = 1;
180: int opt, hasargument, ret;
181:
182: hasargument = 0;
183: rcs_optarg = NULL;
184:
185: if (i >= argc)
186: return (-1);
187:
188: a = argv[i++];
189: if (*a++ != '-')
190: return (-1);
191:
192: ret = 0;
193: opt = *a;
194: for (c = optstr; *c != '\0'; c++) {
195: if (*c == opt) {
196: a++;
197: ret = opt;
198:
199: if (*(c + 1) == ':') {
200: if (*(c + 2) == ':') {
201: if (*a != '\0')
202: hasargument = 1;
203: } else {
204: if (*a != '\0') {
205: hasargument = 1;
206: } else {
207: ret = 1;
208: break;
209: }
210: }
211: }
212:
213: if (hasargument == 1)
214: rcs_optarg = a;
215:
216: if (ret == opt)
217: rcs_optind++;
218: break;
219: }
220: }
221:
222: if (ret == 0)
223: cvs_log(LP_ERR, "unknown option -%c", opt);
224: else if (ret == 1)
225: cvs_log(LP_ERR, "missing argument for option -%c", opt);
1.74 ! ray 226:
! 227: return (ret);
! 228: }
! 229:
! 230: /*
! 231: * rcs_choosefile()
! 232: *
! 233: * Given a relative filename, decide where the corresponding RCS file
! 234: * should be. Tries each extension until a file is found. If no file
! 235: * was found, returns a path with the first extension.
! 236: *
! 237: * Returns pointer to a char array on success, NULL on failure.
! 238: */
! 239: char *
! 240: rcs_choosefile(const char *filename)
! 241: {
! 242: struct stat sb;
! 243: char *ext, name[MAXPATHLEN], *next, *ptr, rcsdir[MAXPATHLEN],
! 244: *ret, *suffixes, rcspath[MAXPATHLEN];
! 245:
! 246: /* If -x flag was not given, use default. */
! 247: if (rcs_suffixes == NULL)
! 248: rcs_suffixes = RCS_DEFAULT_SUFFIX;
! 249:
! 250: /*
! 251: * If `filename' contains a directory, `rcspath' contains that
! 252: * directory, including a trailing slash. Otherwise `rcspath'
! 253: * contains an empty string.
! 254: */
! 255: if (strlcpy(rcspath, filename, sizeof(rcspath)) >= sizeof(rcspath))
! 256: return (NULL);
! 257: /* If `/' is found, end string after `/'. */
! 258: if ((ptr = strrchr(rcspath, '/')) != NULL)
! 259: *(++ptr) = '\0';
! 260: else
! 261: rcspath[0] = '\0';
! 262:
! 263: /* Append RCS/ to `rcspath' if it exists. */
! 264: if (strlcpy(rcsdir, rcspath, sizeof(rcsdir)) >= sizeof(rcsdir) ||
! 265: strlcat(rcsdir, RCSDIR, sizeof(rcsdir)) >= sizeof(rcsdir))
! 266: return (NULL);
! 267: if ((stat(rcsdir, &sb) == 0) && (sb.st_mode & S_IFDIR))
! 268: if (strlcpy(rcspath, rcsdir, sizeof(rcspath)) >= sizeof(rcspath) ||
! 269: strlcat(rcspath, "/", sizeof(rcspath)) >= sizeof(rcspath))
! 270: return (NULL);
! 271:
! 272: /* Name of file without path. */
! 273: if ((ptr = strrchr(filename, '/')) == NULL) {
! 274: if (strlcpy(name, filename, sizeof(name)) >= sizeof(name))
! 275: return (NULL);
! 276: } else {
! 277: /* Skip `/'. */
! 278: if (strlcpy(name, ptr + 1, sizeof(name)) >= sizeof(name))
! 279: return (NULL);
! 280: }
! 281:
! 282: /* Name of RCS file without an extension. */
! 283: if (strlcat(rcspath, name, sizeof(rcspath)) >= sizeof(rcspath))
! 284: return (NULL);
! 285:
! 286: /*
! 287: * If only the empty suffix was given, use existing rcspath.
! 288: * This ensures that there is at least one suffix for strsep().
! 289: */
! 290: if (strcmp(rcs_suffixes, "") == 0) {
! 291: if ((ret = strdup(rcspath)) == NULL);
! 292: fatal("out of memory");
! 293: return (ret);
! 294: }
! 295:
! 296: /*
! 297: * Cycle through slash-separated `rcs_suffixes', appending each
! 298: * extension to `rcspath' and testing if the file exists. If it
! 299: * does, return that string. Otherwise return path with first
! 300: * extension.
! 301: */
! 302: if ((suffixes = strdup(rcs_suffixes)) == NULL)
! 303: fatal("out of memory");
! 304: for (ret = NULL, next = suffixes; (ext = strsep(&next, "/")) != NULL;) {
! 305: char fpath[MAXPATHLEN];
! 306:
! 307: /* Construct RCS file path. */
! 308: if (strlcpy(fpath, rcspath, sizeof(fpath)) >= sizeof(fpath) ||
! 309: strlcat(fpath, ext, sizeof(fpath)) >= sizeof(fpath)) {
! 310: xfree(suffixes);
! 311: return (NULL);
! 312: }
! 313:
! 314: /* Don't use `filename' as RCS file. */
! 315: if (strcmp(fpath, filename) == 0)
! 316: continue;
! 317:
! 318: if (stat(fpath, &sb) == 0) {
! 319: if ((ret = strdup(fpath)) == NULL)
! 320: fatal("out of memory");
! 321: break;
! 322: }
! 323: }
! 324: xfree(suffixes);
! 325:
! 326: /*
! 327: * If `ret' is still NULL no RCS file with any extension exists
! 328: * so we use the first extension.
! 329: */
! 330: if (ret == NULL) {
! 331: /*
! 332: * XXX - We shouldn't need to do strsep again,
! 333: * suffixes should now be NUL separated.
! 334: */
! 335: if ((suffixes = strdup(rcs_suffixes)) == NULL)
! 336: fatal("out of memory");
! 337: next = suffixes;
! 338: /* Get first extension again. */
! 339: if ((ext = strsep(&next, "/")) == NULL) {
! 340: xfree(suffixes);
! 341: return (NULL);
! 342: }
! 343: if (strlcat(rcspath, ext, sizeof(rcspath)) >= sizeof(rcspath)) {
! 344: xfree(suffixes);
! 345: return (NULL);
! 346: }
! 347: if ((ret = strdup(rcspath)) == NULL)
! 348: fatal("out of memory");
! 349: xfree(suffixes);
! 350: }
1.28 joris 351:
352: return (ret);
353: }
354:
355: int
1.9 joris 356: rcs_statfile(char *fname, char *out, size_t len)
357: {
1.73 ray 358: int found;
1.42 xsa 359: char defaultsuffix[] = RCS_DEFAULT_SUFFIX;
1.9 joris 360: char filev[MAXPATHLEN], fpath[MAXPATHLEN];
1.42 xsa 361: char *ext, *slash;
1.9 joris 362: struct stat st;
363:
1.73 ray 364: found = 0;
1.42 xsa 365:
366: if (rcs_suffixes != NULL)
367: ext = rcs_suffixes;
368: else
369: ext = defaultsuffix;
1.43 xsa 370:
1.42 xsa 371: for (;;) {
372: /*
373: * GNU documentation says -x,v/ specifies two suffixes,
374: * namely the ,v one and an empty one (which matches
375: * everything).
376: * The problem is that they don't follow this rule at
377: * all, and their documentation seems flawed.
378: * We try to be compatible, so let's do so.
379: */
380: if (*ext == '\0')
381: break;
382:
383: if ((slash = strchr(ext, '/')) != NULL)
384: *slash = '\0';
1.9 joris 385:
1.62 xsa 386: if (strlcpy(filev, fname, sizeof(filev)) >= sizeof(filev) ||
387: strlcat(filev, ext, sizeof(filev)) >= sizeof(filev))
1.55 xsa 388: fatal("rcs_statfile: path truncation");
1.42 xsa 389:
1.73 ray 390: if (stat(RCSDIR, &st) != -1 && (st.st_mode & S_IFDIR)) {
1.62 xsa 391: if (strlcpy(fpath, RCSDIR,
392: sizeof(fpath)) >= sizeof(fpath) ||
393: strlcat(fpath, "/",
394: sizeof(fpath)) >= sizeof(fpath) ||
395: strlcat(fpath, filev,
396: sizeof(fpath)) >= sizeof(fpath))
1.55 xsa 397: fatal("rcs_statfile: path truncation");
1.42 xsa 398: } else {
1.62 xsa 399: if (strlcpy(fpath, filev,
400: sizeof(fpath)) >= sizeof(fpath))
1.57 xsa 401: fatal("rcs_statfile: path truncation");
1.42 xsa 402: }
403:
1.56 joris 404: if ((stat(fpath, &st) != -1) || (rcsflags & RCS_CREATE)) {
1.42 xsa 405: found++;
406: break;
407: }
408:
409: if (slash == NULL)
410: break;
411:
412: *slash++ = '/';
413: ext = slash;
1.9 joris 414: }
415:
1.42 xsa 416: if (found != 1) {
1.44 niallo 417: if ((strcmp(__progname, "rcsclean") != 0)
418: && (strcmp(__progname, "ci") != 0))
1.20 joris 419: cvs_log(LP_ERRNO, "%s", fpath);
1.9 joris 420: return (-1);
421: }
422:
1.62 xsa 423: if (strlcpy(out, fpath, len) >= len)
1.57 xsa 424: fatal("rcs_statfile: path truncation");
1.9 joris 425:
426: return (0);
427: }
1.1 deraadt 428:
429: int
430: main(int argc, char **argv)
431: {
432: u_int i;
1.29 joris 433: char *rcsinit, *cmd_argv[RCS_CMD_MAXARG];
434: int ret, cmd_argc;
1.1 deraadt 435:
436: ret = -1;
1.28 joris 437: rcs_optind = 1;
1.9 joris 438: cvs_log_init(LD_STD, 0);
1.68 joris 439: SLIST_INIT(&rcs_temp_files);
1.1 deraadt 440:
1.29 joris 441: cmd_argc = 0;
1.30 joris 442: cmd_argv[cmd_argc++] = argv[0];
1.29 joris 443: if ((rcsinit = getenv("RCSINIT")) != NULL) {
444: ret = rcs_init(rcsinit, cmd_argv + 1,
445: RCS_CMD_MAXARG - 1);
446: if (ret < 0) {
447: cvs_log(LP_ERRNO, "failed to prepend RCSINIT options");
448: exit (1);
449: }
450:
451: cmd_argc += ret;
452: }
1.36 xsa 453:
454: if ((rcs_tmpdir = getenv("TMPDIR")) == NULL)
455: rcs_tmpdir = RCS_TMPDIR_DEFAULT;
1.29 joris 456:
457: for (ret = 1; ret < argc; ret++)
458: cmd_argv[cmd_argc++] = argv[ret];
1.68 joris 459:
460: signal(SIGHUP, sighdlr);
461: signal(SIGINT, sighdlr);
462: signal(SIGQUIT, sighdlr);
463: signal(SIGABRT, sighdlr);
464: signal(SIGALRM, sighdlr);
465: signal(SIGTERM, sighdlr);
1.29 joris 466:
1.1 deraadt 467: for (i = 0; i < (sizeof(programs)/sizeof(programs[0])); i++)
1.2 deraadt 468: if (strcmp(__progname, programs[i].prog_name) == 0) {
469: usage = programs[i].prog_usage;
1.29 joris 470: ret = programs[i].prog_hdlr(cmd_argc, cmd_argv);
1.2 deraadt 471: break;
472: }
1.1 deraadt 473:
1.23 niallo 474: exit(ret);
1.1 deraadt 475: }
476:
477:
478: void
479: rcs_usage(void)
480: {
481: fprintf(stderr,
1.66 jmc 482: "usage: rcs [-ehIiLMqTUV] [-Aoldfile] [-ausers] [-b[rev]]\n"
1.67 xsa 483: " [-cstring] [-e[users]] [-kmode] [-mrev:msg]\n"
1.66 jmc 484: " [-orev] [-sstate[:rev]] [-tfile|str]\n"
1.67 xsa 485: " [-xsuffixes] file ...\n");
1.1 deraadt 486: }
487:
488: /*
489: * rcs_main()
490: *
491: * Handler for the `rcs' program.
492: * Returns 0 on success, or >0 on error.
493: */
494: int
495: rcs_main(int argc, char **argv)
496: {
497: int i, ch, flags, kflag, lkmode;
1.39 xsa 498: char fpath[MAXPATHLEN], ofpath[MAXPATHLEN];
1.56 joris 499: char *logstr, *logmsg, *nflag, *descfile;
1.39 xsa 500: char *alist, *comment, *elist, *unp, *sp;
1.1 deraadt 501: mode_t fmode;
1.39 xsa 502: RCSFILE *file, *oldfile;
1.24 joris 503: RCSNUM *logrev;
1.39 xsa 504: struct rcs_access *acp;
1.48 xsa 505: time_t rcs_mtime = -1;
1.1 deraadt 506:
507: kflag = lkmode = -1;
508: fmode = 0;
1.58 niallo 509: flags = RCS_RDWR|RCS_PARSE_FULLY;
1.56 joris 510: descfile = nflag = NULL;
1.39 xsa 511: logstr = alist = comment = elist = NULL;
1.1 deraadt 512:
1.51 xsa 513: while ((ch = rcs_getopt(argc, argv, RCSPROG_OPTSTRING)) != -1) {
1.1 deraadt 514: switch (ch) {
515: case 'A':
1.39 xsa 516: if (rcs_statfile(rcs_optarg, ofpath, sizeof(ofpath)) < 0)
517: exit(1);
1.56 joris 518: rcsflags |= CO_ACLAPPEND;
1.1 deraadt 519: break;
520: case 'a':
1.28 joris 521: alist = rcs_optarg;
1.1 deraadt 522: break;
523: case 'c':
1.28 joris 524: comment = rcs_optarg;
1.1 deraadt 525: break;
526: case 'e':
1.28 joris 527: elist = rcs_optarg;
1.1 deraadt 528: break;
529: case 'h':
1.2 deraadt 530: (usage)();
1.1 deraadt 531: exit(0);
532: case 'i':
533: flags |= RCS_CREATE;
1.56 joris 534: rcsflags |= RCS_CREATE;
1.1 deraadt 535: break;
536: case 'k':
1.28 joris 537: kflag = rcs_kflag_get(rcs_optarg);
1.1 deraadt 538: if (RCS_KWEXP_INVAL(kflag)) {
539: cvs_log(LP_ERR,
540: "invalid keyword substitution mode `%s'",
1.28 joris 541: rcs_optarg);
1.1 deraadt 542: exit(1);
543: }
544: break;
545: case 'L':
546: if (lkmode == RCS_LOCK_LOOSE)
547: cvs_log(LP_WARN, "-U overriden by -L");
548: lkmode = RCS_LOCK_STRICT;
549: break;
1.24 joris 550: case 'm':
1.53 joris 551: logstr = xstrdup(rcs_optarg);
1.24 joris 552: break;
1.1 deraadt 553: case 'M':
554: /* ignore for the moment */
555: break;
1.56 joris 556: case 'n':
557: nflag = xstrdup(rcs_optarg);
558: break;
559: case 'N':
560: nflag = xstrdup(rcs_optarg);
561: rcsflags |= RCS_NFLAG;
562: break;
1.12 joris 563: case 'q':
564: verbose = 0;
1.46 xsa 565: break;
1.56 joris 566: case 't':
567: descfile = rcs_optarg;
568: rcsflags |= RCS_TFLAG;
569: break;
1.46 xsa 570: case 'T':
1.56 joris 571: rcsflags |= PRESERVETIME;
1.12 joris 572: break;
1.1 deraadt 573: case 'U':
574: if (lkmode == RCS_LOCK_STRICT)
575: cvs_log(LP_WARN, "-L overriden by -U");
576: lkmode = RCS_LOCK_LOOSE;
577: break;
578: case 'V':
579: printf("%s\n", rcs_version);
580: exit(0);
1.45 xsa 581: case 'x':
582: rcs_suffixes = rcs_optarg;
1.51 xsa 583: break;
584: case 'z':
585: /*
586: * kept for compatibility
587: */
1.45 xsa 588: break;
1.1 deraadt 589: default:
1.2 deraadt 590: (usage)();
1.1 deraadt 591: exit(1);
592: }
593: }
594:
1.28 joris 595: argc -= rcs_optind;
596: argv += rcs_optind;
1.30 joris 597:
1.1 deraadt 598: if (argc == 0) {
599: cvs_log(LP_ERR, "no input file");
1.5 joris 600: (usage)();
1.1 deraadt 601: exit(1);
602: }
603:
604: for (i = 0; i < argc; i++) {
1.9 joris 605: if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
1.8 joris 606: continue;
1.6 joris 607:
1.35 niallo 608: if (verbose == 1)
609: printf("RCS file: %s\n", fpath);
1.48 xsa 610:
1.49 niallo 611: if ((file = rcs_open(fpath, flags, fmode)) == NULL)
1.6 joris 612: continue;
1.1 deraadt 613:
1.56 joris 614: if (rcsflags & RCS_CREATE)
615: rcs_set_description(file, NULL);
616:
617: if (rcsflags & RCS_TFLAG)
618: rcs_set_description(file, descfile);
619:
620: if (rcsflags & PRESERVETIME)
1.48 xsa 621: rcs_mtime = rcs_get_mtime(file->rf_path);
622:
1.56 joris 623: if (nflag != NULL)
624: rcs_attach_symbol(file, nflag);
625:
1.24 joris 626: if (logstr != NULL) {
627: if ((logmsg = strchr(logstr, ':')) == NULL) {
628: cvs_log(LP_ERR, "missing log message");
629: rcs_close(file);
630: continue;
631: }
632:
633: *logmsg++ = '\0';
634: if ((logrev = rcsnum_parse(logstr)) == NULL) {
1.48 xsa 635: cvs_log(LP_ERR,
636: "'%s' bad revision number", logstr);
1.24 joris 637: rcs_close(file);
638: continue;
639: }
640:
641: if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
642: cvs_log(LP_ERR,
643: "failed to set logmsg for '%s' to '%s'",
644: logstr, logmsg);
645: rcs_close(file);
1.25 joris 646: rcsnum_free(logrev);
1.24 joris 647: continue;
648: }
649:
650: rcsnum_free(logrev);
1.39 xsa 651: }
652:
653: /* entries to add from <oldfile> */
1.56 joris 654: if (rcsflags & CO_ACLAPPEND) {
1.39 xsa 655: /* XXX */
656: if ((oldfile = rcs_open(ofpath, RCS_READ)) == NULL)
657: exit(1);
658:
659: TAILQ_FOREACH(acp, &(oldfile->rf_access), ra_list)
660: rcs_access_add(file, acp->ra_name);
661:
662: rcs_close(oldfile);
1.24 joris 663: }
664:
1.1 deraadt 665: /* entries to add to the access list */
666: if (alist != NULL) {
667: unp = alist;
668: do {
669: sp = strchr(unp, ',');
670: if (sp != NULL)
671: *(sp++) = '\0';
672:
673: rcs_access_add(file, unp);
674:
675: unp = sp;
676: } while (sp != NULL);
677: }
678:
679: if (comment != NULL)
680: rcs_comment_set(file, comment);
681:
682: if (kflag != -1)
683: rcs_kwexp_set(file, kflag);
684:
685: if (lkmode != -1)
686: rcs_lock_setmode(file, lkmode);
687:
688: rcs_close(file);
1.48 xsa 689:
1.56 joris 690: if (rcsflags & PRESERVETIME)
1.48 xsa 691: rcs_set_mtime(fpath, rcs_mtime);
1.9 joris 692:
1.14 xsa 693: if (verbose == 1)
1.12 joris 694: printf("done\n");
1.1 deraadt 695: }
1.24 joris 696:
697: if (logstr != NULL)
1.53 joris 698: xfree(logstr);
1.1 deraadt 699:
1.56 joris 700: if (nflag != NULL)
701: xfree(nflag);
702:
1.1 deraadt 703: return (0);
1.56 joris 704: }
705:
706: static void
707: rcs_attach_symbol(RCSFILE *file, const char *symname)
708: {
709: char *rnum;
710: RCSNUM *rev;
711: char rbuf[16];
712: int rm;
713:
714: rm = 0;
715: rev = NULL;
716: if ((rnum = strrchr(symname, ':')) != NULL) {
717: if (rnum[1] == '\0')
718: rev = file->rf_head;
719: *(rnum++) = '\0';
720: } else {
721: rm = 1;
722: }
723:
724: if (rev == NULL && rm != 1) {
725: if ((rev = rcsnum_parse(rnum)) == NULL)
726: fatal("bad revision %s", rnum);
727: }
728:
729: if (rcsflags & RCS_NFLAG)
730: rm = 1;
731:
732: if (rm == 1) {
733: if (rcs_sym_remove(file, symname) < 0) {
734: if ((rcs_errno == RCS_ERR_NOENT) &&
735: !(rcsflags & RCS_NFLAG))
736: cvs_log(LP_WARN,
737: "can't delete nonexisting symbol %s", symname);
738: } else {
739: if (rcsflags & RCS_NFLAG)
740: rm = 0;
741: }
742: }
743:
744: if (rm == 0) {
745: if ((rcs_sym_add(file, symname, rev) < 0) &&
746: (rcs_errno == RCS_ERR_DUPENT)) {
747: rcsnum_tostr(rcs_sym_getrev(file, symname),
748: rbuf, sizeof(rbuf));
749: fatal("symbolic name %s already bound to %s",
750: symname, rbuf);
751: }
752: }
753: }
754:
755: static void
756: rcs_set_description(RCSFILE *file, const char *in)
757: {
758: BUF *bp;
759: char *content, buf[128];
760:
761: content = NULL;
762: if (in != NULL) {
763: bp = cvs_buf_load(in, BUF_AUTOEXT);
764: } else {
765: bp = cvs_buf_alloc(64, BUF_AUTOEXT);
766:
767: printf(DESC_PROMPT);
768: for (;;) {
769: fgets(buf, sizeof(buf), stdin);
770: if (feof(stdin) || ferror(stdin) || buf[0] == '.')
771: break;
772: cvs_buf_append(bp, buf, strlen(buf));
773: printf(">> ");
774: }
775: }
776:
777: cvs_buf_putc(bp, '\0');
778: content = cvs_buf_release(bp);
779:
780: rcs_desc_set(file, content);
1.70 joris 781: xfree(content);
1.1 deraadt 782: }