Annotation of src/usr.bin/cvs/rcs.c, Revision 1.146
1.146 ! xsa 1: /* $OpenBSD: rcs.c,v 1.145 2006/03/23 09:03:28 xsa Exp $ */
1.1 jfb 2: /*
3: * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
1.15 tedu 4: * All rights reserved.
1.1 jfb 5: *
1.15 tedu 6: * Redistribution and use in source and binary forms, with or without
7: * modification, are permitted provided that the following conditions
8: * are met:
1.1 jfb 9: *
1.15 tedu 10: * 1. Redistributions of source code must retain the above copyright
11: * notice, this list of conditions and the following disclaimer.
1.1 jfb 12: * 2. The name of the author may not be used to endorse or promote products
1.15 tedu 13: * derived from this software without specific prior written permission.
1.1 jfb 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
1.15 tedu 24: * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.1 jfb 25: */
26:
1.123 xsa 27: #include "includes.h"
1.1 jfb 28:
1.94 joris 29: #include "cvs.h"
1.55 xsa 30: #include "log.h"
1.1 jfb 31: #include "rcs.h"
1.81 niallo 32: #include "diff.h"
1.1 jfb 33:
1.57 xsa 34: #define RCS_BUFSIZE 16384
35: #define RCS_BUFEXTSIZE 8192
1.117 niallo 36: #define RCS_KWEXP_SIZE 1024
1.1 jfb 37:
38:
39: /* RCS token types */
1.57 xsa 40: #define RCS_TOK_ERR -1
41: #define RCS_TOK_EOF 0
42: #define RCS_TOK_NUM 1
43: #define RCS_TOK_ID 2
44: #define RCS_TOK_STRING 3
45: #define RCS_TOK_SCOLON 4
46: #define RCS_TOK_COLON 5
47:
48:
49: #define RCS_TOK_HEAD 8
50: #define RCS_TOK_BRANCH 9
51: #define RCS_TOK_ACCESS 10
52: #define RCS_TOK_SYMBOLS 11
53: #define RCS_TOK_LOCKS 12
54: #define RCS_TOK_COMMENT 13
55: #define RCS_TOK_EXPAND 14
56: #define RCS_TOK_DATE 15
57: #define RCS_TOK_AUTHOR 16
58: #define RCS_TOK_STATE 17
59: #define RCS_TOK_NEXT 18
60: #define RCS_TOK_BRANCHES 19
61: #define RCS_TOK_DESC 20
62: #define RCS_TOK_LOG 21
63: #define RCS_TOK_TEXT 22
64: #define RCS_TOK_STRICT 23
1.1 jfb 65:
1.57 xsa 66: #define RCS_ISKEY(t) (((t) >= RCS_TOK_HEAD) && ((t) <= RCS_TOK_BRANCHES))
1.1 jfb 67:
68:
1.57 xsa 69: #define RCS_NOSCOL 0x01 /* no terminating semi-colon */
70: #define RCS_VOPT 0x02 /* value is optional */
1.1 jfb 71:
72:
73: /* opaque parse data */
74: struct rcs_pdata {
1.57 xsa 75: u_int rp_lines;
1.1 jfb 76:
1.57 xsa 77: char *rp_buf;
78: size_t rp_blen;
79: char *rp_bufend;
80: size_t rp_tlen;
1.1 jfb 81:
82: /* pushback token buffer */
1.57 xsa 83: char rp_ptok[128];
84: int rp_pttype; /* token type, RCS_TOK_ERR if no token */
1.1 jfb 85:
1.57 xsa 86: FILE *rp_file;
1.1 jfb 87: };
88:
89:
1.57 xsa 90: #define RCS_TOKSTR(rfp) ((struct rcs_pdata *)rfp->rf_pdata)->rp_buf
91: #define RCS_TOKLEN(rfp) ((struct rcs_pdata *)rfp->rf_pdata)->rp_tlen
1.1 jfb 92:
93:
1.47 jfb 94: /* invalid characters in RCS symbol names */
1.49 jfb 95: static const char rcs_sym_invch[] = RCS_SYM_INVALCHAR;
1.47 jfb 96:
1.51 jfb 97:
98: /* comment leaders, depending on the file's suffix */
99: static const struct rcs_comment {
1.57 xsa 100: const char *rc_suffix;
101: const char *rc_cstr;
1.51 jfb 102: } rcs_comments[] = {
103: { "1", ".\\\" " },
104: { "2", ".\\\" " },
105: { "3", ".\\\" " },
106: { "4", ".\\\" " },
107: { "5", ".\\\" " },
108: { "6", ".\\\" " },
109: { "7", ".\\\" " },
110: { "8", ".\\\" " },
111: { "9", ".\\\" " },
112: { "a", "-- " }, /* Ada */
113: { "ada", "-- " },
114: { "adb", "-- " },
115: { "asm", ";; " }, /* assembler (MS-DOS) */
116: { "ads", "-- " }, /* Ada */
117: { "bat", ":: " }, /* batch (MS-DOS) */
118: { "body", "-- " }, /* Ada */
119: { "c", " * " }, /* C */
120: { "c++", "// " }, /* C++ */
121: { "cc", "// " },
122: { "cpp", "// " },
123: { "cxx", "// " },
124: { "m", "// " }, /* Objective-C */
125: { "cl", ";;; " }, /* Common Lisp */
126: { "cmd", ":: " }, /* command (OS/2) */
127: { "cmf", "c " }, /* CM Fortran */
128: { "csh", "# " }, /* shell */
129: { "e", "# " }, /* efl */
130: { "epsf", "% " }, /* encapsulated postscript */
131: { "epsi", "% " }, /* encapsulated postscript */
132: { "el", "; " }, /* Emacs Lisp */
133: { "f", "c " }, /* Fortran */
134: { "for", "c " },
135: { "h", " * " }, /* C-header */
136: { "hh", "// " }, /* C++ header */
137: { "hpp", "// " },
138: { "hxx", "// " },
139: { "in", "# " }, /* for Makefile.in */
140: { "l", " * " }, /* lex */
141: { "mac", ";; " }, /* macro (DEC-10, MS-DOS, PDP-11, VMS, etc) */
142: { "mak", "# " }, /* makefile, e.g. Visual C++ */
143: { "me", ".\\\" " }, /* me-macros t/nroff */
144: { "ml", "; " }, /* mocklisp */
145: { "mm", ".\\\" " }, /* mm-macros t/nroff */
146: { "ms", ".\\\" " }, /* ms-macros t/nroff */
147: { "man", ".\\\" " }, /* man-macros t/nroff */
148: { "p", " * " }, /* pascal */
149: { "pas", " * " },
1.52 jfb 150: { "pl", "# " }, /* Perl (conflict with Prolog) */
151: { "pm", "# " }, /* Perl module */
1.51 jfb 152: { "ps", "% " }, /* postscript */
153: { "psw", "% " }, /* postscript wrap */
154: { "pswm", "% " }, /* postscript wrap */
155: { "r", "# " }, /* ratfor */
156: { "rc", " * " }, /* Microsoft Windows resource file */
157: { "red", "% " }, /* psl/rlisp */
158: { "sh", "# " }, /* shell */
159: { "sl", "% " }, /* psl */
160: { "spec", "-- " }, /* Ada */
161: { "tex", "% " }, /* tex */
162: { "y", " * " }, /* yacc */
163: { "ye", " * " }, /* yacc-efl */
164: { "yr", " * " }, /* yacc-ratfor */
165: };
166:
1.128 niallo 167: struct rcs_kw rcs_expkw[] = {
168: { "Author", RCS_KW_AUTHOR },
169: { "Date", RCS_KW_DATE },
170: { "Header", RCS_KW_HEADER },
171: { "Id", RCS_KW_ID },
172: { "Log", RCS_KW_LOG },
173: { "Name", RCS_KW_NAME },
174: { "RCSfile", RCS_KW_RCSFILE },
175: { "Revision", RCS_KW_REVISION },
176: { "Source", RCS_KW_SOURCE },
177: { "State", RCS_KW_STATE },
178: };
179:
1.57 xsa 180: #define NB_COMTYPES (sizeof(rcs_comments)/sizeof(rcs_comments[0]))
1.51 jfb 181:
1.33 jfb 182: #ifdef notyet
1.20 jfb 183: static struct rcs_kfl {
1.57 xsa 184: char rk_char;
185: int rk_val;
1.20 jfb 186: } rcs_kflags[] = {
187: { 'k', RCS_KWEXP_NAME },
188: { 'v', RCS_KWEXP_VAL },
189: { 'l', RCS_KWEXP_LKR },
190: { 'o', RCS_KWEXP_OLD },
191: { 'b', RCS_KWEXP_NONE },
192: };
1.33 jfb 193: #endif
1.20 jfb 194:
1.1 jfb 195: static struct rcs_key {
1.57 xsa 196: char rk_str[16];
197: int rk_id;
198: int rk_val;
199: int rk_flags;
1.1 jfb 200: } rcs_keys[] = {
201: { "access", RCS_TOK_ACCESS, RCS_TOK_ID, RCS_VOPT },
1.41 jfb 202: { "author", RCS_TOK_AUTHOR, RCS_TOK_ID, 0 },
1.1 jfb 203: { "branch", RCS_TOK_BRANCH, RCS_TOK_NUM, RCS_VOPT },
204: { "branches", RCS_TOK_BRANCHES, RCS_TOK_NUM, RCS_VOPT },
205: { "comment", RCS_TOK_COMMENT, RCS_TOK_STRING, RCS_VOPT },
206: { "date", RCS_TOK_DATE, RCS_TOK_NUM, 0 },
207: { "desc", RCS_TOK_DESC, RCS_TOK_STRING, RCS_NOSCOL },
208: { "expand", RCS_TOK_EXPAND, RCS_TOK_STRING, RCS_VOPT },
209: { "head", RCS_TOK_HEAD, RCS_TOK_NUM, RCS_VOPT },
210: { "locks", RCS_TOK_LOCKS, RCS_TOK_ID, 0 },
211: { "log", RCS_TOK_LOG, RCS_TOK_STRING, RCS_NOSCOL },
212: { "next", RCS_TOK_NEXT, RCS_TOK_NUM, RCS_VOPT },
1.41 jfb 213: { "state", RCS_TOK_STATE, RCS_TOK_ID, RCS_VOPT },
1.1 jfb 214: { "strict", RCS_TOK_STRICT, 0, 0, },
215: { "symbols", RCS_TOK_SYMBOLS, 0, 0 },
216: { "text", RCS_TOK_TEXT, RCS_TOK_STRING, RCS_NOSCOL },
217: };
218:
1.57 xsa 219: #define RCS_NKEYS (sizeof(rcs_keys)/sizeof(rcs_keys[0]))
1.1 jfb 220:
1.33 jfb 221:
1.32 jfb 222: static const char *rcs_errstrs[] = {
223: "No error",
224: "No such entry",
225: "Duplicate entry found",
226: "Bad RCS number",
1.48 jfb 227: "Invalid RCS symbol",
228: "Parse error",
1.32 jfb 229: };
230:
231: #define RCS_NERR (sizeof(rcs_errstrs)/sizeof(rcs_errstrs[0]))
232:
233:
234: int rcs_errno = RCS_ERR_NOERR;
1.134 joris 235: char *timezone_flag = NULL;
1.1 jfb 236:
1.57 xsa 237: static int rcs_write(RCSFILE *);
1.117 niallo 238: static int rcs_parse_init(RCSFILE *);
1.57 xsa 239: static int rcs_parse_admin(RCSFILE *);
240: static int rcs_parse_delta(RCSFILE *);
1.146 ! xsa 241: static void rcs_parse_deltas(RCSFILE *, RCSNUM *);
1.57 xsa 242: static int rcs_parse_deltatext(RCSFILE *);
1.146 ! xsa 243: static void rcs_parse_deltatexts(RCSFILE *, RCSNUM *);
1.124 xsa 244: static int rcs_parse_desc(RCSFILE *, RCSNUM *);
1.57 xsa 245:
246: static int rcs_parse_access(RCSFILE *);
247: static int rcs_parse_symbols(RCSFILE *);
248: static int rcs_parse_locks(RCSFILE *);
249: static int rcs_parse_branches(RCSFILE *, struct rcs_delta *);
250: static void rcs_freedelta(struct rcs_delta *);
251: static void rcs_freepdata(struct rcs_pdata *);
252: static int rcs_gettok(RCSFILE *);
253: static int rcs_pushtok(RCSFILE *, const char *, int);
254: static int rcs_growbuf(RCSFILE *);
255: static int rcs_strprint(const u_char *, size_t, FILE *);
256:
1.131 niallo 257: static char* rcs_expand_keywords(char *, struct rcs_delta *, char *,
1.125 niallo 258: size_t, int);
1.26 jfb 259:
1.1 jfb 260: /*
261: * rcs_open()
262: *
263: * Open a file containing RCS-formatted information. The file's path is
1.26 jfb 264: * given in <path>, and the opening flags are given in <flags>, which is either
265: * RCS_READ, RCS_WRITE, or RCS_RDWR. If the open requests write access and
266: * the file does not exist, the RCS_CREATE flag must also be given, in which
267: * case it will be created with the mode specified in a third argument of
268: * type mode_t. If the file exists and RCS_CREATE is passed, the open will
269: * fail.
1.1 jfb 270: * Returns a handle to the opened file on success, or NULL on failure.
271: */
1.60 xsa 272: RCSFILE *
1.26 jfb 273: rcs_open(const char *path, int flags, ...)
1.1 jfb 274: {
1.26 jfb 275: int ret;
276: mode_t fmode;
1.1 jfb 277: RCSFILE *rfp;
278: struct stat st;
1.26 jfb 279: va_list vap;
1.109 joris 280: struct rcs_delta *rdp;
281: struct rcs_lock *lkr;
1.26 jfb 282:
283: fmode = 0;
284: flags &= 0xffff; /* ditch any internal flags */
1.1 jfb 285:
1.26 jfb 286: if (((ret = stat(path, &st)) == -1) && (errno == ENOENT)) {
287: if (flags & RCS_CREATE) {
288: va_start(vap, flags);
289: fmode = va_arg(vap, mode_t);
290: va_end(vap);
291: } else {
1.105 joris 292: /* XXX, make this command dependant? */
293: #if 0
1.26 jfb 294: cvs_log(LP_ERR, "RCS file `%s' does not exist", path);
1.105 joris 295: #endif
1.127 xsa 296: rcs_errno = RCS_ERR_NOENT;
1.26 jfb 297: return (NULL);
298: }
299: } else if ((ret == 0) && (flags & RCS_CREATE)) {
300: cvs_log(LP_ERR, "RCS file `%s' exists", path);
1.1 jfb 301: return (NULL);
302: }
303:
1.110 joris 304: rfp = (RCSFILE *)xmalloc(sizeof(*rfp));
1.1 jfb 305: memset(rfp, 0, sizeof(*rfp));
306:
1.110 joris 307: rfp->rf_path = xstrdup(path);
1.142 niallo 308: rfp->rf_flags = flags | RCS_SLOCK | RCS_SYNCED;
1.26 jfb 309: rfp->rf_mode = fmode;
1.1 jfb 310:
311: TAILQ_INIT(&(rfp->rf_delta));
1.29 jfb 312: TAILQ_INIT(&(rfp->rf_access));
1.1 jfb 313: TAILQ_INIT(&(rfp->rf_symbols));
314: TAILQ_INIT(&(rfp->rf_locks));
315:
1.122 reyk 316: if (!(rfp->rf_flags & RCS_CREATE)
1.120 niallo 317: && (rcs_parse_init(rfp) < 0)) {
1.1 jfb 318: rcs_close(rfp);
319: return (NULL);
320: }
321:
1.109 joris 322: /* fill in rd_locker */
323: TAILQ_FOREACH(lkr, &(rfp->rf_locks), rl_list) {
324: if ((rdp = rcs_findrev(rfp, lkr->rl_num)) == NULL) {
325: rcs_close(rfp);
326: return (NULL);
327: }
328:
1.110 joris 329: rdp->rd_locker = xstrdup(lkr->rl_name);
1.109 joris 330: }
331:
1.1 jfb 332: return (rfp);
333: }
334:
335: /*
336: * rcs_close()
337: *
338: * Close an RCS file handle.
339: */
340: void
341: rcs_close(RCSFILE *rfp)
342: {
343: struct rcs_delta *rdp;
1.71 moritz 344: struct rcs_access *rap;
1.13 jfb 345: struct rcs_lock *rlp;
346: struct rcs_sym *rsp;
1.1 jfb 347:
1.26 jfb 348: if ((rfp->rf_flags & RCS_WRITE) && !(rfp->rf_flags & RCS_SYNCED))
349: rcs_write(rfp);
350:
1.1 jfb 351: while (!TAILQ_EMPTY(&(rfp->rf_delta))) {
352: rdp = TAILQ_FIRST(&(rfp->rf_delta));
353: TAILQ_REMOVE(&(rfp->rf_delta), rdp, rd_list);
354: rcs_freedelta(rdp);
1.71 moritz 355: }
356:
357: while (!TAILQ_EMPTY(&(rfp->rf_access))) {
358: rap = TAILQ_FIRST(&(rfp->rf_access));
359: TAILQ_REMOVE(&(rfp->rf_access), rap, ra_list);
1.110 joris 360: xfree(rap->ra_name);
361: xfree(rap);
1.1 jfb 362: }
363:
1.13 jfb 364: while (!TAILQ_EMPTY(&(rfp->rf_symbols))) {
365: rsp = TAILQ_FIRST(&(rfp->rf_symbols));
366: TAILQ_REMOVE(&(rfp->rf_symbols), rsp, rs_list);
367: rcsnum_free(rsp->rs_num);
1.110 joris 368: xfree(rsp->rs_name);
369: xfree(rsp);
1.13 jfb 370: }
371:
372: while (!TAILQ_EMPTY(&(rfp->rf_locks))) {
373: rlp = TAILQ_FIRST(&(rfp->rf_locks));
374: TAILQ_REMOVE(&(rfp->rf_locks), rlp, rl_list);
375: rcsnum_free(rlp->rl_num);
1.110 joris 376: xfree(rlp->rl_name);
377: xfree(rlp);
1.13 jfb 378: }
379:
1.1 jfb 380: if (rfp->rf_head != NULL)
381: rcsnum_free(rfp->rf_head);
1.11 joris 382: if (rfp->rf_branch != NULL)
383: rcsnum_free(rfp->rf_branch);
1.1 jfb 384:
385: if (rfp->rf_path != NULL)
1.110 joris 386: xfree(rfp->rf_path);
1.1 jfb 387: if (rfp->rf_comment != NULL)
1.110 joris 388: xfree(rfp->rf_comment);
1.1 jfb 389: if (rfp->rf_expand != NULL)
1.110 joris 390: xfree(rfp->rf_expand);
1.1 jfb 391: if (rfp->rf_desc != NULL)
1.110 joris 392: xfree(rfp->rf_desc);
1.118 joris 393: if (rfp->rf_pdata != NULL)
394: rcs_freepdata(rfp->rf_pdata);
1.110 joris 395: xfree(rfp);
1.1 jfb 396: }
397:
398: /*
399: * rcs_write()
400: *
401: * Write the contents of the RCS file handle <rfp> to disk in the file whose
402: * path is in <rf_path>.
403: * Returns 0 on success, or -1 on failure.
404: */
1.27 jfb 405: static int
1.1 jfb 406: rcs_write(RCSFILE *rfp)
407: {
408: FILE *fp;
1.72 niallo 409: char buf[1024], numbuf[64], fn[19] = "";
410: void *bp;
1.29 jfb 411: struct rcs_access *ap;
1.1 jfb 412: struct rcs_sym *symp;
1.46 jfb 413: struct rcs_branch *brp;
1.1 jfb 414: struct rcs_delta *rdp;
1.75 joris 415: struct rcs_lock *lkp;
1.72 niallo 416: ssize_t nread;
1.100 xsa 417: size_t len;
1.72 niallo 418: int fd, from_fd, to_fd;
1.75 joris 419:
1.72 niallo 420: from_fd = to_fd = fd = -1;
1.1 jfb 421:
1.137 joris 422: if (rfp->rf_flags & RCS_SYNCED)
423: return (0);
424:
1.117 niallo 425: /* Write operations need the whole file parsed */
426: rcs_parse_deltatexts(rfp, NULL);
1.1 jfb 427:
1.72 niallo 428: strlcpy(fn, "/tmp/rcs.XXXXXXXXXX", sizeof(fn));
1.113 xsa 429: if ((fd = mkstemp(fn)) == -1)
430: fatal("mkstemp: `%s': %s", fn, strerror(errno));
431:
432: if ((fp = fdopen(fd, "w+")) == NULL) {
433: fd = errno;
434: unlink(fn);
435: fatal("fdopen: %s", strerror(fd));
1.1 jfb 436: }
437:
1.28 jfb 438: if (rfp->rf_head != NULL)
439: rcsnum_tostr(rfp->rf_head, numbuf, sizeof(numbuf));
440: else
441: numbuf[0] = '\0';
442:
1.1 jfb 443: fprintf(fp, "head\t%s;\n", numbuf);
1.35 jfb 444:
445: if (rfp->rf_branch != NULL) {
446: rcsnum_tostr(rfp->rf_branch, numbuf, sizeof(numbuf));
447: fprintf(fp, "branch\t%s;\n", numbuf);
448: }
449:
1.29 jfb 450: fputs("access", fp);
451: TAILQ_FOREACH(ap, &(rfp->rf_access), ra_list) {
452: fprintf(fp, "\n\t%s", ap->ra_name);
453: }
454: fputs(";\n", fp);
1.1 jfb 455:
1.85 joris 456: fprintf(fp, "symbols");
1.1 jfb 457: TAILQ_FOREACH(symp, &(rfp->rf_symbols), rs_list) {
458: rcsnum_tostr(symp->rs_num, numbuf, sizeof(numbuf));
1.126 xsa 459: strlcpy(buf, symp->rs_name, sizeof(buf));
460: strlcat(buf, ":", sizeof(buf));
461: strlcat(buf, numbuf, sizeof(buf));
1.85 joris 462: fprintf(fp, "\n\t%s", buf);
1.1 jfb 463: }
464: fprintf(fp, ";\n");
465:
1.75 joris 466: fprintf(fp, "locks");
467: TAILQ_FOREACH(lkp, &(rfp->rf_locks), rl_list) {
468: rcsnum_tostr(lkp->rl_num, numbuf, sizeof(numbuf));
469: fprintf(fp, "\n\t%s:%s", lkp->rl_name, numbuf);
470: }
471:
472: fprintf(fp, ";");
1.1 jfb 473:
1.26 jfb 474: if (rfp->rf_flags & RCS_SLOCK)
1.1 jfb 475: fprintf(fp, " strict;");
476: fputc('\n', fp);
477:
1.129 xsa 478: fputs("comment\t@", fp);
1.42 jfb 479: if (rfp->rf_comment != NULL) {
1.58 xsa 480: rcs_strprint((const u_char *)rfp->rf_comment,
481: strlen(rfp->rf_comment), fp);
1.42 jfb 482: fputs("@;\n", fp);
1.129 xsa 483: } else
484: fputs("# @;\n", fp);
1.1 jfb 485:
1.42 jfb 486: if (rfp->rf_expand != NULL) {
487: fputs("expand @", fp);
1.58 xsa 488: rcs_strprint((const u_char *)rfp->rf_expand,
489: strlen(rfp->rf_expand), fp);
1.42 jfb 490: fputs("@;\n", fp);
491: }
1.1 jfb 492:
1.46 jfb 493: fputs("\n\n", fp);
1.1 jfb 494:
495: TAILQ_FOREACH(rdp, &(rfp->rf_delta), rd_list) {
496: fprintf(fp, "%s\n", rcsnum_tostr(rdp->rd_num, numbuf,
497: sizeof(numbuf)));
498: fprintf(fp, "date\t%d.%02d.%02d.%02d.%02d.%02d;",
1.44 jfb 499: rdp->rd_date.tm_year + 1900, rdp->rd_date.tm_mon + 1,
1.1 jfb 500: rdp->rd_date.tm_mday, rdp->rd_date.tm_hour,
501: rdp->rd_date.tm_min, rdp->rd_date.tm_sec);
502: fprintf(fp, "\tauthor %s;\tstate %s;\n",
503: rdp->rd_author, rdp->rd_state);
1.46 jfb 504: fputs("branches", fp);
505: TAILQ_FOREACH(brp, &(rdp->rd_branches), rb_list) {
506: fprintf(fp, " %s", rcsnum_tostr(brp->rb_num, numbuf,
507: sizeof(numbuf)));
508: }
509: fputs(";\n", fp);
1.1 jfb 510: fprintf(fp, "next\t%s;\n\n", rcsnum_tostr(rdp->rd_next,
511: numbuf, sizeof(numbuf)));
512: }
513:
1.42 jfb 514: fputs("\ndesc\n@", fp);
1.141 ray 515: if (rfp->rf_desc != NULL && (len = strlen(rfp->rf_desc)) > 0) {
1.100 xsa 516: rcs_strprint((const u_char *)rfp->rf_desc, len, fp);
517: if (rfp->rf_desc[len-1] != '\n')
518: fputc('\n', fp);
519: }
520: fputs("@\n", fp);
1.1 jfb 521:
522: /* deltatexts */
523: TAILQ_FOREACH(rdp, &(rfp->rf_delta), rd_list) {
1.100 xsa 524: fprintf(fp, "\n\n%s\n", rcsnum_tostr(rdp->rd_num, numbuf,
1.1 jfb 525: sizeof(numbuf)));
1.42 jfb 526: fputs("log\n@", fp);
1.100 xsa 527: if (rdp->rd_log != NULL) {
528: len = strlen(rdp->rd_log);
529: rcs_strprint((const u_char *)rdp->rd_log, len, fp);
530: if (rdp->rd_log[len-1] != '\n')
531: fputc('\n', fp);
532: }
1.42 jfb 533: fputs("@\ntext\n@", fp);
1.100 xsa 534: if (rdp->rd_text != NULL) {
535: rcs_strprint(rdp->rd_text, rdp->rd_tlen, fp);
1.103 joris 536:
537: if (rdp->rd_tlen != 0) {
538: if (rdp->rd_text[rdp->rd_tlen-1] != '\n')
539: fputc('\n', fp);
540: }
1.100 xsa 541: }
542: fputs("@\n", fp);
1.1 jfb 543: }
544: fclose(fp);
1.73 joris 545:
1.72 niallo 546: /*
547: * We try to use rename() to atomically put the new file in place.
548: * If that fails, we try a copy.
549: */
550: if (rename(fn, rfp->rf_path) == -1) {
551: if (errno == EXDEV) {
552: /* rename() not supported so we have to copy. */
553: if ((chmod(rfp->rf_path, S_IWUSR) == -1)
554: && !(rfp->rf_flags & RCS_CREATE)) {
1.113 xsa 555: fatal("chmod(%s, 0%o) failed",
556: rfp->rf_path, S_IWUSR);
1.72 niallo 557: }
1.73 joris 558:
1.72 niallo 559: if ((from_fd = open(fn, O_RDONLY)) == -1) {
560: cvs_log(LP_ERRNO, "failed to open `%s'",
561: rfp->rf_path);
562: return (-1);
563: }
1.73 joris 564:
1.80 reyk 565: if ((to_fd = open(rfp->rf_path,
566: O_WRONLY|O_TRUNC|O_CREAT)) == -1) {
1.73 joris 567: cvs_log(LP_ERRNO, "failed to open `%s'", fn);
1.72 niallo 568: close(from_fd);
569: return (-1);
570: }
1.73 joris 571:
1.110 joris 572: bp = xmalloc(MAXBSIZE);
1.72 niallo 573: while ((nread = read(from_fd, bp, MAXBSIZE)) > 0) {
574: if (write(to_fd, bp, nread) != nread)
575: goto err;
576: }
1.73 joris 577:
1.72 niallo 578: if (nread < 0) {
579: err: if (unlink(rfp->rf_path) == -1)
580: cvs_log(LP_ERRNO,
581: "failed to unlink `%s'",
582: rfp->rf_path);
583: close(from_fd);
584: close(to_fd);
1.110 joris 585: xfree(bp);
1.72 niallo 586: return (-1);
587: }
1.73 joris 588:
1.72 niallo 589: close(from_fd);
590: close(to_fd);
1.110 joris 591: xfree(bp);
1.73 joris 592:
1.72 niallo 593: if (unlink(fn) == -1) {
594: cvs_log(LP_ERRNO,
1.73 joris 595: "failed to unlink `%s'", fn);
1.72 niallo 596: return (-1);
597: }
598: } else {
599: cvs_log(LP_ERRNO,
600: "failed to access temp RCS output file");
601: return (-1);
602: }
603: }
1.73 joris 604:
1.72 niallo 605: if ((chmod(rfp->rf_path, S_IRUSR|S_IRGRP|S_IROTH) == -1)) {
606: cvs_log(LP_ERRNO, "failed to chmod `%s'",
607: rfp->rf_path);
608: return (-1);
609: }
1.73 joris 610:
1.26 jfb 611: rfp->rf_flags |= RCS_SYNCED;
1.1 jfb 612:
613: return (0);
614: }
615:
616: /*
1.43 jfb 617: * rcs_head_get()
618: *
619: * Retrieve the revision number of the head revision for the RCS file <file>.
620: */
1.60 xsa 621: const RCSNUM *
1.43 jfb 622: rcs_head_get(RCSFILE *file)
623: {
624: return (file->rf_head);
625: }
626:
627: /*
628: * rcs_head_set()
629: *
630: * Set the revision number of the head revision for the RCS file <file> to
631: * <rev>, which must reference a valid revision within the file.
632: */
633: int
1.117 niallo 634: rcs_head_set(RCSFILE *file, RCSNUM *rev)
1.43 jfb 635: {
636: struct rcs_delta *rd;
637:
638: if ((rd = rcs_findrev(file, rev)) == NULL)
639: return (-1);
640:
1.111 joris 641: if (file->rf_head == NULL)
642: file->rf_head = rcsnum_alloc();
1.43 jfb 643:
1.111 joris 644: rcsnum_cpy(rev, file->rf_head, 0);
1.70 moritz 645: file->rf_flags &= ~RCS_SYNCED;
1.43 jfb 646: return (0);
647: }
648:
649:
650: /*
1.35 jfb 651: * rcs_branch_get()
652: *
653: * Retrieve the default branch number for the RCS file <file>.
654: * Returns the number on success. If NULL is returned, then there is no
655: * default branch for this file.
656: */
1.60 xsa 657: const RCSNUM *
1.35 jfb 658: rcs_branch_get(RCSFILE *file)
659: {
660: return (file->rf_branch);
661: }
662:
663: /*
664: * rcs_branch_set()
665: *
666: * Set the default branch for the RCS file <file> to <bnum>.
667: * Returns 0 on success, -1 on failure.
668: */
669: int
670: rcs_branch_set(RCSFILE *file, const RCSNUM *bnum)
671: {
1.111 joris 672: if (file->rf_branch == NULL)
673: file->rf_branch = rcsnum_alloc();
1.35 jfb 674:
1.111 joris 675: rcsnum_cpy(bnum, file->rf_branch, 0);
1.70 moritz 676: file->rf_flags &= ~RCS_SYNCED;
1.35 jfb 677: return (0);
678: }
679:
680: /*
1.29 jfb 681: * rcs_access_add()
682: *
683: * Add the login name <login> to the access list for the RCS file <file>.
684: * Returns 0 on success, or -1 on failure.
685: */
686: int
687: rcs_access_add(RCSFILE *file, const char *login)
688: {
689: struct rcs_access *ap;
690:
691: /* first look for duplication */
692: TAILQ_FOREACH(ap, &(file->rf_access), ra_list) {
693: if (strcmp(ap->ra_name, login) == 0) {
1.32 jfb 694: rcs_errno = RCS_ERR_DUPENT;
1.29 jfb 695: return (-1);
696: }
697: }
698:
1.110 joris 699: ap = (struct rcs_access *)xmalloc(sizeof(*ap));
700: ap->ra_name = xstrdup(login);
1.29 jfb 701: TAILQ_INSERT_TAIL(&(file->rf_access), ap, ra_list);
702:
703: /* not synced anymore */
704: file->rf_flags &= ~RCS_SYNCED;
705: return (0);
706: }
707:
708: /*
709: * rcs_access_remove()
710: *
711: * Remove an entry with login name <login> from the access list of the RCS
712: * file <file>.
713: * Returns 0 on success, or -1 on failure.
714: */
715: int
716: rcs_access_remove(RCSFILE *file, const char *login)
717: {
718: struct rcs_access *ap;
719:
720: TAILQ_FOREACH(ap, &(file->rf_access), ra_list)
721: if (strcmp(ap->ra_name, login) == 0)
722: break;
723:
724: if (ap == NULL) {
1.32 jfb 725: rcs_errno = RCS_ERR_NOENT;
1.29 jfb 726: return (-1);
727: }
728:
729: TAILQ_REMOVE(&(file->rf_access), ap, ra_list);
1.110 joris 730: xfree(ap->ra_name);
731: xfree(ap);
1.29 jfb 732:
733: /* not synced anymore */
734: file->rf_flags &= ~RCS_SYNCED;
735: return (0);
736: }
737:
738: /*
1.26 jfb 739: * rcs_sym_add()
1.1 jfb 740: *
741: * Add a symbol to the list of symbols for the RCS file <rfp>. The new symbol
742: * is named <sym> and is bound to the RCS revision <snum>.
743: * Returns 0 on success, or -1 on failure.
744: */
745: int
1.26 jfb 746: rcs_sym_add(RCSFILE *rfp, const char *sym, RCSNUM *snum)
1.1 jfb 747: {
748: struct rcs_sym *symp;
749:
1.47 jfb 750: if (!rcs_sym_check(sym)) {
751: rcs_errno = RCS_ERR_BADSYM;
1.69 moritz 752: return (-1);
1.47 jfb 753: }
754:
1.1 jfb 755: /* first look for duplication */
756: TAILQ_FOREACH(symp, &(rfp->rf_symbols), rs_list) {
757: if (strcmp(symp->rs_name, sym) == 0) {
1.32 jfb 758: rcs_errno = RCS_ERR_DUPENT;
1.1 jfb 759: return (-1);
760: }
761: }
762:
1.110 joris 763: symp = (struct rcs_sym *)xmalloc(sizeof(*symp));
764: symp->rs_name = xstrdup(sym);
1.111 joris 765: symp->rs_num = rcsnum_alloc();
1.1 jfb 766: rcsnum_cpy(snum, symp->rs_num, 0);
767:
768: TAILQ_INSERT_HEAD(&(rfp->rf_symbols), symp, rs_list);
769:
770: /* not synced anymore */
1.26 jfb 771: rfp->rf_flags &= ~RCS_SYNCED;
1.1 jfb 772: return (0);
773: }
774:
775: /*
1.27 jfb 776: * rcs_sym_remove()
777: *
778: * Remove the symbol with name <sym> from the symbol list for the RCS file
779: * <file>. If no such symbol is found, the call fails and returns with an
780: * error.
781: * Returns 0 on success, or -1 on failure.
782: */
783: int
784: rcs_sym_remove(RCSFILE *file, const char *sym)
785: {
786: struct rcs_sym *symp;
787:
1.47 jfb 788: if (!rcs_sym_check(sym)) {
789: rcs_errno = RCS_ERR_BADSYM;
1.69 moritz 790: return (-1);
1.47 jfb 791: }
792:
1.27 jfb 793: TAILQ_FOREACH(symp, &(file->rf_symbols), rs_list)
794: if (strcmp(symp->rs_name, sym) == 0)
795: break;
796:
797: if (symp == NULL) {
1.32 jfb 798: rcs_errno = RCS_ERR_NOENT;
1.27 jfb 799: return (-1);
800: }
801:
802: TAILQ_REMOVE(&(file->rf_symbols), symp, rs_list);
1.110 joris 803: xfree(symp->rs_name);
1.27 jfb 804: rcsnum_free(symp->rs_num);
1.110 joris 805: xfree(symp);
1.27 jfb 806:
807: /* not synced anymore */
808: file->rf_flags &= ~RCS_SYNCED;
809: return (0);
810: }
811:
812: /*
813: * rcs_sym_getrev()
814: *
815: * Retrieve the RCS revision number associated with the symbol <sym> for the
816: * RCS file <file>. The returned value is a dynamically-allocated copy and
817: * should be freed by the caller once they are done with it.
818: * Returns the RCSNUM on success, or NULL on failure.
819: */
1.60 xsa 820: RCSNUM *
1.27 jfb 821: rcs_sym_getrev(RCSFILE *file, const char *sym)
822: {
823: RCSNUM *num;
824: struct rcs_sym *symp;
825:
1.47 jfb 826: if (!rcs_sym_check(sym)) {
827: rcs_errno = RCS_ERR_BADSYM;
828: return (NULL);
829: }
830:
1.27 jfb 831: num = NULL;
832: TAILQ_FOREACH(symp, &(file->rf_symbols), rs_list)
833: if (strcmp(symp->rs_name, sym) == 0)
834: break;
835:
1.111 joris 836: if (symp == NULL) {
1.36 jfb 837: rcs_errno = RCS_ERR_NOENT;
1.111 joris 838: } else {
839: num = rcsnum_alloc();
840: rcsnum_cpy(symp->rs_num, num, 0);
1.27 jfb 841: }
842:
843: return (num);
1.47 jfb 844: }
845:
846: /*
847: * rcs_sym_check()
848: *
849: * Check the RCS symbol name <sym> for any unsupported characters.
850: * Returns 1 if the tag is correct, 0 if it isn't valid.
851: */
852: int
853: rcs_sym_check(const char *sym)
854: {
855: int ret;
856: const char *cp;
857:
858: ret = 1;
859: cp = sym;
860: if (!isalpha(*cp++))
861: return (0);
862:
863: for (; *cp != '\0'; cp++)
864: if (!isgraph(*cp) || (strchr(rcs_sym_invch, *cp) != NULL)) {
865: ret = 0;
866: break;
867: }
868:
869: return (ret);
1.30 jfb 870: }
871:
872: /*
873: * rcs_lock_getmode()
874: *
875: * Retrieve the locking mode of the RCS file <file>.
876: */
877: int
878: rcs_lock_getmode(RCSFILE *file)
879: {
880: return (file->rf_flags & RCS_SLOCK) ? RCS_LOCK_STRICT : RCS_LOCK_LOOSE;
881: }
882:
883: /*
884: * rcs_lock_setmode()
885: *
886: * Set the locking mode of the RCS file <file> to <mode>, which must either
887: * be RCS_LOCK_LOOSE or RCS_LOCK_STRICT.
888: * Returns the previous mode on success, or -1 on failure.
889: */
890: int
891: rcs_lock_setmode(RCSFILE *file, int mode)
892: {
893: int pmode;
894: pmode = rcs_lock_getmode(file);
895:
896: if (mode == RCS_LOCK_STRICT)
897: file->rf_flags |= RCS_SLOCK;
898: else if (mode == RCS_LOCK_LOOSE)
899: file->rf_flags &= ~RCS_SLOCK;
1.145 xsa 900: else
901: fatal("rcs_lock_setmode: invalid mode `%d'", mode);
1.30 jfb 902:
1.70 moritz 903: file->rf_flags &= ~RCS_SYNCED;
1.30 jfb 904: return (pmode);
1.27 jfb 905: }
906:
907: /*
1.40 jfb 908: * rcs_lock_add()
909: *
910: * Add an RCS lock for the user <user> on revision <rev>.
911: * Returns 0 on success, or -1 on failure.
912: */
913: int
914: rcs_lock_add(RCSFILE *file, const char *user, RCSNUM *rev)
915: {
916: struct rcs_lock *lkp;
917:
918: /* first look for duplication */
919: TAILQ_FOREACH(lkp, &(file->rf_locks), rl_list) {
1.109 joris 920: if ((strcmp(lkp->rl_name, user) == 0) &&
921: (rcsnum_cmp(rev, lkp->rl_num, 0) == 0)) {
1.40 jfb 922: rcs_errno = RCS_ERR_DUPENT;
923: return (-1);
924: }
925: }
926:
1.110 joris 927: lkp = (struct rcs_lock *)xmalloc(sizeof(*lkp));
928: lkp->rl_name = xstrdup(user);
1.111 joris 929: lkp->rl_num = rcsnum_alloc();
1.68 moritz 930: rcsnum_cpy(rev, lkp->rl_num, 0);
1.40 jfb 931:
932: TAILQ_INSERT_TAIL(&(file->rf_locks), lkp, rl_list);
933:
934: /* not synced anymore */
935: file->rf_flags &= ~RCS_SYNCED;
936: return (0);
937:
938:
939: }
940:
941:
942: /*
943: * rcs_lock_remove()
944: *
945: * Remove the RCS lock on revision <rev>.
946: * Returns 0 on success, or -1 on failure.
947: */
948: int
1.109 joris 949: rcs_lock_remove(RCSFILE *file, const char *user, RCSNUM *rev)
1.40 jfb 950: {
951: struct rcs_lock *lkp;
952:
1.109 joris 953: TAILQ_FOREACH(lkp, &(file->rf_locks), rl_list) {
954: if ((strcmp(lkp->rl_name, user) == 0) &&
955: (rcsnum_cmp(lkp->rl_num, rev, 0) == 0))
1.40 jfb 956: break;
1.109 joris 957: }
1.40 jfb 958:
959: if (lkp == NULL) {
960: rcs_errno = RCS_ERR_NOENT;
961: return (-1);
962: }
963:
964: TAILQ_REMOVE(&(file->rf_locks), lkp, rl_list);
965: rcsnum_free(lkp->rl_num);
1.110 joris 966: xfree(lkp->rl_name);
967: xfree(lkp);
1.40 jfb 968:
969: /* not synced anymore */
970: file->rf_flags &= ~RCS_SYNCED;
971: return (0);
972: }
973:
974: /*
1.27 jfb 975: * rcs_desc_get()
976: *
977: * Retrieve the description for the RCS file <file>.
978: */
1.57 xsa 979: const char *
1.27 jfb 980: rcs_desc_get(RCSFILE *file)
981: {
982: return (file->rf_desc);
983: }
984:
985: /*
986: * rcs_desc_set()
987: *
988: * Set the description for the RCS file <file>.
989: * Returns 0 on success, or -1 on failure.
990: */
991: int
992: rcs_desc_set(RCSFILE *file, const char *desc)
993: {
994: char *tmp;
995:
1.110 joris 996: tmp = xstrdup(desc);
1.27 jfb 997: if (file->rf_desc != NULL)
1.110 joris 998: xfree(file->rf_desc);
1.27 jfb 999: file->rf_desc = tmp;
1000: file->rf_flags &= ~RCS_SYNCED;
1001:
1002: return (0);
1.51 jfb 1003: }
1004:
1005: /*
1006: * rcs_comment_lookup()
1007: *
1008: * Lookup the assumed comment leader based on a file's suffix.
1009: * Returns a pointer to the string on success, or NULL on failure.
1010: */
1.57 xsa 1011: const char *
1.51 jfb 1012: rcs_comment_lookup(const char *filename)
1013: {
1014: int i;
1015: const char *sp;
1016:
1017: if ((sp = strrchr(filename, '.')) == NULL) {
1018: rcs_errno = RCS_ERR_NOENT;
1019: return (NULL);
1020: }
1021: sp++;
1022:
1023: for (i = 0; i < (int)NB_COMTYPES; i++)
1024: if (strcmp(rcs_comments[i].rc_suffix, sp) == 0)
1025: return (rcs_comments[i].rc_cstr);
1026: return (NULL);
1.27 jfb 1027: }
1028:
1.33 jfb 1029: /*
1030: * rcs_comment_get()
1031: *
1032: * Retrieve the comment leader for the RCS file <file>.
1033: */
1.57 xsa 1034: const char *
1.33 jfb 1035: rcs_comment_get(RCSFILE *file)
1036: {
1037: return (file->rf_comment);
1038: }
1039:
1040: /*
1041: * rcs_comment_set()
1042: *
1043: * Set the comment leader for the RCS file <file>.
1044: * Returns 0 on success, or -1 on failure.
1045: */
1046: int
1047: rcs_comment_set(RCSFILE *file, const char *comment)
1048: {
1049: char *tmp;
1050:
1.110 joris 1051: tmp = xstrdup(comment);
1.33 jfb 1052: if (file->rf_comment != NULL)
1.110 joris 1053: xfree(file->rf_comment);
1.33 jfb 1054: file->rf_comment = tmp;
1055: file->rf_flags &= ~RCS_SYNCED;
1056:
1057: return (0);
1058: }
1.40 jfb 1059:
1060: /*
1061: * rcs_tag_resolve()
1062: *
1063: * Retrieve the revision number corresponding to the tag <tag> for the RCS
1064: * file <file>.
1065: */
1.60 xsa 1066: RCSNUM *
1.40 jfb 1067: rcs_tag_resolve(RCSFILE *file, const char *tag)
1068: {
1069: RCSNUM *num;
1070:
1071: if ((num = rcsnum_parse(tag)) == NULL) {
1072: num = rcs_sym_getrev(file, tag);
1073: }
1074:
1075: return (num);
1076: }
1077:
1.94 joris 1078: int
1079: rcs_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines)
1.5 vincent 1080: {
1081: char op, *ep;
1.94 joris 1082: struct cvs_line *lp, *dlp, *ndlp;
1.5 vincent 1083: int i, lineno, nbln;
1.1 jfb 1084:
1.94 joris 1085: dlp = TAILQ_FIRST(&(dlines->l_lines));
1086: lp = TAILQ_FIRST(&(plines->l_lines));
1.1 jfb 1087:
1088: /* skip first bogus line */
1.94 joris 1089: for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
1090: lp = TAILQ_NEXT(lp, l_list)) {
1091: op = *(lp->l_line);
1092: lineno = (int)strtol((lp->l_line + 1), &ep, 10);
1093: if ((lineno > dlines->l_nblines) || (lineno < 0) ||
1.132 niallo 1094: (*ep != ' '))
1095: fatal("invalid line specification in RCS patch");
1.1 jfb 1096: ep++;
1097: nbln = (int)strtol(ep, &ep, 10);
1.132 niallo 1098: if ((nbln < 0) || (*ep != '\0'))
1099: fatal("invalid line number specification in RCS patch");
1.1 jfb 1100:
1101: /* find the appropriate line */
1102: for (;;) {
1103: if (dlp == NULL)
1104: break;
1.94 joris 1105: if (dlp->l_lineno == lineno)
1.1 jfb 1106: break;
1.94 joris 1107: if (dlp->l_lineno > lineno) {
1108: dlp = TAILQ_PREV(dlp, cvs_tqh, l_list);
1109: } else if (dlp->l_lineno < lineno) {
1.133 niallo 1110: if (((ndlp = TAILQ_NEXT(dlp, l_list)) == NULL) ||
1.138 deraadt 1111: (ndlp->l_lineno > lineno))
1.1 jfb 1112: break;
1113: dlp = ndlp;
1114: }
1115: }
1.132 niallo 1116: if (dlp == NULL)
1117: fatal("can't find referenced line in RCS patch");
1.1 jfb 1118:
1119: if (op == 'd') {
1120: for (i = 0; (i < nbln) && (dlp != NULL); i++) {
1.94 joris 1121: ndlp = TAILQ_NEXT(dlp, l_list);
1122: TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
1.1 jfb 1123: dlp = ndlp;
1.133 niallo 1124: /* last line is gone - reset dlp */
1125: if (dlp == NULL) {
1126: ndlp = TAILQ_LAST(&(dlines->l_lines),
1127: cvs_tqh);
1128: dlp = ndlp;
1129: }
1.1 jfb 1130: }
1.14 deraadt 1131: } else if (op == 'a') {
1.1 jfb 1132: for (i = 0; i < nbln; i++) {
1133: ndlp = lp;
1.94 joris 1134: lp = TAILQ_NEXT(lp, l_list);
1.132 niallo 1135: if (lp == NULL)
1136: fatal("truncated RCS patch");
1.94 joris 1137: TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
1138: TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
1139: lp, l_list);
1.1 jfb 1140: dlp = lp;
1141:
1142: /* we don't want lookup to block on those */
1.94 joris 1143: lp->l_lineno = lineno;
1.1 jfb 1144:
1145: lp = ndlp;
1146: }
1.132 niallo 1147: } else
1148: fatal("unknown RCS patch operation `%c'", op);
1.1 jfb 1149:
1150: /* last line of the patch, done */
1.94 joris 1151: if (lp->l_lineno == plines->l_nblines)
1.1 jfb 1152: break;
1153: }
1154:
1155: /* once we're done patching, rebuild the line numbers */
1.2 vincent 1156: lineno = 0;
1.94 joris 1157: TAILQ_FOREACH(lp, &(dlines->l_lines), l_list)
1158: lp->l_lineno = lineno++;
1159: dlines->l_nblines = lineno - 1;
1.1 jfb 1160:
1.5 vincent 1161: return (0);
1.1 jfb 1162: }
1163:
1164: /*
1165: * rcs_getrev()
1166: *
1167: * Get the whole contents of revision <rev> from the RCSFILE <rfp>. The
1.4 vincent 1168: * returned buffer is dynamically allocated and should be released using
1169: * cvs_buf_free() once the caller is done using it.
1.1 jfb 1170: */
1171: BUF*
1.66 joris 1172: rcs_getrev(RCSFILE *rfp, RCSNUM *frev)
1.1 jfb 1173: {
1.131 niallo 1174: int res;
1.1 jfb 1175: size_t len;
1176: void *bp;
1.66 joris 1177: RCSNUM *crev, *rev;
1.125 niallo 1178: BUF *rbuf;
1.1 jfb 1179: struct rcs_delta *rdp = NULL;
1180:
1.28 jfb 1181: if (rfp->rf_head == NULL)
1182: return (NULL);
1.66 joris 1183:
1184: if (frev == RCS_HEAD_REV)
1185: rev = rfp->rf_head;
1186: else
1187: rev = frev;
1.28 jfb 1188:
1.1 jfb 1189: res = rcsnum_cmp(rfp->rf_head, rev, 0);
1190: if (res == 1) {
1.32 jfb 1191: rcs_errno = RCS_ERR_NOENT;
1.1 jfb 1192: return (NULL);
1.26 jfb 1193: }
1194:
1.117 niallo 1195: /* No matter what, we're going to need up the the description parsed */
1196: rcs_parse_desc(rfp, NULL);
1197:
1.26 jfb 1198: rdp = rcs_findrev(rfp, rfp->rf_head);
1199: if (rdp == NULL) {
1200: cvs_log(LP_ERR, "failed to get RCS HEAD revision");
1201: return (NULL);
1202: }
1.117 niallo 1203: if (rdp->rd_tlen == 0)
1204: rcs_parse_deltatexts(rfp, rfp->rf_head);
1.45 jfb 1205: len = rdp->rd_tlen;
1.115 niallo 1206: if (len == 0) {
1207: rbuf = cvs_buf_alloc(1, 0);
1208: cvs_buf_empty(rbuf);
1209: return (rbuf);
1210: }
1.26 jfb 1211:
1.116 joris 1212: rbuf = cvs_buf_alloc(len, BUF_AUTOEXT);
1.26 jfb 1213: cvs_buf_append(rbuf, rdp->rd_text, len);
1214:
1215: if (res != 0) {
1216: /* Apply patches backwards to get the right version.
1217: * This will need some rework to support sub branches.
1218: */
1219: do {
1.87 joris 1220: crev = rdp->rd_next;
1.26 jfb 1221: rdp = rcs_findrev(rfp, crev);
1222: if (rdp == NULL) {
1223: cvs_buf_free(rbuf);
1224: return (NULL);
1225: }
1.114 xsa 1226: cvs_buf_putc(rbuf, '\0');
1.117 niallo 1227: /* check if we have parsed this rev's deltatext */
1228: if (rdp->rd_tlen == 0)
1229: rcs_parse_deltatexts(rfp, rdp->rd_num);
1.114 xsa 1230:
1.26 jfb 1231: bp = cvs_buf_release(rbuf);
1.94 joris 1232: rbuf = cvs_patchfile((char *)bp, (char *)rdp->rd_text,
1233: rcs_patch_lines);
1.110 joris 1234: xfree(bp);
1.26 jfb 1235: if (rbuf == NULL)
1236: break;
1237: } while (rcsnum_cmp(crev, rev, 0) != 0);
1.1 jfb 1238: }
1.125 niallo 1239: if (cvs_buf_getc(rbuf, cvs_buf_len(rbuf)-1) != '\n'
1240: && rbuf != NULL)
1241: cvs_buf_putc(rbuf, '\n');
1242: return (rbuf);
1.1 jfb 1243: }
1244:
1245: /*
1.52 jfb 1246: * rcs_rev_add()
1247: *
1.53 jfb 1248: * Add a revision to the RCS file <rf>. The new revision's number can be
1249: * specified in <rev> (which can also be RCS_HEAD_REV, in which case the
1250: * new revision will have a number equal to the previous head revision plus
1251: * one). The <msg> argument specifies the log message for that revision, and
1252: * <date> specifies the revision's date (a value of -1 is
1253: * equivalent to using the current time).
1.96 xsa 1254: * If <username> is NULL, set the author for this revision to the current user.
1.90 niallo 1255: * Otherwise, set it to <username>.
1.52 jfb 1256: * Returns 0 on success, or -1 on failure.
1257: */
1258: int
1.90 niallo 1259: rcs_rev_add(RCSFILE *rf, RCSNUM *rev, const char *msg, time_t date,
1260: const char *username)
1.52 jfb 1261: {
1262: time_t now;
1263: struct passwd *pw;
1.83 joris 1264: struct rcs_delta *ordp, *rdp;
1265:
1.52 jfb 1266: if (rev == RCS_HEAD_REV) {
1.101 niallo 1267: if (rf->rf_flags & RCS_CREATE) {
1268: if ((rev = rcsnum_parse(RCS_HEAD_INIT)) == NULL)
1269: return (-1);
1.111 joris 1270: rf->rf_head = rcsnum_alloc();
1.101 niallo 1271: rcsnum_cpy(rev, rf->rf_head, 0);
1272: } else {
1273: rev = rcsnum_inc(rf->rf_head);
1274: }
1.83 joris 1275: } else {
1276: if ((rdp = rcs_findrev(rf, rev)) != NULL) {
1277: rcs_errno = RCS_ERR_DUPENT;
1278: return (-1);
1279: }
1.52 jfb 1280: }
1281:
1.112 xsa 1282: if ((pw = getpwuid(getuid())) == NULL)
1283: fatal("getpwuid failed");
1.52 jfb 1284:
1.110 joris 1285: rdp = (struct rcs_delta *)xmalloc(sizeof(*rdp));
1.52 jfb 1286: memset(rdp, 0, sizeof(*rdp));
1287:
1288: TAILQ_INIT(&(rdp->rd_branches));
1289: TAILQ_INIT(&(rdp->rd_snodes));
1290:
1.111 joris 1291: rdp->rd_num = rcsnum_alloc();
1.52 jfb 1292: rcsnum_cpy(rev, rdp->rd_num, 0);
1.83 joris 1293:
1.111 joris 1294: rdp->rd_next = rcsnum_alloc();
1.92 joris 1295:
1.143 niallo 1296: if (!(rf->rf_flags & RCS_CREATE)) {
1297: /* next should point to the previous HEAD */
1298: ordp = TAILQ_FIRST(&(rf->rf_delta));
1299: rcsnum_cpy(ordp->rd_num, rdp->rd_next, 0);
1300: }
1.101 niallo 1301:
1.52 jfb 1302:
1.90 niallo 1303: if (username == NULL)
1304: username = pw->pw_name;
1305:
1.110 joris 1306: rdp->rd_author = xstrdup(username);
1307: rdp->rd_state = xstrdup(RCS_STATE_EXP);
1308: rdp->rd_log = xstrdup(msg);
1.52 jfb 1309:
1.53 jfb 1310: if (date != (time_t)(-1))
1311: now = date;
1312: else
1313: time(&now);
1.52 jfb 1314: gmtime_r(&now, &(rdp->rd_date));
1315:
1316: TAILQ_INSERT_HEAD(&(rf->rf_delta), rdp, rd_list);
1317: rf->rf_ndelta++;
1.81 niallo 1318:
1.64 niallo 1319: /* not synced anymore */
1320: rf->rf_flags &= ~RCS_SYNCED;
1.52 jfb 1321:
1322: return (0);
1323: }
1324:
1325: /*
1326: * rcs_rev_remove()
1327: *
1328: * Remove the revision whose number is <rev> from the RCS file <rf>.
1329: */
1330: int
1331: rcs_rev_remove(RCSFILE *rf, RCSNUM *rev)
1332: {
1333: int ret;
1334: struct rcs_delta *rdp;
1335:
1336: ret = 0;
1337: if (rev == RCS_HEAD_REV)
1338: rev = rf->rf_head;
1339:
1340: /* do we actually have that revision? */
1341: if ((rdp = rcs_findrev(rf, rev)) == NULL) {
1342: rcs_errno = RCS_ERR_NOENT;
1343: ret = -1;
1344: } else {
1345: /* XXX assumes it's not a sub node */
1346: TAILQ_REMOVE(&(rf->rf_delta), rdp, rd_list);
1347: rf->rf_ndelta--;
1348: rf->rf_flags &= ~RCS_SYNCED;
1349: }
1350:
1351: return (ret);
1352:
1353: }
1354:
1355: /*
1.1 jfb 1356: * rcs_findrev()
1357: *
1358: * Find a specific revision's delta entry in the tree of the RCS file <rfp>.
1359: * The revision number is given in <rev>.
1360: * Returns a pointer to the delta on success, or NULL on failure.
1361: */
1.102 xsa 1362: struct rcs_delta *
1.117 niallo 1363: rcs_findrev(RCSFILE *rfp, RCSNUM *rev)
1.1 jfb 1364: {
1365: u_int cmplen;
1.117 niallo 1366: struct rcs_delta *rdp, *enddelta;
1.1 jfb 1367: struct rcs_dlist *hp;
1.6 vincent 1368: int found;
1.26 jfb 1369:
1.117 niallo 1370: /*
1371: * We need to do more parsing if the last revision in the linked list
1372: * is greater than the requested revision.
1373: */
1374: enddelta = TAILQ_LAST(&(rfp->rf_delta), rcs_dlist);
1375: if ((enddelta == NULL)
1376: || (rcsnum_cmp(enddelta->rd_num, rev, -1) == -1)) {
1377: rcs_parse_deltas(rfp, rev);
1378: }
1379:
1.1 jfb 1380: cmplen = 2;
1381: hp = &(rfp->rf_delta);
1382:
1.6 vincent 1383: do {
1384: found = 0;
1385: TAILQ_FOREACH(rdp, hp, rd_list) {
1386: if (rcsnum_cmp(rdp->rd_num, rev, cmplen) == 0) {
1387: if (cmplen == rev->rn_len)
1388: return (rdp);
1.1 jfb 1389:
1.6 vincent 1390: hp = &(rdp->rd_snodes);
1391: cmplen += 2;
1392: found = 1;
1393: break;
1394: }
1.1 jfb 1395: }
1.6 vincent 1396: } while (found && cmplen < rev->rn_len);
1.1 jfb 1397:
1398: return (NULL);
1.20 jfb 1399: }
1400:
1401: /*
1.26 jfb 1402: * rcs_kwexp_set()
1403: *
1404: * Set the keyword expansion mode to use on the RCS file <file> to <mode>.
1405: * Returns 0 on success, or -1 on failure.
1406: */
1407: int
1408: rcs_kwexp_set(RCSFILE *file, int mode)
1409: {
1410: int i;
1411: char *tmp, buf[8] = "";
1412:
1413: if (RCS_KWEXP_INVAL(mode))
1414: return (-1);
1415:
1416: i = 0;
1417: if (mode == RCS_KWEXP_NONE)
1418: buf[0] = 'b';
1419: else if (mode == RCS_KWEXP_OLD)
1420: buf[0] = 'o';
1421: else {
1422: if (mode & RCS_KWEXP_NAME)
1423: buf[i++] = 'k';
1424: if (mode & RCS_KWEXP_VAL)
1425: buf[i++] = 'v';
1426: if (mode & RCS_KWEXP_LKR)
1427: buf[i++] = 'l';
1428: }
1429:
1.110 joris 1430: tmp = xstrdup(buf);
1.27 jfb 1431: if (file->rf_expand != NULL)
1.99 niallo 1432: free(file->rf_expand);
1.26 jfb 1433: file->rf_expand = tmp;
1.64 niallo 1434: /* not synced anymore */
1435: file->rf_flags &= ~RCS_SYNCED;
1.26 jfb 1436:
1437: return (0);
1438: }
1439:
1440: /*
1441: * rcs_kwexp_get()
1442: *
1443: * Retrieve the keyword expansion mode to be used for the RCS file <file>.
1444: */
1445: int
1446: rcs_kwexp_get(RCSFILE *file)
1447: {
1448: return rcs_kflag_get(file->rf_expand);
1449: }
1450:
1451: /*
1.20 jfb 1452: * rcs_kflag_get()
1453: *
1454: * Get the keyword expansion mode from a set of character flags given in
1455: * <flags> and return the appropriate flag mask. In case of an error, the
1456: * returned mask will have the RCS_KWEXP_ERR bit set to 1.
1457: */
1458: int
1459: rcs_kflag_get(const char *flags)
1460: {
1461: int fl;
1462: size_t len;
1463: const char *fp;
1464:
1465: fl = 0;
1466: len = strlen(flags);
1467:
1468: for (fp = flags; *fp != '\0'; fp++) {
1469: if (*fp == 'k')
1470: fl |= RCS_KWEXP_NAME;
1471: else if (*fp == 'v')
1472: fl |= RCS_KWEXP_VAL;
1473: else if (*fp == 'l')
1474: fl |= RCS_KWEXP_LKR;
1475: else if (*fp == 'o') {
1476: if (len != 1)
1477: fl |= RCS_KWEXP_ERR;
1478: fl |= RCS_KWEXP_OLD;
1479: } else if (*fp == 'b') {
1480: if (len != 1)
1481: fl |= RCS_KWEXP_ERR;
1482: } else /* unknown letter */
1483: fl |= RCS_KWEXP_ERR;
1484: }
1485:
1486: return (fl);
1.32 jfb 1487: }
1488:
1489: /*
1490: * rcs_errstr()
1491: *
1492: * Get the error string matching the RCS error code <code>.
1493: */
1.57 xsa 1494: const char *
1.32 jfb 1495: rcs_errstr(int code)
1496: {
1.50 jfb 1497: const char *esp;
1498:
1499: if ((code < 0) || ((code >= (int)RCS_NERR) && (code != RCS_ERR_ERRNO)))
1500: esp = NULL;
1501: else if (code == RCS_ERR_ERRNO)
1502: esp = strerror(errno);
1503: else
1504: esp = rcs_errstrs[code];
1505: return (esp);
1.1 jfb 1506: }
1507:
1.21 jfb 1508: void
1509: rcs_kflag_usage(void)
1510: {
1511: fprintf(stderr, "Valid expansion modes include:\n"
1.22 jfb 1512: "\t-kkv\tGenerate keywords using the default form.\n"
1513: "\t-kkvl\tLike -kkv, except locker's name inserted.\n"
1514: "\t-kk\tGenerate only keyword names in keyword strings.\n"
1515: "\t-kv\tGenerate only keyword values in keyword strings.\n"
1516: "\t-ko\tGenerate old keyword string "
1.21 jfb 1517: "(no changes from checked in file).\n"
1.22 jfb 1518: "\t-kb\tGenerate binary file unmodified (merges not allowed).\n");
1.21 jfb 1519: }
1.1 jfb 1520:
1.117 niallo 1521: /* rcs_parse_deltas()
1522: *
1523: * Parse deltas. If <rev> is not NULL, parse only as far as that
1524: * revision. If <rev> is NULL, parse all deltas.
1525: */
1.146 ! xsa 1526: static void
1.117 niallo 1527: rcs_parse_deltas(RCSFILE *rfp, RCSNUM *rev)
1528: {
1529: int ret;
1530: struct rcs_delta *enddelta;
1.146 ! xsa 1531:
! 1532: if ((rfp->rf_flags & PARSED_DELTAS) || (rfp->rf_flags & RCS_CREATE))
! 1533: return;
! 1534:
1.117 niallo 1535: for (;;) {
1536: ret = rcs_parse_delta(rfp);
1537: if (rev != NULL) {
1538: enddelta = TAILQ_LAST(&(rfp->rf_delta), rcs_dlist);
1539: if (rcsnum_cmp(enddelta->rd_num, rev, -1) == 0)
1540: break;
1541: }
1542: if (ret == 0) {
1543: rfp->rf_flags |= PARSED_DELTAS;
1544: break;
1545: }
1546: else if (ret == -1)
1547: fatal("error parsing deltas");
1548: }
1549: }
1550:
1551: /* rcs_parse_deltatexts()
1552: *
1553: * Parse deltatexts. If <rev> is not NULL, parse only as far as that
1554: * revision. If <rev> is NULL, parse everything.
1555: */
1.146 ! xsa 1556: static void
1.117 niallo 1557: rcs_parse_deltatexts(RCSFILE *rfp, RCSNUM *rev)
1558: {
1559: int ret;
1560: struct rcs_delta *rdp;
1.146 ! xsa 1561:
1.117 niallo 1562: if ((rfp->rf_flags & PARSED_DELTATEXTS)
1563: || (rfp->rf_flags & RCS_CREATE))
1.146 ! xsa 1564: return;
! 1565:
1.117 niallo 1566: if (!(rfp->rf_flags & PARSED_DESC))
1567: rcs_parse_desc(rfp, rev);
1568: for (;;) {
1569: if (rev != NULL) {
1570: rdp = rcs_findrev(rfp, rev);
1571: if (rdp->rd_text != NULL)
1572: break;
1573: else
1574: ret = rcs_parse_deltatext(rfp);
1575: } else
1576: ret = rcs_parse_deltatext(rfp);
1577: if (ret == 0) {
1578: rfp->rf_flags |= PARSED_DELTATEXTS;
1579: break;
1580: }
1.146 ! xsa 1581: else if (ret == -1)
1.117 niallo 1582: fatal("problem parsing deltatexts");
1583: }
1584: }
1585:
1586: /* rcs_parse_desc()
1587: *
1588: * Parse RCS description.
1589: *
1590: * Returns 0 on success, -1 on failure.
1591: */
1592: static int
1593: rcs_parse_desc(RCSFILE *rfp, RCSNUM *rev)
1594: {
1595: int ret = 0;
1596: if ((rfp->rf_flags & PARSED_DESC)
1597: || (rfp->rf_flags & RCS_CREATE))
1598: return (0);
1.122 reyk 1599: if (!(rfp->rf_flags & PARSED_DELTAS))
1.117 niallo 1600: rcs_parse_deltas(rfp, rev);
1601: /* do parsing */
1602: ret = rcs_gettok(rfp);
1603: if (ret != RCS_TOK_DESC) {
1604: rcs_errno = RCS_ERR_PARSE;
1605: cvs_log(LP_ERR, "token `%s' found where RCS desc expected",
1606: RCS_TOKSTR(rfp));
1607: fatal("problem parsing RCS desc");
1608: return (-1);
1609: }
1610:
1611: ret = rcs_gettok(rfp);
1612: if (ret != RCS_TOK_STRING) {
1613: rcs_errno = RCS_ERR_PARSE;
1614: cvs_log(LP_ERR, "token `%s' found where RCS desc expected",
1615: RCS_TOKSTR(rfp));
1616: fatal("problem parsing RCS desc");
1617: }
1618:
1619: rfp->rf_desc = xstrdup(RCS_TOKSTR(rfp));
1620: rfp->rf_flags |= PARSED_DESC;
1621: return (0);
1622: }
1623:
1.1 jfb 1624: /*
1.117 niallo 1625: * rcs_parse_init()
1.1 jfb 1626: *
1.117 niallo 1627: * Initial parsing of file <path>, which are in the RCS format.
1628: * Just does admin section
1.1 jfb 1629: * Returns 0 on success, or -1 on failure.
1630: */
1.26 jfb 1631: static int
1.117 niallo 1632: rcs_parse_init(RCSFILE *rfp)
1.1 jfb 1633: {
1.117 niallo 1634: int ret, count;
1.1 jfb 1635: struct rcs_pdata *pdp;
1636:
1.117 niallo 1637: count = 0;
1.26 jfb 1638: if (rfp->rf_flags & RCS_PARSED)
1.1 jfb 1639: return (0);
1640:
1.110 joris 1641: pdp = (struct rcs_pdata *)xmalloc(sizeof(*pdp));
1.1 jfb 1642: memset(pdp, 0, sizeof(*pdp));
1643:
1.18 jfb 1644: pdp->rp_lines = 0;
1.1 jfb 1645: pdp->rp_pttype = RCS_TOK_ERR;
1646:
1.113 xsa 1647: if ((pdp->rp_file = fopen(rfp->rf_path, "r")) == NULL)
1648: fatal("fopen: `%s': %s", rfp->rf_path, strerror(errno));
1.1 jfb 1649:
1.110 joris 1650: pdp->rp_buf = (char *)xmalloc((size_t)RCS_BUFSIZE);
1.1 jfb 1651: pdp->rp_blen = RCS_BUFSIZE;
1.18 jfb 1652: pdp->rp_bufend = pdp->rp_buf + pdp->rp_blen - 1;
1.1 jfb 1653:
1654: /* ditch the strict lock */
1.26 jfb 1655: rfp->rf_flags &= ~RCS_SLOCK;
1.1 jfb 1656: rfp->rf_pdata = pdp;
1657:
1.31 jfb 1658: if ((ret = rcs_parse_admin(rfp)) < 0) {
1.1 jfb 1659: rcs_freepdata(pdp);
1.117 niallo 1660: fatal("could not parse admin data");
1.1 jfb 1661: }
1662:
1.117 niallo 1663: if (rfp->rf_flags & RCS_PARSE_FULLY)
1664: rcs_parse_deltatexts(rfp, NULL);
1.1 jfb 1665:
1.117 niallo 1666: rfp->rf_flags |= RCS_SYNCED;
1.1 jfb 1667: return (0);
1668: }
1669:
1670: /*
1671: * rcs_parse_admin()
1672: *
1673: * Parse the administrative portion of an RCS file.
1.31 jfb 1674: * Returns the type of the first token found after the admin section on
1675: * success, or -1 on failure.
1.1 jfb 1676: */
1677: static int
1678: rcs_parse_admin(RCSFILE *rfp)
1679: {
1680: u_int i;
1681: int tok, ntok, hmask;
1682: struct rcs_key *rk;
1683:
1684: /* hmask is a mask of the headers already encountered */
1685: hmask = 0;
1686: for (;;) {
1687: tok = rcs_gettok(rfp);
1688: if (tok == RCS_TOK_ERR) {
1.50 jfb 1689: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1690: cvs_log(LP_ERR, "parse error in RCS admin section");
1691: return (-1);
1.31 jfb 1692: } else if ((tok == RCS_TOK_NUM) || (tok == RCS_TOK_DESC)) {
1693: /*
1694: * Assume this is the start of the first delta or
1695: * that we are dealing with an empty RCS file and
1696: * we just found the description.
1697: */
1.1 jfb 1698: rcs_pushtok(rfp, RCS_TOKSTR(rfp), tok);
1.31 jfb 1699: return (tok);
1.1 jfb 1700: }
1701:
1702: rk = NULL;
1.18 jfb 1703: for (i = 0; i < RCS_NKEYS; i++)
1.1 jfb 1704: if (rcs_keys[i].rk_id == tok)
1705: rk = &(rcs_keys[i]);
1706:
1707: if (hmask & (1 << tok)) {
1.50 jfb 1708: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1709: cvs_log(LP_ERR, "duplicate RCS key");
1710: return (-1);
1711: }
1712: hmask |= (1 << tok);
1713:
1714: switch (tok) {
1715: case RCS_TOK_HEAD:
1716: case RCS_TOK_BRANCH:
1717: case RCS_TOK_COMMENT:
1718: case RCS_TOK_EXPAND:
1719: ntok = rcs_gettok(rfp);
1720: if (ntok == RCS_TOK_SCOLON)
1721: break;
1722: if (ntok != rk->rk_val) {
1.50 jfb 1723: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1724: cvs_log(LP_ERR,
1725: "invalid value type for RCS key `%s'",
1726: rk->rk_str);
1727: }
1728:
1729: if (tok == RCS_TOK_HEAD) {
1.111 joris 1730: if (rfp->rf_head == NULL)
1.28 jfb 1731: rfp->rf_head = rcsnum_alloc();
1.1 jfb 1732: rcsnum_aton(RCS_TOKSTR(rfp), NULL,
1733: rfp->rf_head);
1.14 deraadt 1734: } else if (tok == RCS_TOK_BRANCH) {
1.111 joris 1735: if (rfp->rf_branch == NULL)
1.35 jfb 1736: rfp->rf_branch = rcsnum_alloc();
1737: if (rcsnum_aton(RCS_TOKSTR(rfp), NULL,
1738: rfp->rf_branch) < 0)
1739: return (-1);
1.14 deraadt 1740: } else if (tok == RCS_TOK_COMMENT) {
1.110 joris 1741: rfp->rf_comment = xstrdup(RCS_TOKSTR(rfp));
1.14 deraadt 1742: } else if (tok == RCS_TOK_EXPAND) {
1.110 joris 1743: rfp->rf_expand = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 1744: }
1745:
1746: /* now get the expected semi-colon */
1747: ntok = rcs_gettok(rfp);
1748: if (ntok != RCS_TOK_SCOLON) {
1.50 jfb 1749: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1750: cvs_log(LP_ERR,
1751: "missing semi-colon after RCS `%s' key",
1.26 jfb 1752: rk->rk_str);
1.1 jfb 1753: return (-1);
1754: }
1755: break;
1756: case RCS_TOK_ACCESS:
1.29 jfb 1757: if (rcs_parse_access(rfp) < 0)
1758: return (-1);
1.1 jfb 1759: break;
1760: case RCS_TOK_SYMBOLS:
1.29 jfb 1761: if (rcs_parse_symbols(rfp) < 0)
1762: return (-1);
1.1 jfb 1763: break;
1764: case RCS_TOK_LOCKS:
1.29 jfb 1765: if (rcs_parse_locks(rfp) < 0)
1766: return (-1);
1.1 jfb 1767: break;
1768: default:
1.50 jfb 1769: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1770: cvs_log(LP_ERR,
1771: "unexpected token `%s' in RCS admin section",
1772: RCS_TOKSTR(rfp));
1773: return (-1);
1774: }
1775: }
1776:
1777: return (0);
1778: }
1779:
1780: /*
1781: * rcs_parse_delta()
1782: *
1783: * Parse an RCS delta section and allocate the structure to store that delta's
1784: * information in the <rfp> delta list.
1785: * Returns 1 if the section was parsed OK, 0 if it is the last delta, and
1786: * -1 on error.
1787: */
1788: static int
1789: rcs_parse_delta(RCSFILE *rfp)
1790: {
1791: int ret, tok, ntok, hmask;
1792: u_int i;
1793: char *tokstr;
1.3 vincent 1794: RCSNUM *datenum;
1.1 jfb 1795: struct rcs_delta *rdp;
1796: struct rcs_key *rk;
1797:
1.110 joris 1798: rdp = (struct rcs_delta *)xmalloc(sizeof(*rdp));
1.1 jfb 1799: memset(rdp, 0, sizeof(*rdp));
1800:
1801: rdp->rd_num = rcsnum_alloc();
1802: rdp->rd_next = rcsnum_alloc();
1803:
1804: TAILQ_INIT(&(rdp->rd_branches));
1.52 jfb 1805: TAILQ_INIT(&(rdp->rd_snodes));
1.1 jfb 1806:
1807: tok = rcs_gettok(rfp);
1808: if (tok != RCS_TOK_NUM) {
1.52 jfb 1809: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1810: cvs_log(LP_ERR, "unexpected token `%s' at start of delta",
1811: RCS_TOKSTR(rfp));
1812: rcs_freedelta(rdp);
1813: return (-1);
1814: }
1815: rcsnum_aton(RCS_TOKSTR(rfp), NULL, rdp->rd_num);
1816:
1817: hmask = 0;
1818: ret = 0;
1819: tokstr = NULL;
1820:
1821: for (;;) {
1822: tok = rcs_gettok(rfp);
1823: if (tok == RCS_TOK_ERR) {
1.50 jfb 1824: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1825: cvs_log(LP_ERR, "parse error in RCS delta section");
1826: rcs_freedelta(rdp);
1827: return (-1);
1.14 deraadt 1828: } else if (tok == RCS_TOK_NUM || tok == RCS_TOK_DESC) {
1.15 tedu 1829: rcs_pushtok(rfp, RCS_TOKSTR(rfp), tok);
1.1 jfb 1830: ret = (tok == RCS_TOK_NUM ? 1 : 0);
1831: break;
1832: }
1833:
1834: rk = NULL;
1.18 jfb 1835: for (i = 0; i < RCS_NKEYS; i++)
1.1 jfb 1836: if (rcs_keys[i].rk_id == tok)
1837: rk = &(rcs_keys[i]);
1838:
1839: if (hmask & (1 << tok)) {
1.50 jfb 1840: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1841: cvs_log(LP_ERR, "duplicate RCS key");
1842: rcs_freedelta(rdp);
1843: return (-1);
1844: }
1845: hmask |= (1 << tok);
1846:
1847: switch (tok) {
1848: case RCS_TOK_DATE:
1849: case RCS_TOK_AUTHOR:
1850: case RCS_TOK_STATE:
1851: case RCS_TOK_NEXT:
1852: ntok = rcs_gettok(rfp);
1853: if (ntok == RCS_TOK_SCOLON) {
1854: if (rk->rk_flags & RCS_VOPT)
1855: break;
1856: else {
1.50 jfb 1857: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1858: cvs_log(LP_ERR, "missing mandatory "
1859: "value to RCS key `%s'",
1860: rk->rk_str);
1861: rcs_freedelta(rdp);
1862: return (-1);
1863: }
1864: }
1865:
1866: if (ntok != rk->rk_val) {
1.50 jfb 1867: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1868: cvs_log(LP_ERR,
1869: "invalid value type for RCS key `%s'",
1870: rk->rk_str);
1871: rcs_freedelta(rdp);
1872: return (-1);
1873: }
1874:
1875: if (tokstr != NULL)
1.110 joris 1876: xfree(tokstr);
1877: tokstr = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 1878: /* now get the expected semi-colon */
1879: ntok = rcs_gettok(rfp);
1880: if (ntok != RCS_TOK_SCOLON) {
1.50 jfb 1881: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1882: cvs_log(LP_ERR,
1883: "missing semi-colon after RCS `%s' key",
1.26 jfb 1884: rk->rk_str);
1.110 joris 1885: xfree(tokstr);
1.1 jfb 1886: rcs_freedelta(rdp);
1887: return (-1);
1888: }
1889:
1890: if (tok == RCS_TOK_DATE) {
1.25 jfb 1891: if ((datenum = rcsnum_parse(tokstr)) == NULL) {
1.110 joris 1892: xfree(tokstr);
1.11 joris 1893: rcs_freedelta(rdp);
1894: return (-1);
1895: }
1.3 vincent 1896: if (datenum->rn_len != 6) {
1.50 jfb 1897: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1898: cvs_log(LP_ERR,
1899: "RCS date specification has %s "
1900: "fields",
1.3 vincent 1901: (datenum->rn_len > 6) ? "too many" :
1.1 jfb 1902: "missing");
1.110 joris 1903: xfree(tokstr);
1.1 jfb 1904: rcs_freedelta(rdp);
1.37 tedu 1905: rcsnum_free(datenum);
1906: return (-1);
1.1 jfb 1907: }
1.3 vincent 1908: rdp->rd_date.tm_year = datenum->rn_id[0];
1.19 jfb 1909: if (rdp->rd_date.tm_year >= 1900)
1910: rdp->rd_date.tm_year -= 1900;
1.3 vincent 1911: rdp->rd_date.tm_mon = datenum->rn_id[1] - 1;
1912: rdp->rd_date.tm_mday = datenum->rn_id[2];
1913: rdp->rd_date.tm_hour = datenum->rn_id[3];
1914: rdp->rd_date.tm_min = datenum->rn_id[4];
1915: rdp->rd_date.tm_sec = datenum->rn_id[5];
1916: rcsnum_free(datenum);
1.14 deraadt 1917: } else if (tok == RCS_TOK_AUTHOR) {
1.1 jfb 1918: rdp->rd_author = tokstr;
1919: tokstr = NULL;
1.14 deraadt 1920: } else if (tok == RCS_TOK_STATE) {
1.1 jfb 1921: rdp->rd_state = tokstr;
1922: tokstr = NULL;
1.14 deraadt 1923: } else if (tok == RCS_TOK_NEXT) {
1.1 jfb 1924: rcsnum_aton(tokstr, NULL, rdp->rd_next);
1925: }
1926: break;
1927: case RCS_TOK_BRANCHES:
1.46 jfb 1928: if (rcs_parse_branches(rfp, rdp) < 0) {
1929: rcs_freedelta(rdp);
1930: return (-1);
1931: }
1.1 jfb 1932: break;
1933: default:
1.50 jfb 1934: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1935: cvs_log(LP_ERR,
1936: "unexpected token `%s' in RCS delta",
1937: RCS_TOKSTR(rfp));
1938: rcs_freedelta(rdp);
1939: return (-1);
1940: }
1941: }
1942:
1.13 jfb 1943: if (tokstr != NULL)
1.110 joris 1944: xfree(tokstr);
1.13 jfb 1945:
1.1 jfb 1946: TAILQ_INSERT_TAIL(&(rfp->rf_delta), rdp, rd_list);
1.26 jfb 1947: rfp->rf_ndelta++;
1.1 jfb 1948:
1949: return (ret);
1950: }
1951:
1952: /*
1953: * rcs_parse_deltatext()
1954: *
1955: * Parse an RCS delta text section and fill in the log and text field of the
1956: * appropriate delta section.
1957: * Returns 1 if the section was parsed OK, 0 if it is the last delta, and
1958: * -1 on error.
1959: */
1960: static int
1961: rcs_parse_deltatext(RCSFILE *rfp)
1962: {
1963: int tok;
1964: RCSNUM *tnum;
1965: struct rcs_delta *rdp;
1966:
1967: tok = rcs_gettok(rfp);
1968: if (tok == RCS_TOK_EOF)
1969: return (0);
1970:
1971: if (tok != RCS_TOK_NUM) {
1.50 jfb 1972: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1973: cvs_log(LP_ERR,
1974: "unexpected token `%s' at start of RCS delta text",
1975: RCS_TOKSTR(rfp));
1976: return (-1);
1977: }
1.13 jfb 1978:
1979: tnum = rcsnum_alloc();
1.1 jfb 1980: rcsnum_aton(RCS_TOKSTR(rfp), NULL, tnum);
1981:
1982: TAILQ_FOREACH(rdp, &(rfp->rf_delta), rd_list) {
1983: if (rcsnum_cmp(tnum, rdp->rd_num, 0) == 0)
1984: break;
1985: }
1.13 jfb 1986: rcsnum_free(tnum);
1987:
1.1 jfb 1988: if (rdp == NULL) {
1989: cvs_log(LP_ERR, "RCS delta text `%s' has no matching delta",
1990: RCS_TOKSTR(rfp));
1991: return (-1);
1992: }
1993:
1994: tok = rcs_gettok(rfp);
1995: if (tok != RCS_TOK_LOG) {
1.50 jfb 1996: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1997: cvs_log(LP_ERR, "unexpected token `%s' where RCS log expected",
1998: RCS_TOKSTR(rfp));
1999: return (-1);
2000: }
2001:
2002: tok = rcs_gettok(rfp);
2003: if (tok != RCS_TOK_STRING) {
1.50 jfb 2004: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2005: cvs_log(LP_ERR, "unexpected token `%s' where RCS log expected",
2006: RCS_TOKSTR(rfp));
2007: return (-1);
2008: }
1.110 joris 2009: rdp->rd_log = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 2010: tok = rcs_gettok(rfp);
2011: if (tok != RCS_TOK_TEXT) {
1.50 jfb 2012: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2013: cvs_log(LP_ERR, "unexpected token `%s' where RCS text expected",
2014: RCS_TOKSTR(rfp));
2015: return (-1);
2016: }
2017:
2018: tok = rcs_gettok(rfp);
2019: if (tok != RCS_TOK_STRING) {
1.50 jfb 2020: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2021: cvs_log(LP_ERR, "unexpected token `%s' where RCS text expected",
2022: RCS_TOKSTR(rfp));
2023: return (-1);
2024: }
2025:
1.110 joris 2026: rdp->rd_text = (u_char *)xmalloc(RCS_TOKLEN(rfp) + 1);
1.74 joris 2027: strlcpy(rdp->rd_text, RCS_TOKSTR(rfp), (RCS_TOKLEN(rfp) + 1));
1.42 jfb 2028: rdp->rd_tlen = RCS_TOKLEN(rfp);
1.1 jfb 2029:
2030: return (1);
2031: }
2032:
2033: /*
2034: * rcs_parse_access()
2035: *
2036: * Parse the access list given as value to the `access' keyword.
2037: * Returns 0 on success, or -1 on failure.
2038: */
2039: static int
2040: rcs_parse_access(RCSFILE *rfp)
2041: {
2042: int type;
2043:
2044: while ((type = rcs_gettok(rfp)) != RCS_TOK_SCOLON) {
2045: if (type != RCS_TOK_ID) {
1.50 jfb 2046: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2047: cvs_log(LP_ERR, "unexpected token `%s' in access list",
2048: RCS_TOKSTR(rfp));
2049: return (-1);
2050: }
1.29 jfb 2051:
2052: if (rcs_access_add(rfp, RCS_TOKSTR(rfp)) < 0)
2053: return (-1);
1.1 jfb 2054: }
2055:
2056: return (0);
2057: }
2058:
2059: /*
2060: * rcs_parse_symbols()
2061: *
2062: * Parse the symbol list given as value to the `symbols' keyword.
2063: * Returns 0 on success, or -1 on failure.
2064: */
2065: static int
2066: rcs_parse_symbols(RCSFILE *rfp)
2067: {
2068: int type;
2069: struct rcs_sym *symp;
2070:
2071: for (;;) {
2072: type = rcs_gettok(rfp);
2073: if (type == RCS_TOK_SCOLON)
2074: break;
2075:
1.41 jfb 2076: if (type != RCS_TOK_ID) {
1.50 jfb 2077: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2078: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2079: RCS_TOKSTR(rfp));
2080: return (-1);
2081: }
2082:
1.110 joris 2083: symp = (struct rcs_sym *)xmalloc(sizeof(*symp));
2084: symp->rs_name = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 2085: symp->rs_num = rcsnum_alloc();
2086:
2087: type = rcs_gettok(rfp);
2088: if (type != RCS_TOK_COLON) {
1.50 jfb 2089: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2090: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2091: RCS_TOKSTR(rfp));
1.11 joris 2092: rcsnum_free(symp->rs_num);
1.110 joris 2093: xfree(symp->rs_name);
2094: xfree(symp);
1.1 jfb 2095: return (-1);
2096: }
2097:
2098: type = rcs_gettok(rfp);
2099: if (type != RCS_TOK_NUM) {
1.50 jfb 2100: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2101: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2102: RCS_TOKSTR(rfp));
1.11 joris 2103: rcsnum_free(symp->rs_num);
1.110 joris 2104: xfree(symp->rs_name);
2105: xfree(symp);
1.1 jfb 2106: return (-1);
2107: }
2108:
2109: if (rcsnum_aton(RCS_TOKSTR(rfp), NULL, symp->rs_num) < 0) {
2110: cvs_log(LP_ERR, "failed to parse RCS NUM `%s'",
2111: RCS_TOKSTR(rfp));
1.11 joris 2112: rcsnum_free(symp->rs_num);
1.110 joris 2113: xfree(symp->rs_name);
2114: xfree(symp);
1.1 jfb 2115: return (-1);
2116: }
2117:
1.43 jfb 2118: TAILQ_INSERT_TAIL(&(rfp->rf_symbols), symp, rs_list);
1.1 jfb 2119: }
2120:
2121: return (0);
2122: }
2123:
2124: /*
2125: * rcs_parse_locks()
2126: *
2127: * Parse the lock list given as value to the `locks' keyword.
2128: * Returns 0 on success, or -1 on failure.
2129: */
2130: static int
2131: rcs_parse_locks(RCSFILE *rfp)
2132: {
2133: int type;
2134: struct rcs_lock *lkp;
2135:
2136: for (;;) {
2137: type = rcs_gettok(rfp);
2138: if (type == RCS_TOK_SCOLON)
2139: break;
2140:
2141: if (type != RCS_TOK_ID) {
1.50 jfb 2142: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2143: cvs_log(LP_ERR, "unexpected token `%s' in lock list",
2144: RCS_TOKSTR(rfp));
2145: return (-1);
2146: }
2147:
1.110 joris 2148: lkp = (struct rcs_lock *)xmalloc(sizeof(*lkp));
2149: lkp->rl_name = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 2150: lkp->rl_num = rcsnum_alloc();
2151:
2152: type = rcs_gettok(rfp);
2153: if (type != RCS_TOK_COLON) {
1.50 jfb 2154: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2155: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2156: RCS_TOKSTR(rfp));
1.37 tedu 2157: rcsnum_free(lkp->rl_num);
1.110 joris 2158: xfree(lkp->rl_name);
2159: xfree(lkp);
1.1 jfb 2160: return (-1);
2161: }
2162:
2163: type = rcs_gettok(rfp);
2164: if (type != RCS_TOK_NUM) {
1.50 jfb 2165: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2166: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2167: RCS_TOKSTR(rfp));
1.37 tedu 2168: rcsnum_free(lkp->rl_num);
1.110 joris 2169: xfree(lkp->rl_name);
2170: xfree(lkp);
1.1 jfb 2171: return (-1);
2172: }
2173:
2174: if (rcsnum_aton(RCS_TOKSTR(rfp), NULL, lkp->rl_num) < 0) {
2175: cvs_log(LP_ERR, "failed to parse RCS NUM `%s'",
2176: RCS_TOKSTR(rfp));
1.37 tedu 2177: rcsnum_free(lkp->rl_num);
1.110 joris 2178: xfree(lkp->rl_name);
2179: xfree(lkp);
1.1 jfb 2180: return (-1);
2181: }
2182:
2183: TAILQ_INSERT_HEAD(&(rfp->rf_locks), lkp, rl_list);
2184: }
2185:
2186: /* check if we have a `strict' */
2187: type = rcs_gettok(rfp);
2188: if (type != RCS_TOK_STRICT) {
2189: rcs_pushtok(rfp, RCS_TOKSTR(rfp), type);
1.14 deraadt 2190: } else {
1.26 jfb 2191: rfp->rf_flags |= RCS_SLOCK;
1.1 jfb 2192:
2193: type = rcs_gettok(rfp);
2194: if (type != RCS_TOK_SCOLON) {
1.50 jfb 2195: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2196: cvs_log(LP_ERR,
2197: "missing semi-colon after `strict' keyword");
2198: return (-1);
2199: }
2200: }
2201:
2202: return (0);
2203: }
2204:
2205: /*
2206: * rcs_parse_branches()
2207: *
2208: * Parse the list of branches following a `branches' keyword in a delta.
2209: * Returns 0 on success, or -1 on failure.
2210: */
2211: static int
2212: rcs_parse_branches(RCSFILE *rfp, struct rcs_delta *rdp)
2213: {
2214: int type;
2215: struct rcs_branch *brp;
2216:
2217: for (;;) {
2218: type = rcs_gettok(rfp);
2219: if (type == RCS_TOK_SCOLON)
2220: break;
2221:
2222: if (type != RCS_TOK_NUM) {
1.50 jfb 2223: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2224: cvs_log(LP_ERR,
2225: "unexpected token `%s' in list of branches",
2226: RCS_TOKSTR(rfp));
2227: return (-1);
2228: }
2229:
1.110 joris 2230: brp = (struct rcs_branch *)xmalloc(sizeof(*brp));
1.46 jfb 2231: brp->rb_num = rcsnum_parse(RCS_TOKSTR(rfp));
1.11 joris 2232: if (brp->rb_num == NULL) {
1.110 joris 2233: xfree(brp);
1.11 joris 2234: return (-1);
2235: }
1.1 jfb 2236:
2237: TAILQ_INSERT_TAIL(&(rdp->rd_branches), brp, rb_list);
2238: }
2239:
2240: return (0);
2241: }
2242:
2243: /*
2244: * rcs_freedelta()
2245: *
2246: * Free the contents of a delta structure.
2247: */
1.18 jfb 2248: static void
1.1 jfb 2249: rcs_freedelta(struct rcs_delta *rdp)
2250: {
1.12 jfb 2251: struct rcs_branch *rb;
1.1 jfb 2252: struct rcs_delta *crdp;
2253:
1.12 jfb 2254: if (rdp->rd_num != NULL)
2255: rcsnum_free(rdp->rd_num);
2256: if (rdp->rd_next != NULL)
2257: rcsnum_free(rdp->rd_next);
2258:
1.1 jfb 2259: if (rdp->rd_author != NULL)
1.110 joris 2260: xfree(rdp->rd_author);
1.109 joris 2261: if (rdp->rd_locker != NULL)
1.110 joris 2262: xfree(rdp->rd_locker);
1.1 jfb 2263: if (rdp->rd_state != NULL)
1.110 joris 2264: xfree(rdp->rd_state);
1.1 jfb 2265: if (rdp->rd_log != NULL)
1.110 joris 2266: xfree(rdp->rd_log);
1.1 jfb 2267: if (rdp->rd_text != NULL)
1.110 joris 2268: xfree(rdp->rd_text);
1.12 jfb 2269:
2270: while ((rb = TAILQ_FIRST(&(rdp->rd_branches))) != NULL) {
2271: TAILQ_REMOVE(&(rdp->rd_branches), rb, rb_list);
2272: rcsnum_free(rb->rb_num);
1.110 joris 2273: xfree(rb);
1.12 jfb 2274: }
1.1 jfb 2275:
2276: while ((crdp = TAILQ_FIRST(&(rdp->rd_snodes))) != NULL) {
2277: TAILQ_REMOVE(&(rdp->rd_snodes), crdp, rd_list);
2278: rcs_freedelta(crdp);
2279: }
2280:
1.110 joris 2281: xfree(rdp);
1.1 jfb 2282: }
2283:
2284: /*
2285: * rcs_freepdata()
2286: *
2287: * Free the contents of the parser data structure.
2288: */
2289: static void
2290: rcs_freepdata(struct rcs_pdata *pd)
2291: {
2292: if (pd->rp_file != NULL)
2293: (void)fclose(pd->rp_file);
2294: if (pd->rp_buf != NULL)
1.110 joris 2295: xfree(pd->rp_buf);
2296: xfree(pd);
1.1 jfb 2297: }
2298:
2299: /*
2300: * rcs_gettok()
2301: *
2302: * Get the next RCS token from the string <str>.
2303: */
2304: static int
2305: rcs_gettok(RCSFILE *rfp)
2306: {
2307: u_int i;
2308: int ch, last, type;
1.18 jfb 2309: size_t len;
2310: char *bp;
1.1 jfb 2311: struct rcs_pdata *pdp = (struct rcs_pdata *)rfp->rf_pdata;
2312:
2313: type = RCS_TOK_ERR;
2314: bp = pdp->rp_buf;
1.42 jfb 2315: pdp->rp_tlen = 0;
1.1 jfb 2316: *bp = '\0';
2317:
2318: if (pdp->rp_pttype != RCS_TOK_ERR) {
2319: type = pdp->rp_pttype;
2320: strlcpy(pdp->rp_buf, pdp->rp_ptok, pdp->rp_blen);
2321: pdp->rp_pttype = RCS_TOK_ERR;
2322: return (type);
2323: }
2324:
2325: /* skip leading whitespace */
2326: /* XXX we must skip backspace too for compatibility, should we? */
2327: do {
2328: ch = getc(pdp->rp_file);
2329: if (ch == '\n')
1.18 jfb 2330: pdp->rp_lines++;
1.1 jfb 2331: } while (isspace(ch));
2332:
2333: if (ch == EOF) {
2334: type = RCS_TOK_EOF;
1.14 deraadt 2335: } else if (ch == ';') {
1.1 jfb 2336: type = RCS_TOK_SCOLON;
1.14 deraadt 2337: } else if (ch == ':') {
1.1 jfb 2338: type = RCS_TOK_COLON;
1.14 deraadt 2339: } else if (isalpha(ch)) {
1.31 jfb 2340: type = RCS_TOK_ID;
1.1 jfb 2341: *(bp++) = ch;
1.18 jfb 2342: for (;;) {
1.1 jfb 2343: ch = getc(pdp->rp_file);
1.11 joris 2344: if (!isalnum(ch) && ch != '_' && ch != '-') {
1.1 jfb 2345: ungetc(ch, pdp->rp_file);
2346: break;
2347: }
2348: *(bp++) = ch;
1.42 jfb 2349: pdp->rp_tlen++;
1.18 jfb 2350: if (bp == pdp->rp_bufend - 1) {
2351: len = bp - pdp->rp_buf;
2352: if (rcs_growbuf(rfp) < 0) {
2353: type = RCS_TOK_ERR;
2354: break;
2355: }
2356: bp = pdp->rp_buf + len;
2357: }
1.1 jfb 2358: }
2359: *bp = '\0';
2360:
1.18 jfb 2361: if (type != RCS_TOK_ERR) {
2362: for (i = 0; i < RCS_NKEYS; i++) {
2363: if (strcmp(rcs_keys[i].rk_str,
2364: pdp->rp_buf) == 0) {
2365: type = rcs_keys[i].rk_id;
2366: break;
2367: }
1.1 jfb 2368: }
2369: }
1.14 deraadt 2370: } else if (ch == '@') {
1.1 jfb 2371: /* we have a string */
1.18 jfb 2372: type = RCS_TOK_STRING;
1.1 jfb 2373: for (;;) {
2374: ch = getc(pdp->rp_file);
2375: if (ch == '@') {
2376: ch = getc(pdp->rp_file);
2377: if (ch != '@') {
2378: ungetc(ch, pdp->rp_file);
2379: break;
2380: }
1.14 deraadt 2381: } else if (ch == '\n')
1.18 jfb 2382: pdp->rp_lines++;
1.1 jfb 2383:
2384: *(bp++) = ch;
1.42 jfb 2385: pdp->rp_tlen++;
1.18 jfb 2386: if (bp == pdp->rp_bufend - 1) {
2387: len = bp - pdp->rp_buf;
2388: if (rcs_growbuf(rfp) < 0) {
2389: type = RCS_TOK_ERR;
2390: break;
2391: }
2392: bp = pdp->rp_buf + len;
2393: }
1.1 jfb 2394: }
2395:
2396: *bp = '\0';
1.14 deraadt 2397: } else if (isdigit(ch)) {
1.1 jfb 2398: *(bp++) = ch;
2399: last = ch;
2400: type = RCS_TOK_NUM;
2401:
2402: for (;;) {
2403: ch = getc(pdp->rp_file);
1.18 jfb 2404: if (bp == pdp->rp_bufend)
1.1 jfb 2405: break;
2406: if (!isdigit(ch) && ch != '.') {
2407: ungetc(ch, pdp->rp_file);
2408: break;
2409: }
2410:
2411: if (last == '.' && ch == '.') {
2412: type = RCS_TOK_ERR;
2413: break;
2414: }
2415: last = ch;
2416: *(bp++) = ch;
1.42 jfb 2417: pdp->rp_tlen++;
1.1 jfb 2418: }
1.18 jfb 2419: *bp = '\0';
1.1 jfb 2420: }
2421:
2422: return (type);
2423: }
2424:
2425: /*
2426: * rcs_pushtok()
2427: *
2428: * Push a token back in the parser's token buffer.
2429: */
2430: static int
2431: rcs_pushtok(RCSFILE *rfp, const char *tok, int type)
2432: {
2433: struct rcs_pdata *pdp = (struct rcs_pdata *)rfp->rf_pdata;
2434:
2435: if (pdp->rp_pttype != RCS_TOK_ERR)
2436: return (-1);
2437:
2438: pdp->rp_pttype = type;
2439: strlcpy(pdp->rp_ptok, tok, sizeof(pdp->rp_ptok));
2440: return (0);
2441: }
2442:
1.18 jfb 2443:
2444: /*
2445: * rcs_growbuf()
2446: *
2447: * Attempt to grow the internal parse buffer for the RCS file <rf> by
2448: * RCS_BUFEXTSIZE.
2449: * In case of failure, the original buffer is left unmodified.
2450: * Returns 0 on success, or -1 on failure.
2451: */
2452: static int
2453: rcs_growbuf(RCSFILE *rf)
2454: {
2455: void *tmp;
2456: struct rcs_pdata *pdp = (struct rcs_pdata *)rf->rf_pdata;
2457:
1.119 niallo 2458: tmp = xrealloc(pdp->rp_buf, pdp->rp_blen + RCS_BUFEXTSIZE);
1.18 jfb 2459: if (tmp == NULL) {
1.50 jfb 2460: rcs_errno = RCS_ERR_ERRNO;
1.18 jfb 2461: cvs_log(LP_ERRNO, "failed to grow RCS parse buffer");
2462: return (-1);
2463: }
2464:
2465: pdp->rp_buf = (char *)tmp;
2466: pdp->rp_blen += RCS_BUFEXTSIZE;
2467: pdp->rp_bufend = pdp->rp_buf + pdp->rp_blen - 1;
1.42 jfb 2468:
2469: return (0);
2470: }
2471:
2472: /*
2473: * rcs_strprint()
2474: *
2475: * Output an RCS string <str> of size <slen> to the stream <stream>. Any
2476: * '@' characters are escaped. Otherwise, the string can contain arbitrary
2477: * binary data.
2478: */
2479: static int
2480: rcs_strprint(const u_char *str, size_t slen, FILE *stream)
2481: {
2482: const u_char *ap, *ep, *sp;
2483: size_t ret;
1.52 jfb 2484:
2485: if (slen == 0)
2486: return (0);
1.42 jfb 2487:
2488: ep = str + slen - 1;
2489:
2490: for (sp = str; sp <= ep;) {
2491: ap = memchr(sp, '@', ep - sp);
2492: if (ap == NULL)
2493: ap = ep;
2494: ret = fwrite(sp, sizeof(u_char), ap - sp + 1, stream);
2495:
2496: if (*ap == '@')
2497: putc('@', stream);
2498: sp = ap + 1;
1.63 joris 2499: }
2500:
2501: return (0);
2502: }
2503:
2504: /*
2505: * rcs_expand_keywords()
2506: *
1.125 niallo 2507: * Return expansion any RCS keywords in <data>
2508: *
2509: * On error, return NULL.
1.63 joris 2510: */
1.125 niallo 2511: static char *
2512: rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, char *data,
1.63 joris 2513: size_t len, int mode)
2514: {
1.125 niallo 2515: int kwtype, sizdiff;
2516: u_int i, j, found, start_offset, c_offset;
1.140 xsa 2517: char *c, *kwstr, *start, *end, *tbuf;
1.125 niallo 2518: char expbuf[256], buf[256];
1.140 xsa 2519: struct tm *tb;
1.134 joris 2520: char *fmt;
1.63 joris 2521:
1.65 niallo 2522: kwtype = 0;
2523: kwstr = NULL;
1.63 joris 2524: i = 0;
2525:
2526: /*
1.134 joris 2527: * -z support for RCS
2528: */
2529: tb = &rdp->rd_date;
1.140 xsa 2530: if (timezone_flag != NULL)
2531: tb = rcs_set_tz(timezone_flag, rdp);
1.134 joris 2532:
2533: /*
1.63 joris 2534: * Keyword formats:
2535: * $Keyword$
2536: * $Keyword: value$
2537: */
1.144 deraadt 2538: for (c = data; *c != '\0' && i < len; c++) {
1.63 joris 2539: if (*c == '$') {
2540: /* remember start of this possible keyword */
2541: start = c;
1.125 niallo 2542: start_offset = start - data;
1.63 joris 2543:
2544: /* first following character has to be alphanumeric */
1.144 deraadt 2545: c++;
1.63 joris 2546: if (!isalpha(*c)) {
2547: c = start;
2548: continue;
2549: }
2550:
2551: /* look for any matching keywords */
2552: found = 0;
2553: for (j = 0; j < RCS_NKWORDS; j++) {
2554: if (!strncmp(c, rcs_expkw[j].kw_str,
2555: strlen(rcs_expkw[j].kw_str))) {
2556: found = 1;
2557: kwstr = rcs_expkw[j].kw_str;
2558: kwtype = rcs_expkw[j].kw_type;
2559: break;
2560: }
2561: }
2562:
2563: /* unknown keyword, continue looking */
2564: if (found == 0) {
2565: c = start;
2566: continue;
2567: }
2568:
2569: /* next character has to be ':' or '$' */
2570: c += strlen(kwstr);
2571: if (*c != ':' && *c != '$') {
2572: c = start;
2573: continue;
2574: }
2575:
2576: /*
2577: * if the next character was ':' we need to look for
2578: * an '$' before the end of the line to be sure it is
2579: * in fact a keyword.
2580: */
2581: if (*c == ':') {
2582: while (*c++) {
2583: if (*c == '$' || *c == '\n')
2584: break;
2585: }
2586:
2587: if (*c != '$') {
2588: c = start;
2589: continue;
2590: }
2591: }
1.125 niallo 2592: c_offset = c - data;
2593: end = c + 1;
1.63 joris 2594:
2595: /* start constructing the expansion */
2596: expbuf[0] = '\0';
2597:
2598: if (mode & RCS_KWEXP_NAME) {
2599: strlcat(expbuf, "$", sizeof(expbuf));
2600: strlcat(expbuf, kwstr, sizeof(expbuf));
2601: if (mode & RCS_KWEXP_VAL)
2602: strlcat(expbuf, ": ", sizeof(expbuf));
2603: }
2604:
2605: /*
1.80 reyk 2606: * order matters because of RCS_KW_ID and
2607: * RCS_KW_HEADER here
1.63 joris 2608: */
2609: if (mode & RCS_KWEXP_VAL) {
2610: if (kwtype & RCS_KW_RCSFILE) {
2611: if (!(kwtype & RCS_KW_FULLPATH))
1.80 reyk 2612: strlcat(expbuf,
2613: basename(rcsfile),
1.63 joris 2614: sizeof(expbuf));
2615: else
2616: strlcat(expbuf, rcsfile,
2617: sizeof(expbuf));
2618: strlcat(expbuf, " ", sizeof(expbuf));
2619: }
2620:
2621: if (kwtype & RCS_KW_REVISION) {
1.80 reyk 2622: rcsnum_tostr(rdp->rd_num, buf,
2623: sizeof(buf));
1.63 joris 2624: strlcat(buf, " ", sizeof(buf));
2625: strlcat(expbuf, buf, sizeof(expbuf));
2626: }
2627:
2628: if (kwtype & RCS_KW_DATE) {
1.134 joris 2629: if (timezone_flag != NULL)
2630: fmt = "%Y/%m/%d %H:%M:%S%z ";
2631: else
2632: fmt = "%Y/%m/%d %H:%M:%S ";
2633:
2634: strftime(buf, sizeof(buf), fmt, tb);
1.63 joris 2635: strlcat(expbuf, buf, sizeof(expbuf));
2636: }
2637:
2638: if (kwtype & RCS_KW_AUTHOR) {
2639: strlcat(expbuf, rdp->rd_author,
2640: sizeof(expbuf));
2641: strlcat(expbuf, " ", sizeof(expbuf));
2642: }
2643:
2644: if (kwtype & RCS_KW_STATE) {
2645: strlcat(expbuf, rdp->rd_state,
2646: sizeof(expbuf));
2647: strlcat(expbuf, " ", sizeof(expbuf));
2648: }
2649:
2650: /* order does not matter anymore below */
2651: if (kwtype & RCS_KW_LOG)
2652: strlcat(expbuf, " ", sizeof(expbuf));
2653:
2654: if (kwtype & RCS_KW_SOURCE) {
1.80 reyk 2655: strlcat(expbuf, rcsfile,
2656: sizeof(expbuf));
1.63 joris 2657: strlcat(expbuf, " ", sizeof(expbuf));
2658: }
2659:
2660: if (kwtype & RCS_KW_NAME)
2661: strlcat(expbuf, " ", sizeof(expbuf));
2662: }
2663:
2664: /* end the expansion */
2665: if (mode & RCS_KWEXP_NAME)
2666: strlcat(expbuf, "$", sizeof(expbuf));
1.138 deraadt 2667:
1.125 niallo 2668: sizdiff = strlen(expbuf) - (end - start);
2669: tbuf = xmalloc(strlen(end) + 1);
2670: strlcpy(tbuf, end, strlen(end) + 1);
2671: /* only realloc if we have to */
2672: if (sizdiff > 0) {
2673: len += sizdiff;
2674: data = xrealloc(data, len);
2675: /*
2676: * ensure string pointers are not invalidated
2677: * after realloc()
2678: */
2679: start = data + start_offset;
2680: c = data + c_offset;
2681: }
2682: strlcpy(start, expbuf, len);
2683: strlcat(data, tbuf, len);
2684: xfree(tbuf);
1.63 joris 2685: i += strlen(expbuf);
2686: }
1.42 jfb 2687: }
1.81 niallo 2688:
1.125 niallo 2689: return (data);
1.81 niallo 2690: }
2691:
2692: /*
2693: * rcs_deltatext_set()
2694: *
2695: * Set deltatext for <rev> in RCS file <rfp> to <dtext>
1.96 xsa 2696: * Returns -1 on error, 0 on success.
1.81 niallo 2697: */
2698: int
2699: rcs_deltatext_set(RCSFILE *rfp, RCSNUM *rev, const char *dtext)
2700: {
2701: size_t len;
2702: struct rcs_delta *rdp;
1.117 niallo 2703:
2704: /* Write operations require full parsing */
2705: rcs_parse_deltatexts(rfp, NULL);
1.81 niallo 2706:
2707: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2708: return (-1);
2709:
2710: if (rdp->rd_text != NULL)
1.110 joris 2711: xfree(rdp->rd_text);
1.81 niallo 2712:
2713: len = strlen(dtext);
1.103 joris 2714: if (len != 0) {
1.110 joris 2715: rdp->rd_text = (u_char *)xmalloc(len);
1.103 joris 2716: rdp->rd_tlen = len - 1;
2717: strlcpy(rdp->rd_text, dtext, len);
2718: } else {
2719: rdp->rd_text = NULL;
2720: rdp->rd_tlen = 0;
2721: }
1.18 jfb 2722:
1.86 joris 2723: return (0);
2724: }
2725:
2726: /*
2727: * rcs_rev_setlog()
2728: *
2729: * Sets the log message of revision <rev> to <logtext>
2730: */
2731: int
2732: rcs_rev_setlog(RCSFILE *rfp, RCSNUM *rev, const char *logtext)
2733: {
2734: struct rcs_delta *rdp;
2735: char buf[16];
2736:
2737: rcsnum_tostr(rev, buf, sizeof(buf));
2738:
2739: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2740: return (-1);
2741:
2742: if (rdp->rd_log != NULL)
1.110 joris 2743: xfree(rdp->rd_log);
1.86 joris 2744:
1.110 joris 2745: rdp->rd_log = xstrdup(logtext);
1.86 joris 2746: rfp->rf_flags &= ~RCS_SYNCED;
1.95 niallo 2747: return (0);
2748: }
1.97 niallo 2749: /*
2750: * rcs_rev_getdate()
2751: *
2752: * Get the date corresponding to a given revision.
2753: * Returns the date on success, -1 on failure.
2754: */
2755: time_t
2756: rcs_rev_getdate(RCSFILE *rfp, RCSNUM *rev)
2757: {
2758: struct rcs_delta *rdp;
2759:
2760: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2761: return (-1);
2762:
2763: return (mktime(&rdp->rd_date));
2764: }
1.95 niallo 2765:
2766: /*
2767: * rcs_state_set()
2768: *
2769: * Sets the state of revision <rev> to <state>
2770: * NOTE: default state is 'Exp'. States may not contain spaces.
2771: *
2772: * Returns -1 on failure, 0 on success.
2773: */
2774: int
2775: rcs_state_set(RCSFILE *rfp, RCSNUM *rev, const char *state)
2776: {
2777: struct rcs_delta *rdp;
2778:
2779: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2780: return (-1);
2781:
2782: if (rdp->rd_state != NULL)
1.110 joris 2783: xfree(rdp->rd_state);
1.95 niallo 2784:
1.110 joris 2785: rdp->rd_state = xstrdup(state);
1.95 niallo 2786:
2787: rfp->rf_flags &= ~RCS_SYNCED;
2788:
2789: return (0);
2790: }
2791:
2792: /*
2793: * rcs_state_check()
2794: *
2795: * Check if string <state> is valid.
2796: *
1.96 xsa 2797: * Returns 0 if the string is valid, -1 otherwise.
1.95 niallo 2798: */
2799: int
2800: rcs_state_check(const char *state)
2801: {
2802: if (strchr(state, ' ') != NULL)
2803: return (-1);
2804:
1.18 jfb 2805: return (0);
1.1 jfb 2806: }
1.97 niallo 2807:
2808: /*
2809: * rcs_state_get()
2810: *
2811: * Get the state for a given revision of a specified RCSFILE.
2812: *
2813: * Returns NULL on failure.
2814: */
2815: const char *
2816: rcs_state_get(RCSFILE *rfp, RCSNUM *rev)
2817: {
2818: struct rcs_delta *rdp;
2819:
2820: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2821: return (NULL);
2822:
2823: return (rdp->rd_state);
2824: }
2825:
1.131 niallo 2826: /*
2827: * rcs_kwexp_buf()
2828: *
2829: * Do keyword expansion on a buffer if necessary
2830: *
2831: */
2832: BUF *
2833: rcs_kwexp_buf(BUF *bp, RCSFILE *rf, RCSNUM *rev)
2834: {
2835: struct rcs_delta *rdp;
2836: char *expanded, *tbuf;
2837: int expmode;
2838: size_t len;
2839:
2840: /*
2841: * Do keyword expansion if required.
2842: */
2843: if (rf->rf_expand != NULL)
2844: expmode = rcs_kwexp_get(rf);
2845: else
2846: expmode = RCS_KWEXP_DEFAULT;
2847:
2848: if (!(expmode & RCS_KWEXP_NONE)) {
2849: if ((rdp = rcs_findrev(rf, rev)) == NULL)
2850: fatal("could not fetch revision");
2851: cvs_buf_putc(bp, '\0');
2852: len = cvs_buf_len(bp);
2853: tbuf = cvs_buf_release(bp);
2854: expanded = rcs_expand_keywords(rf->rf_path, rdp,
2855: tbuf, len, expmode);
2856: bp = cvs_buf_alloc(len, BUF_AUTOEXT);
1.138 deraadt 2857: cvs_buf_set(bp, expanded, strlen(expanded), 0);
1.131 niallo 2858: xfree(expanded);
2859: }
2860: return (bp);
2861: }
2862:
1.105 joris 2863:
1.106 joris 2864: #if !defined(RCSPROG)
2865:
1.105 joris 2866: static char *month_tab[] = {
2867: "Jan",
2868: "Feb",
2869: "Mar",
2870: "Apr",
2871: "May",
2872: "Jun",
2873: "Jul",
2874: "Aug",
2875: "Sep",
2876: "Oct",
2877: "Nov",
2878: "Dec"
2879: };
2880:
2881: /*
2882: * Checkout a certain revision <rev> of RCS file <rf> to either standard
2883: * output when running in server mode, or to <fpath> when running in local mode.
2884: *
2885: * If type is CHECKOUT_REV_MERGED we have an extra argument, which
2886: * is the buffer containing the merged file.
2887: *
2888: * If type is CHECKOUT_REV_REMOVED, the file has been removed and we
2889: * need to do the same thing.
2890: */
2891: int
2892: cvs_checkout_rev(RCSFILE *rf, RCSNUM *rev, CVSFILE *cf, char *fpath,
2893: int local, int type, ...)
2894: {
2895: BUF *bp;
2896: int l, ret, fsize;
2897: char timebuf[32], entry[MAXPATHLEN], copyfile[MAXPATHLEN];
2898: char *content, *repo, buf[MAXPATHLEN], modestr[16];
2899: struct cvsroot *root;
2900: struct cvs_ent *ent;
2901: va_list ap;
2902: time_t rcstime;
2903: struct timeval tv[2];
2904: struct tm *tp;
2905: RCSNUM *oldrev;
2906:
2907: bp = NULL;
2908: ret = -1;
2909: content = NULL;
2910: oldrev = NULL;
2911:
2912: if ((type != CHECKOUT_REV_MERGED) && (type != CHECKOUT_REV_REMOVED)) {
2913: /* fetch the contents of the revision */
2914: if ((bp = rcs_getrev(rf, rev)) == NULL) {
2915: cvs_log(LP_ERR, "revision '%s' not found in file '%s'",
2916: rcsnum_tostr(rev, buf, sizeof(buf)), fpath);
2917: goto out;
2918: }
1.131 niallo 2919: bp = rcs_kwexp_buf(bp, rf, rev);
1.105 joris 2920: } else if (type != CHECKOUT_REV_REMOVED) {
2921: va_start(ap, type);
2922: bp = va_arg(ap, BUF *);
2923: va_end(ap);
2924: }
2925:
2926: if (type == CHECKOUT_REV_CREATED)
2927: rcstime = rcs_rev_getdate(rf, rev);
1.108 joris 2928: else if (type == CHECKOUT_REV_MERGED ||
2929: type == CHECKOUT_REV_UPDATED) {
1.105 joris 2930: time(&rcstime);
1.108 joris 2931: if ((rcstime = cvs_hack_time(rcstime, 1)) < 0)
2932: goto out;
2933: }
1.105 joris 2934:
1.108 joris 2935: if (type == CHECKOUT_REV_CREATED ||
1.130 niallo 2936: type == CHECKOUT_REV_MERGED ||
1.108 joris 2937: type == CHECKOUT_REV_UPDATED) {
1.105 joris 2938: ctime_r(&rcstime, timebuf);
2939: l = strlen(timebuf);
2940: if ((l > 0) && (timebuf[l - 1] == '\n'))
2941: timebuf[--l] = '\0';
2942:
2943: l = snprintf(entry, sizeof(entry), "/%s/%s/%s/%s/", cf->cf_name,
2944: rcsnum_tostr(rev, buf, sizeof(buf)),
2945: (local == 1) ? timebuf : "",
2946: (type == CHECKOUT_REV_MERGED) ? "+=" : "");
2947: if (l == -1 || l >= (int)sizeof(buf))
2948: goto out;
2949: }
2950:
2951: if (type == CHECKOUT_REV_MERGED) {
1.111 joris 2952: oldrev = rcsnum_alloc();
2953: rcsnum_cpy(rev, oldrev, 0);
1.105 joris 2954:
1.143 niallo 2955: if (oldrev->rn_id[oldrev->rn_len - 1] <= 0)
1.105 joris 2956: goto out;
1.143 niallo 2957: oldrev = rcsnum_dec(oldrev);
1.105 joris 2958:
2959: l = snprintf(copyfile, sizeof(copyfile), ".#%s.%s",
2960: cf->cf_name, rcsnum_tostr(oldrev, buf, sizeof(buf)));
2961: if (l == -1 || l >= (int)sizeof(copyfile))
2962: goto out;
2963: }
2964:
2965: root = CVS_DIR_ROOT(cf);
2966: repo = CVS_DIR_REPO(cf);
2967:
2968: /*
2969: * In local mode, just copy the entire contents to fpath.
2970: * In server mode, we need to send it to the client together with
2971: * some responses.
2972: */
2973: if (local) {
2974: l = 0;
2975: if (cf->cf_entry == NULL) {
2976: l = 1;
2977: cf->cf_entry = cvs_ent_open(cf->cf_dir, O_RDWR);
2978: if (cf->cf_entry == NULL) {
1.122 reyk 2979: cvs_log(LP_ERR, "failed to open Entry "
2980: "file '%s'", cf->cf_dir);
1.105 joris 2981: goto out;
2982: }
2983: }
2984:
2985: cvs_ent_remove(cf->cf_entry, cf->cf_name, 1);
2986: if (type != CHECKOUT_REV_REMOVED) {
2987: cvs_ent_addln(cf->cf_entry, entry);
2988: ent = cvs_ent_get(cf->cf_entry, cf->cf_name);
2989: ent->processed = 1;
2990: }
2991:
2992: if (l == 1)
2993: cvs_ent_close(cf->cf_entry);
2994:
2995: switch (type) {
2996: case CHECKOUT_REV_REMOVED:
2997: if (cvs_unlink(fpath) < 0)
2998: goto out;
2999: break;
3000: case CHECKOUT_REV_MERGED:
3001: /* XXX move the old file when merging */
1.108 joris 3002: case CHECKOUT_REV_UPDATED:
1.105 joris 3003: case CHECKOUT_REV_CREATED:
1.114 xsa 3004: cvs_buf_write(bp, fpath, cf->cf_mode);
1.107 joris 3005: /*
3006: * correct the time first
3007: */
3008: if ((rcstime = cvs_hack_time(rcstime, 0)) == 0)
3009: goto out;
3010:
1.105 joris 3011: tv[0].tv_sec = rcstime;
3012: tv[0].tv_usec = 0;
3013: tv[1] = tv[0];
3014: if (utimes(fpath, tv) == -1)
3015: cvs_log(LP_ERRNO, "failed to set timestamps");
3016: break;
3017: }
3018: } else {
3019: /* sanity */
3020: if (cf->cf_type != DT_REG) {
3021: cvs_log(LP_ERR, "cvs_checkout_rev: none DT_REG file");
3022: goto out;
3023: }
3024:
3025: /*
3026: * if we are removing a file, we don't need this stuff.
3027: */
3028: if (type != CHECKOUT_REV_REMOVED) {
1.107 joris 3029: if ((rcstime = cvs_hack_time(rcstime, 0)) == 0)
3030: goto out;
3031:
1.105 joris 3032: tp = gmtime(&rcstime);
3033: l = snprintf(timebuf, sizeof(timebuf),
3034: "%02d %s %d %02d:%02d:%02d -0000",
3035: tp->tm_mday, month_tab[tp->tm_mon],
3036: tp->tm_year + 1900, tp->tm_hour,
3037: tp->tm_min, tp->tm_sec);
3038: if (l == -1 || l >= (int)sizeof(timebuf))
3039: goto out;
3040:
3041: fsize = cvs_buf_len(bp);
3042: cvs_modetostr(cf->cf_mode, modestr, sizeof(modestr));
1.114 xsa 3043: cvs_buf_putc(bp, '\0');
1.105 joris 3044: content = cvs_buf_release(bp);
3045: bp = NULL;
3046: }
3047:
3048: if (type == CHECKOUT_REV_MERGED) {
3049: printf("Copy-file %s/\n", (cf->cf_dir != NULL) ?
3050: cf->cf_dir : ".");
3051: printf("%s/%s/%s\n", root->cr_dir, repo, cf->cf_name);
3052: printf("%s\n", copyfile);
3053: }
3054:
3055: switch (type) {
3056: case CHECKOUT_REV_MERGED:
3057: printf("Merged");
3058: break;
3059: case CHECKOUT_REV_REMOVED:
3060: printf("Removed");
3061: break;
3062: case CHECKOUT_REV_CREATED:
3063: printf("Mod-time %s\n", timebuf);
3064: printf("Created");
3065: break;
3066: default:
3067: cvs_log(LP_ERR, "cvs_checkout_rev: bad type %d",
3068: type);
3069: goto out;
3070: }
3071:
3072: printf(" %s/\n", (cf->cf_dir != NULL) ? cf->cf_dir : ".");
3073: printf("%s/%s\n", repo, cf->cf_name);
3074:
3075: if (type != CHECKOUT_REV_REMOVED) {
3076: printf("%s\n", entry);
3077: printf("%s\n%d\n%s", modestr, fsize, content);
3078: }
3079: }
3080:
3081: ret = 0;
3082:
3083: out:
3084: if (oldrev != NULL)
3085: rcsnum_free(oldrev);
3086: if (bp != NULL)
3087: cvs_buf_free(bp);
3088: if (content != NULL)
1.110 joris 3089: xfree(content);
1.105 joris 3090:
3091: return (ret);
3092: }
1.106 joris 3093:
3094: #endif