Annotation of src/usr.bin/rcs/rcsprog.c, Revision 1.73
1.73 ! ray 1: /* $OpenBSD: rcsprog.c,v 1.72 2006/03/14 03:33:30 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);
226:
227: return (ret);
228: }
229:
230: int
1.9 joris 231: rcs_statfile(char *fname, char *out, size_t len)
232: {
1.73 ! ray 233: int found;
1.42 xsa 234: char defaultsuffix[] = RCS_DEFAULT_SUFFIX;
1.9 joris 235: char filev[MAXPATHLEN], fpath[MAXPATHLEN];
1.42 xsa 236: char *ext, *slash;
1.9 joris 237: struct stat st;
238:
1.73 ! ray 239: found = 0;
1.42 xsa 240:
241: if (rcs_suffixes != NULL)
242: ext = rcs_suffixes;
243: else
244: ext = defaultsuffix;
1.43 xsa 245:
1.42 xsa 246: for (;;) {
247: /*
248: * GNU documentation says -x,v/ specifies two suffixes,
249: * namely the ,v one and an empty one (which matches
250: * everything).
251: * The problem is that they don't follow this rule at
252: * all, and their documentation seems flawed.
253: * We try to be compatible, so let's do so.
254: */
255: if (*ext == '\0')
256: break;
257:
258: if ((slash = strchr(ext, '/')) != NULL)
259: *slash = '\0';
1.9 joris 260:
1.62 xsa 261: if (strlcpy(filev, fname, sizeof(filev)) >= sizeof(filev) ||
262: strlcat(filev, ext, sizeof(filev)) >= sizeof(filev))
1.55 xsa 263: fatal("rcs_statfile: path truncation");
1.42 xsa 264:
1.73 ! ray 265: if (stat(RCSDIR, &st) != -1 && (st.st_mode & S_IFDIR)) {
1.62 xsa 266: if (strlcpy(fpath, RCSDIR,
267: sizeof(fpath)) >= sizeof(fpath) ||
268: strlcat(fpath, "/",
269: sizeof(fpath)) >= sizeof(fpath) ||
270: strlcat(fpath, filev,
271: sizeof(fpath)) >= sizeof(fpath))
1.55 xsa 272: fatal("rcs_statfile: path truncation");
1.42 xsa 273: } else {
1.62 xsa 274: if (strlcpy(fpath, filev,
275: sizeof(fpath)) >= sizeof(fpath))
1.57 xsa 276: fatal("rcs_statfile: path truncation");
1.42 xsa 277: }
278:
1.56 joris 279: if ((stat(fpath, &st) != -1) || (rcsflags & RCS_CREATE)) {
1.42 xsa 280: found++;
281: break;
282: }
283:
284: if (slash == NULL)
285: break;
286:
287: *slash++ = '/';
288: ext = slash;
1.9 joris 289: }
290:
1.42 xsa 291: if (found != 1) {
1.44 niallo 292: if ((strcmp(__progname, "rcsclean") != 0)
293: && (strcmp(__progname, "ci") != 0))
1.20 joris 294: cvs_log(LP_ERRNO, "%s", fpath);
1.9 joris 295: return (-1);
296: }
297:
1.62 xsa 298: if (strlcpy(out, fpath, len) >= len)
1.57 xsa 299: fatal("rcs_statfile: path truncation");
1.9 joris 300:
301: return (0);
302: }
1.1 deraadt 303:
304: int
305: main(int argc, char **argv)
306: {
307: u_int i;
1.29 joris 308: char *rcsinit, *cmd_argv[RCS_CMD_MAXARG];
309: int ret, cmd_argc;
1.1 deraadt 310:
311: ret = -1;
1.28 joris 312: rcs_optind = 1;
1.9 joris 313: cvs_log_init(LD_STD, 0);
1.68 joris 314: SLIST_INIT(&rcs_temp_files);
1.1 deraadt 315:
1.29 joris 316: cmd_argc = 0;
1.30 joris 317: cmd_argv[cmd_argc++] = argv[0];
1.29 joris 318: if ((rcsinit = getenv("RCSINIT")) != NULL) {
319: ret = rcs_init(rcsinit, cmd_argv + 1,
320: RCS_CMD_MAXARG - 1);
321: if (ret < 0) {
322: cvs_log(LP_ERRNO, "failed to prepend RCSINIT options");
323: exit (1);
324: }
325:
326: cmd_argc += ret;
327: }
1.36 xsa 328:
329: if ((rcs_tmpdir = getenv("TMPDIR")) == NULL)
330: rcs_tmpdir = RCS_TMPDIR_DEFAULT;
1.29 joris 331:
332: for (ret = 1; ret < argc; ret++)
333: cmd_argv[cmd_argc++] = argv[ret];
1.68 joris 334:
335: signal(SIGHUP, sighdlr);
336: signal(SIGINT, sighdlr);
337: signal(SIGQUIT, sighdlr);
338: signal(SIGABRT, sighdlr);
339: signal(SIGALRM, sighdlr);
340: signal(SIGTERM, sighdlr);
1.29 joris 341:
1.1 deraadt 342: for (i = 0; i < (sizeof(programs)/sizeof(programs[0])); i++)
1.2 deraadt 343: if (strcmp(__progname, programs[i].prog_name) == 0) {
344: usage = programs[i].prog_usage;
1.29 joris 345: ret = programs[i].prog_hdlr(cmd_argc, cmd_argv);
1.2 deraadt 346: break;
347: }
1.1 deraadt 348:
1.23 niallo 349: exit(ret);
1.1 deraadt 350: }
351:
352:
353: void
354: rcs_usage(void)
355: {
356: fprintf(stderr,
1.66 jmc 357: "usage: rcs [-ehIiLMqTUV] [-Aoldfile] [-ausers] [-b[rev]]\n"
1.67 xsa 358: " [-cstring] [-e[users]] [-kmode] [-mrev:msg]\n"
1.66 jmc 359: " [-orev] [-sstate[:rev]] [-tfile|str]\n"
1.67 xsa 360: " [-xsuffixes] file ...\n");
1.1 deraadt 361: }
362:
363: /*
364: * rcs_main()
365: *
366: * Handler for the `rcs' program.
367: * Returns 0 on success, or >0 on error.
368: */
369: int
370: rcs_main(int argc, char **argv)
371: {
372: int i, ch, flags, kflag, lkmode;
1.39 xsa 373: char fpath[MAXPATHLEN], ofpath[MAXPATHLEN];
1.56 joris 374: char *logstr, *logmsg, *nflag, *descfile;
1.39 xsa 375: char *alist, *comment, *elist, *unp, *sp;
1.1 deraadt 376: mode_t fmode;
1.39 xsa 377: RCSFILE *file, *oldfile;
1.24 joris 378: RCSNUM *logrev;
1.39 xsa 379: struct rcs_access *acp;
1.48 xsa 380: time_t rcs_mtime = -1;
1.1 deraadt 381:
382: kflag = lkmode = -1;
383: fmode = 0;
1.58 niallo 384: flags = RCS_RDWR|RCS_PARSE_FULLY;
1.56 joris 385: descfile = nflag = NULL;
1.39 xsa 386: logstr = alist = comment = elist = NULL;
1.1 deraadt 387:
1.51 xsa 388: while ((ch = rcs_getopt(argc, argv, RCSPROG_OPTSTRING)) != -1) {
1.1 deraadt 389: switch (ch) {
390: case 'A':
1.39 xsa 391: if (rcs_statfile(rcs_optarg, ofpath, sizeof(ofpath)) < 0)
392: exit(1);
1.56 joris 393: rcsflags |= CO_ACLAPPEND;
1.1 deraadt 394: break;
395: case 'a':
1.28 joris 396: alist = rcs_optarg;
1.1 deraadt 397: break;
398: case 'c':
1.28 joris 399: comment = rcs_optarg;
1.1 deraadt 400: break;
401: case 'e':
1.28 joris 402: elist = rcs_optarg;
1.1 deraadt 403: break;
404: case 'h':
1.2 deraadt 405: (usage)();
1.1 deraadt 406: exit(0);
407: case 'i':
408: flags |= RCS_CREATE;
1.56 joris 409: rcsflags |= RCS_CREATE;
1.1 deraadt 410: break;
411: case 'k':
1.28 joris 412: kflag = rcs_kflag_get(rcs_optarg);
1.1 deraadt 413: if (RCS_KWEXP_INVAL(kflag)) {
414: cvs_log(LP_ERR,
415: "invalid keyword substitution mode `%s'",
1.28 joris 416: rcs_optarg);
1.1 deraadt 417: exit(1);
418: }
419: break;
420: case 'L':
421: if (lkmode == RCS_LOCK_LOOSE)
422: cvs_log(LP_WARN, "-U overriden by -L");
423: lkmode = RCS_LOCK_STRICT;
424: break;
1.24 joris 425: case 'm':
1.53 joris 426: logstr = xstrdup(rcs_optarg);
1.24 joris 427: break;
1.1 deraadt 428: case 'M':
429: /* ignore for the moment */
430: break;
1.56 joris 431: case 'n':
432: nflag = xstrdup(rcs_optarg);
433: break;
434: case 'N':
435: nflag = xstrdup(rcs_optarg);
436: rcsflags |= RCS_NFLAG;
437: break;
1.12 joris 438: case 'q':
439: verbose = 0;
1.46 xsa 440: break;
1.56 joris 441: case 't':
442: descfile = rcs_optarg;
443: rcsflags |= RCS_TFLAG;
444: break;
1.46 xsa 445: case 'T':
1.56 joris 446: rcsflags |= PRESERVETIME;
1.12 joris 447: break;
1.1 deraadt 448: case 'U':
449: if (lkmode == RCS_LOCK_STRICT)
450: cvs_log(LP_WARN, "-L overriden by -U");
451: lkmode = RCS_LOCK_LOOSE;
452: break;
453: case 'V':
454: printf("%s\n", rcs_version);
455: exit(0);
1.45 xsa 456: case 'x':
457: rcs_suffixes = rcs_optarg;
1.51 xsa 458: break;
459: case 'z':
460: /*
461: * kept for compatibility
462: */
1.45 xsa 463: break;
1.1 deraadt 464: default:
1.2 deraadt 465: (usage)();
1.1 deraadt 466: exit(1);
467: }
468: }
469:
1.28 joris 470: argc -= rcs_optind;
471: argv += rcs_optind;
1.30 joris 472:
1.1 deraadt 473: if (argc == 0) {
474: cvs_log(LP_ERR, "no input file");
1.5 joris 475: (usage)();
1.1 deraadt 476: exit(1);
477: }
478:
479: for (i = 0; i < argc; i++) {
1.9 joris 480: if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
1.8 joris 481: continue;
1.6 joris 482:
1.35 niallo 483: if (verbose == 1)
484: printf("RCS file: %s\n", fpath);
1.48 xsa 485:
1.49 niallo 486: if ((file = rcs_open(fpath, flags, fmode)) == NULL)
1.6 joris 487: continue;
1.1 deraadt 488:
1.56 joris 489: if (rcsflags & RCS_CREATE)
490: rcs_set_description(file, NULL);
491:
492: if (rcsflags & RCS_TFLAG)
493: rcs_set_description(file, descfile);
494:
495: if (rcsflags & PRESERVETIME)
1.48 xsa 496: rcs_mtime = rcs_get_mtime(file->rf_path);
497:
1.56 joris 498: if (nflag != NULL)
499: rcs_attach_symbol(file, nflag);
500:
1.24 joris 501: if (logstr != NULL) {
502: if ((logmsg = strchr(logstr, ':')) == NULL) {
503: cvs_log(LP_ERR, "missing log message");
504: rcs_close(file);
505: continue;
506: }
507:
508: *logmsg++ = '\0';
509: if ((logrev = rcsnum_parse(logstr)) == NULL) {
1.48 xsa 510: cvs_log(LP_ERR,
511: "'%s' bad revision number", logstr);
1.24 joris 512: rcs_close(file);
513: continue;
514: }
515:
516: if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
517: cvs_log(LP_ERR,
518: "failed to set logmsg for '%s' to '%s'",
519: logstr, logmsg);
520: rcs_close(file);
1.25 joris 521: rcsnum_free(logrev);
1.24 joris 522: continue;
523: }
524:
525: rcsnum_free(logrev);
1.39 xsa 526: }
527:
528: /* entries to add from <oldfile> */
1.56 joris 529: if (rcsflags & CO_ACLAPPEND) {
1.39 xsa 530: /* XXX */
531: if ((oldfile = rcs_open(ofpath, RCS_READ)) == NULL)
532: exit(1);
533:
534: TAILQ_FOREACH(acp, &(oldfile->rf_access), ra_list)
535: rcs_access_add(file, acp->ra_name);
536:
537: rcs_close(oldfile);
1.24 joris 538: }
539:
1.1 deraadt 540: /* entries to add to the access list */
541: if (alist != NULL) {
542: unp = alist;
543: do {
544: sp = strchr(unp, ',');
545: if (sp != NULL)
546: *(sp++) = '\0';
547:
548: rcs_access_add(file, unp);
549:
550: unp = sp;
551: } while (sp != NULL);
552: }
553:
554: if (comment != NULL)
555: rcs_comment_set(file, comment);
556:
557: if (kflag != -1)
558: rcs_kwexp_set(file, kflag);
559:
560: if (lkmode != -1)
561: rcs_lock_setmode(file, lkmode);
562:
563: rcs_close(file);
1.48 xsa 564:
1.56 joris 565: if (rcsflags & PRESERVETIME)
1.48 xsa 566: rcs_set_mtime(fpath, rcs_mtime);
1.9 joris 567:
1.14 xsa 568: if (verbose == 1)
1.12 joris 569: printf("done\n");
1.1 deraadt 570: }
1.24 joris 571:
572: if (logstr != NULL)
1.53 joris 573: xfree(logstr);
1.1 deraadt 574:
1.56 joris 575: if (nflag != NULL)
576: xfree(nflag);
577:
1.1 deraadt 578: return (0);
1.56 joris 579: }
580:
581: static void
582: rcs_attach_symbol(RCSFILE *file, const char *symname)
583: {
584: char *rnum;
585: RCSNUM *rev;
586: char rbuf[16];
587: int rm;
588:
589: rm = 0;
590: rev = NULL;
591: if ((rnum = strrchr(symname, ':')) != NULL) {
592: if (rnum[1] == '\0')
593: rev = file->rf_head;
594: *(rnum++) = '\0';
595: } else {
596: rm = 1;
597: }
598:
599: if (rev == NULL && rm != 1) {
600: if ((rev = rcsnum_parse(rnum)) == NULL)
601: fatal("bad revision %s", rnum);
602: }
603:
604: if (rcsflags & RCS_NFLAG)
605: rm = 1;
606:
607: if (rm == 1) {
608: if (rcs_sym_remove(file, symname) < 0) {
609: if ((rcs_errno == RCS_ERR_NOENT) &&
610: !(rcsflags & RCS_NFLAG))
611: cvs_log(LP_WARN,
612: "can't delete nonexisting symbol %s", symname);
613: } else {
614: if (rcsflags & RCS_NFLAG)
615: rm = 0;
616: }
617: }
618:
619: if (rm == 0) {
620: if ((rcs_sym_add(file, symname, rev) < 0) &&
621: (rcs_errno == RCS_ERR_DUPENT)) {
622: rcsnum_tostr(rcs_sym_getrev(file, symname),
623: rbuf, sizeof(rbuf));
624: fatal("symbolic name %s already bound to %s",
625: symname, rbuf);
626: }
627: }
628: }
629:
630: static void
631: rcs_set_description(RCSFILE *file, const char *in)
632: {
633: BUF *bp;
634: char *content, buf[128];
635:
636: content = NULL;
637: if (in != NULL) {
638: bp = cvs_buf_load(in, BUF_AUTOEXT);
639: } else {
640: bp = cvs_buf_alloc(64, BUF_AUTOEXT);
641:
642: printf(DESC_PROMPT);
643: for (;;) {
644: fgets(buf, sizeof(buf), stdin);
645: if (feof(stdin) || ferror(stdin) || buf[0] == '.')
646: break;
647: cvs_buf_append(bp, buf, strlen(buf));
648: printf(">> ");
649: }
650: }
651:
652: cvs_buf_putc(bp, '\0');
653: content = cvs_buf_release(bp);
654:
655: rcs_desc_set(file, content);
1.70 joris 656: xfree(content);
1.1 deraadt 657: }