Annotation of src/usr.bin/cvs/rcs.c, Revision 1.151
1.151 ! xsa 1: /* $OpenBSD: rcs.c,v 1.150 2006/03/27 15:26:12 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.148 xsa 244: static void 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);
1.151 ! xsa 254: static void rcs_growbuf(RCSFILE *);
1.57 xsa 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: */
1.149 xsa 990: void
1.27 jfb 991: rcs_desc_set(RCSFILE *file, const char *desc)
992: {
993: char *tmp;
994:
1.110 joris 995: tmp = xstrdup(desc);
1.27 jfb 996: if (file->rf_desc != NULL)
1.110 joris 997: xfree(file->rf_desc);
1.27 jfb 998: file->rf_desc = tmp;
999: file->rf_flags &= ~RCS_SYNCED;
1.51 jfb 1000: }
1001:
1002: /*
1003: * rcs_comment_lookup()
1004: *
1005: * Lookup the assumed comment leader based on a file's suffix.
1006: * Returns a pointer to the string on success, or NULL on failure.
1007: */
1.57 xsa 1008: const char *
1.51 jfb 1009: rcs_comment_lookup(const char *filename)
1010: {
1011: int i;
1012: const char *sp;
1013:
1014: if ((sp = strrchr(filename, '.')) == NULL) {
1015: rcs_errno = RCS_ERR_NOENT;
1016: return (NULL);
1017: }
1018: sp++;
1019:
1020: for (i = 0; i < (int)NB_COMTYPES; i++)
1021: if (strcmp(rcs_comments[i].rc_suffix, sp) == 0)
1022: return (rcs_comments[i].rc_cstr);
1023: return (NULL);
1.27 jfb 1024: }
1025:
1.33 jfb 1026: /*
1027: * rcs_comment_get()
1028: *
1029: * Retrieve the comment leader for the RCS file <file>.
1030: */
1.57 xsa 1031: const char *
1.33 jfb 1032: rcs_comment_get(RCSFILE *file)
1033: {
1034: return (file->rf_comment);
1035: }
1036:
1037: /*
1038: * rcs_comment_set()
1039: *
1040: * Set the comment leader for the RCS file <file>.
1041: */
1.150 xsa 1042: void
1.33 jfb 1043: rcs_comment_set(RCSFILE *file, const char *comment)
1044: {
1045: char *tmp;
1046:
1.110 joris 1047: tmp = xstrdup(comment);
1.33 jfb 1048: if (file->rf_comment != NULL)
1.110 joris 1049: xfree(file->rf_comment);
1.33 jfb 1050: file->rf_comment = tmp;
1051: file->rf_flags &= ~RCS_SYNCED;
1052: }
1.40 jfb 1053:
1054: /*
1055: * rcs_tag_resolve()
1056: *
1057: * Retrieve the revision number corresponding to the tag <tag> for the RCS
1058: * file <file>.
1059: */
1.60 xsa 1060: RCSNUM *
1.40 jfb 1061: rcs_tag_resolve(RCSFILE *file, const char *tag)
1062: {
1063: RCSNUM *num;
1064:
1065: if ((num = rcsnum_parse(tag)) == NULL) {
1066: num = rcs_sym_getrev(file, tag);
1067: }
1068:
1069: return (num);
1070: }
1071:
1.94 joris 1072: int
1073: rcs_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines)
1.5 vincent 1074: {
1075: char op, *ep;
1.94 joris 1076: struct cvs_line *lp, *dlp, *ndlp;
1.5 vincent 1077: int i, lineno, nbln;
1.1 jfb 1078:
1.94 joris 1079: dlp = TAILQ_FIRST(&(dlines->l_lines));
1080: lp = TAILQ_FIRST(&(plines->l_lines));
1.1 jfb 1081:
1082: /* skip first bogus line */
1.94 joris 1083: for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
1084: lp = TAILQ_NEXT(lp, l_list)) {
1085: op = *(lp->l_line);
1086: lineno = (int)strtol((lp->l_line + 1), &ep, 10);
1087: if ((lineno > dlines->l_nblines) || (lineno < 0) ||
1.132 niallo 1088: (*ep != ' '))
1089: fatal("invalid line specification in RCS patch");
1.1 jfb 1090: ep++;
1091: nbln = (int)strtol(ep, &ep, 10);
1.132 niallo 1092: if ((nbln < 0) || (*ep != '\0'))
1093: fatal("invalid line number specification in RCS patch");
1.1 jfb 1094:
1095: /* find the appropriate line */
1096: for (;;) {
1097: if (dlp == NULL)
1098: break;
1.94 joris 1099: if (dlp->l_lineno == lineno)
1.1 jfb 1100: break;
1.94 joris 1101: if (dlp->l_lineno > lineno) {
1102: dlp = TAILQ_PREV(dlp, cvs_tqh, l_list);
1103: } else if (dlp->l_lineno < lineno) {
1.133 niallo 1104: if (((ndlp = TAILQ_NEXT(dlp, l_list)) == NULL) ||
1.138 deraadt 1105: (ndlp->l_lineno > lineno))
1.1 jfb 1106: break;
1107: dlp = ndlp;
1108: }
1109: }
1.132 niallo 1110: if (dlp == NULL)
1111: fatal("can't find referenced line in RCS patch");
1.1 jfb 1112:
1113: if (op == 'd') {
1114: for (i = 0; (i < nbln) && (dlp != NULL); i++) {
1.94 joris 1115: ndlp = TAILQ_NEXT(dlp, l_list);
1116: TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
1.1 jfb 1117: dlp = ndlp;
1.133 niallo 1118: /* last line is gone - reset dlp */
1119: if (dlp == NULL) {
1120: ndlp = TAILQ_LAST(&(dlines->l_lines),
1121: cvs_tqh);
1122: dlp = ndlp;
1123: }
1.1 jfb 1124: }
1.14 deraadt 1125: } else if (op == 'a') {
1.1 jfb 1126: for (i = 0; i < nbln; i++) {
1127: ndlp = lp;
1.94 joris 1128: lp = TAILQ_NEXT(lp, l_list);
1.132 niallo 1129: if (lp == NULL)
1130: fatal("truncated RCS patch");
1.94 joris 1131: TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
1132: TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
1133: lp, l_list);
1.1 jfb 1134: dlp = lp;
1135:
1136: /* we don't want lookup to block on those */
1.94 joris 1137: lp->l_lineno = lineno;
1.1 jfb 1138:
1139: lp = ndlp;
1140: }
1.132 niallo 1141: } else
1142: fatal("unknown RCS patch operation `%c'", op);
1.1 jfb 1143:
1144: /* last line of the patch, done */
1.94 joris 1145: if (lp->l_lineno == plines->l_nblines)
1.1 jfb 1146: break;
1147: }
1148:
1149: /* once we're done patching, rebuild the line numbers */
1.2 vincent 1150: lineno = 0;
1.94 joris 1151: TAILQ_FOREACH(lp, &(dlines->l_lines), l_list)
1152: lp->l_lineno = lineno++;
1153: dlines->l_nblines = lineno - 1;
1.1 jfb 1154:
1.5 vincent 1155: return (0);
1.1 jfb 1156: }
1157:
1158: /*
1159: * rcs_getrev()
1160: *
1161: * Get the whole contents of revision <rev> from the RCSFILE <rfp>. The
1.4 vincent 1162: * returned buffer is dynamically allocated and should be released using
1163: * cvs_buf_free() once the caller is done using it.
1.1 jfb 1164: */
1165: BUF*
1.66 joris 1166: rcs_getrev(RCSFILE *rfp, RCSNUM *frev)
1.1 jfb 1167: {
1.131 niallo 1168: int res;
1.1 jfb 1169: size_t len;
1170: void *bp;
1.66 joris 1171: RCSNUM *crev, *rev;
1.125 niallo 1172: BUF *rbuf;
1.1 jfb 1173: struct rcs_delta *rdp = NULL;
1174:
1.28 jfb 1175: if (rfp->rf_head == NULL)
1176: return (NULL);
1.66 joris 1177:
1178: if (frev == RCS_HEAD_REV)
1179: rev = rfp->rf_head;
1180: else
1181: rev = frev;
1.28 jfb 1182:
1.1 jfb 1183: res = rcsnum_cmp(rfp->rf_head, rev, 0);
1184: if (res == 1) {
1.32 jfb 1185: rcs_errno = RCS_ERR_NOENT;
1.1 jfb 1186: return (NULL);
1.26 jfb 1187: }
1188:
1.117 niallo 1189: /* No matter what, we're going to need up the the description parsed */
1190: rcs_parse_desc(rfp, NULL);
1191:
1.26 jfb 1192: rdp = rcs_findrev(rfp, rfp->rf_head);
1193: if (rdp == NULL) {
1194: cvs_log(LP_ERR, "failed to get RCS HEAD revision");
1195: return (NULL);
1196: }
1.117 niallo 1197: if (rdp->rd_tlen == 0)
1198: rcs_parse_deltatexts(rfp, rfp->rf_head);
1.45 jfb 1199: len = rdp->rd_tlen;
1.115 niallo 1200: if (len == 0) {
1201: rbuf = cvs_buf_alloc(1, 0);
1202: cvs_buf_empty(rbuf);
1203: return (rbuf);
1204: }
1.26 jfb 1205:
1.116 joris 1206: rbuf = cvs_buf_alloc(len, BUF_AUTOEXT);
1.26 jfb 1207: cvs_buf_append(rbuf, rdp->rd_text, len);
1208:
1209: if (res != 0) {
1210: /* Apply patches backwards to get the right version.
1211: * This will need some rework to support sub branches.
1212: */
1213: do {
1.87 joris 1214: crev = rdp->rd_next;
1.26 jfb 1215: rdp = rcs_findrev(rfp, crev);
1216: if (rdp == NULL) {
1217: cvs_buf_free(rbuf);
1218: return (NULL);
1219: }
1.114 xsa 1220: cvs_buf_putc(rbuf, '\0');
1.117 niallo 1221: /* check if we have parsed this rev's deltatext */
1222: if (rdp->rd_tlen == 0)
1223: rcs_parse_deltatexts(rfp, rdp->rd_num);
1.114 xsa 1224:
1.26 jfb 1225: bp = cvs_buf_release(rbuf);
1.94 joris 1226: rbuf = cvs_patchfile((char *)bp, (char *)rdp->rd_text,
1227: rcs_patch_lines);
1.110 joris 1228: xfree(bp);
1.26 jfb 1229: if (rbuf == NULL)
1230: break;
1231: } while (rcsnum_cmp(crev, rev, 0) != 0);
1.1 jfb 1232: }
1.125 niallo 1233: if (cvs_buf_getc(rbuf, cvs_buf_len(rbuf)-1) != '\n'
1234: && rbuf != NULL)
1235: cvs_buf_putc(rbuf, '\n');
1236: return (rbuf);
1.1 jfb 1237: }
1238:
1239: /*
1.52 jfb 1240: * rcs_rev_add()
1241: *
1.53 jfb 1242: * Add a revision to the RCS file <rf>. The new revision's number can be
1243: * specified in <rev> (which can also be RCS_HEAD_REV, in which case the
1244: * new revision will have a number equal to the previous head revision plus
1245: * one). The <msg> argument specifies the log message for that revision, and
1246: * <date> specifies the revision's date (a value of -1 is
1247: * equivalent to using the current time).
1.96 xsa 1248: * If <username> is NULL, set the author for this revision to the current user.
1.90 niallo 1249: * Otherwise, set it to <username>.
1.52 jfb 1250: * Returns 0 on success, or -1 on failure.
1251: */
1252: int
1.90 niallo 1253: rcs_rev_add(RCSFILE *rf, RCSNUM *rev, const char *msg, time_t date,
1254: const char *username)
1.52 jfb 1255: {
1256: time_t now;
1257: struct passwd *pw;
1.83 joris 1258: struct rcs_delta *ordp, *rdp;
1259:
1.52 jfb 1260: if (rev == RCS_HEAD_REV) {
1.101 niallo 1261: if (rf->rf_flags & RCS_CREATE) {
1262: if ((rev = rcsnum_parse(RCS_HEAD_INIT)) == NULL)
1263: return (-1);
1.111 joris 1264: rf->rf_head = rcsnum_alloc();
1.101 niallo 1265: rcsnum_cpy(rev, rf->rf_head, 0);
1266: } else {
1267: rev = rcsnum_inc(rf->rf_head);
1268: }
1.83 joris 1269: } else {
1270: if ((rdp = rcs_findrev(rf, rev)) != NULL) {
1271: rcs_errno = RCS_ERR_DUPENT;
1272: return (-1);
1273: }
1.52 jfb 1274: }
1275:
1.112 xsa 1276: if ((pw = getpwuid(getuid())) == NULL)
1277: fatal("getpwuid failed");
1.52 jfb 1278:
1.110 joris 1279: rdp = (struct rcs_delta *)xmalloc(sizeof(*rdp));
1.52 jfb 1280: memset(rdp, 0, sizeof(*rdp));
1281:
1282: TAILQ_INIT(&(rdp->rd_branches));
1283: TAILQ_INIT(&(rdp->rd_snodes));
1284:
1.111 joris 1285: rdp->rd_num = rcsnum_alloc();
1.52 jfb 1286: rcsnum_cpy(rev, rdp->rd_num, 0);
1.83 joris 1287:
1.111 joris 1288: rdp->rd_next = rcsnum_alloc();
1.92 joris 1289:
1.143 niallo 1290: if (!(rf->rf_flags & RCS_CREATE)) {
1291: /* next should point to the previous HEAD */
1292: ordp = TAILQ_FIRST(&(rf->rf_delta));
1293: rcsnum_cpy(ordp->rd_num, rdp->rd_next, 0);
1294: }
1.101 niallo 1295:
1.52 jfb 1296:
1.90 niallo 1297: if (username == NULL)
1298: username = pw->pw_name;
1299:
1.110 joris 1300: rdp->rd_author = xstrdup(username);
1301: rdp->rd_state = xstrdup(RCS_STATE_EXP);
1302: rdp->rd_log = xstrdup(msg);
1.52 jfb 1303:
1.53 jfb 1304: if (date != (time_t)(-1))
1305: now = date;
1306: else
1307: time(&now);
1.52 jfb 1308: gmtime_r(&now, &(rdp->rd_date));
1309:
1310: TAILQ_INSERT_HEAD(&(rf->rf_delta), rdp, rd_list);
1311: rf->rf_ndelta++;
1.81 niallo 1312:
1.64 niallo 1313: /* not synced anymore */
1314: rf->rf_flags &= ~RCS_SYNCED;
1.52 jfb 1315:
1316: return (0);
1317: }
1318:
1319: /*
1320: * rcs_rev_remove()
1321: *
1322: * Remove the revision whose number is <rev> from the RCS file <rf>.
1323: */
1324: int
1325: rcs_rev_remove(RCSFILE *rf, RCSNUM *rev)
1326: {
1327: int ret;
1328: struct rcs_delta *rdp;
1329:
1330: ret = 0;
1331: if (rev == RCS_HEAD_REV)
1332: rev = rf->rf_head;
1333:
1334: /* do we actually have that revision? */
1335: if ((rdp = rcs_findrev(rf, rev)) == NULL) {
1336: rcs_errno = RCS_ERR_NOENT;
1337: ret = -1;
1338: } else {
1339: /* XXX assumes it's not a sub node */
1340: TAILQ_REMOVE(&(rf->rf_delta), rdp, rd_list);
1341: rf->rf_ndelta--;
1342: rf->rf_flags &= ~RCS_SYNCED;
1343: }
1344:
1345: return (ret);
1346:
1347: }
1348:
1349: /*
1.1 jfb 1350: * rcs_findrev()
1351: *
1352: * Find a specific revision's delta entry in the tree of the RCS file <rfp>.
1353: * The revision number is given in <rev>.
1354: * Returns a pointer to the delta on success, or NULL on failure.
1355: */
1.102 xsa 1356: struct rcs_delta *
1.117 niallo 1357: rcs_findrev(RCSFILE *rfp, RCSNUM *rev)
1.1 jfb 1358: {
1359: u_int cmplen;
1.117 niallo 1360: struct rcs_delta *rdp, *enddelta;
1.1 jfb 1361: struct rcs_dlist *hp;
1.6 vincent 1362: int found;
1.26 jfb 1363:
1.117 niallo 1364: /*
1365: * We need to do more parsing if the last revision in the linked list
1366: * is greater than the requested revision.
1367: */
1368: enddelta = TAILQ_LAST(&(rfp->rf_delta), rcs_dlist);
1369: if ((enddelta == NULL)
1370: || (rcsnum_cmp(enddelta->rd_num, rev, -1) == -1)) {
1371: rcs_parse_deltas(rfp, rev);
1372: }
1373:
1.1 jfb 1374: cmplen = 2;
1375: hp = &(rfp->rf_delta);
1376:
1.6 vincent 1377: do {
1378: found = 0;
1379: TAILQ_FOREACH(rdp, hp, rd_list) {
1380: if (rcsnum_cmp(rdp->rd_num, rev, cmplen) == 0) {
1381: if (cmplen == rev->rn_len)
1382: return (rdp);
1.1 jfb 1383:
1.6 vincent 1384: hp = &(rdp->rd_snodes);
1385: cmplen += 2;
1386: found = 1;
1387: break;
1388: }
1.1 jfb 1389: }
1.6 vincent 1390: } while (found && cmplen < rev->rn_len);
1.1 jfb 1391:
1392: return (NULL);
1.20 jfb 1393: }
1394:
1395: /*
1.26 jfb 1396: * rcs_kwexp_set()
1397: *
1398: * Set the keyword expansion mode to use on the RCS file <file> to <mode>.
1399: * Returns 0 on success, or -1 on failure.
1400: */
1401: int
1402: rcs_kwexp_set(RCSFILE *file, int mode)
1403: {
1404: int i;
1405: char *tmp, buf[8] = "";
1406:
1407: if (RCS_KWEXP_INVAL(mode))
1408: return (-1);
1409:
1410: i = 0;
1411: if (mode == RCS_KWEXP_NONE)
1412: buf[0] = 'b';
1413: else if (mode == RCS_KWEXP_OLD)
1414: buf[0] = 'o';
1415: else {
1416: if (mode & RCS_KWEXP_NAME)
1417: buf[i++] = 'k';
1418: if (mode & RCS_KWEXP_VAL)
1419: buf[i++] = 'v';
1420: if (mode & RCS_KWEXP_LKR)
1421: buf[i++] = 'l';
1422: }
1423:
1.110 joris 1424: tmp = xstrdup(buf);
1.27 jfb 1425: if (file->rf_expand != NULL)
1.147 ray 1426: xfree(file->rf_expand);
1.26 jfb 1427: file->rf_expand = tmp;
1.64 niallo 1428: /* not synced anymore */
1429: file->rf_flags &= ~RCS_SYNCED;
1.26 jfb 1430:
1431: return (0);
1432: }
1433:
1434: /*
1435: * rcs_kwexp_get()
1436: *
1437: * Retrieve the keyword expansion mode to be used for the RCS file <file>.
1438: */
1439: int
1440: rcs_kwexp_get(RCSFILE *file)
1441: {
1442: return rcs_kflag_get(file->rf_expand);
1443: }
1444:
1445: /*
1.20 jfb 1446: * rcs_kflag_get()
1447: *
1448: * Get the keyword expansion mode from a set of character flags given in
1449: * <flags> and return the appropriate flag mask. In case of an error, the
1450: * returned mask will have the RCS_KWEXP_ERR bit set to 1.
1451: */
1452: int
1453: rcs_kflag_get(const char *flags)
1454: {
1455: int fl;
1456: size_t len;
1457: const char *fp;
1458:
1459: fl = 0;
1460: len = strlen(flags);
1461:
1462: for (fp = flags; *fp != '\0'; fp++) {
1463: if (*fp == 'k')
1464: fl |= RCS_KWEXP_NAME;
1465: else if (*fp == 'v')
1466: fl |= RCS_KWEXP_VAL;
1467: else if (*fp == 'l')
1468: fl |= RCS_KWEXP_LKR;
1469: else if (*fp == 'o') {
1470: if (len != 1)
1471: fl |= RCS_KWEXP_ERR;
1472: fl |= RCS_KWEXP_OLD;
1473: } else if (*fp == 'b') {
1474: if (len != 1)
1475: fl |= RCS_KWEXP_ERR;
1476: } else /* unknown letter */
1477: fl |= RCS_KWEXP_ERR;
1478: }
1479:
1480: return (fl);
1.32 jfb 1481: }
1482:
1483: /*
1484: * rcs_errstr()
1485: *
1486: * Get the error string matching the RCS error code <code>.
1487: */
1.57 xsa 1488: const char *
1.32 jfb 1489: rcs_errstr(int code)
1490: {
1.50 jfb 1491: const char *esp;
1492:
1493: if ((code < 0) || ((code >= (int)RCS_NERR) && (code != RCS_ERR_ERRNO)))
1494: esp = NULL;
1495: else if (code == RCS_ERR_ERRNO)
1496: esp = strerror(errno);
1497: else
1498: esp = rcs_errstrs[code];
1499: return (esp);
1.1 jfb 1500: }
1501:
1.21 jfb 1502: void
1503: rcs_kflag_usage(void)
1504: {
1505: fprintf(stderr, "Valid expansion modes include:\n"
1.22 jfb 1506: "\t-kkv\tGenerate keywords using the default form.\n"
1507: "\t-kkvl\tLike -kkv, except locker's name inserted.\n"
1508: "\t-kk\tGenerate only keyword names in keyword strings.\n"
1509: "\t-kv\tGenerate only keyword values in keyword strings.\n"
1510: "\t-ko\tGenerate old keyword string "
1.21 jfb 1511: "(no changes from checked in file).\n"
1.22 jfb 1512: "\t-kb\tGenerate binary file unmodified (merges not allowed).\n");
1.21 jfb 1513: }
1.1 jfb 1514:
1.117 niallo 1515: /* rcs_parse_deltas()
1516: *
1517: * Parse deltas. If <rev> is not NULL, parse only as far as that
1518: * revision. If <rev> is NULL, parse all deltas.
1519: */
1.146 xsa 1520: static void
1.117 niallo 1521: rcs_parse_deltas(RCSFILE *rfp, RCSNUM *rev)
1522: {
1523: int ret;
1524: struct rcs_delta *enddelta;
1.146 xsa 1525:
1526: if ((rfp->rf_flags & PARSED_DELTAS) || (rfp->rf_flags & RCS_CREATE))
1527: return;
1528:
1.117 niallo 1529: for (;;) {
1530: ret = rcs_parse_delta(rfp);
1531: if (rev != NULL) {
1532: enddelta = TAILQ_LAST(&(rfp->rf_delta), rcs_dlist);
1533: if (rcsnum_cmp(enddelta->rd_num, rev, -1) == 0)
1534: break;
1535: }
1536: if (ret == 0) {
1537: rfp->rf_flags |= PARSED_DELTAS;
1538: break;
1539: }
1540: else if (ret == -1)
1541: fatal("error parsing deltas");
1542: }
1543: }
1544:
1545: /* rcs_parse_deltatexts()
1546: *
1547: * Parse deltatexts. If <rev> is not NULL, parse only as far as that
1548: * revision. If <rev> is NULL, parse everything.
1549: */
1.146 xsa 1550: static void
1.117 niallo 1551: rcs_parse_deltatexts(RCSFILE *rfp, RCSNUM *rev)
1552: {
1553: int ret;
1554: struct rcs_delta *rdp;
1.146 xsa 1555:
1.117 niallo 1556: if ((rfp->rf_flags & PARSED_DELTATEXTS)
1557: || (rfp->rf_flags & RCS_CREATE))
1.146 xsa 1558: return;
1559:
1.117 niallo 1560: if (!(rfp->rf_flags & PARSED_DESC))
1561: rcs_parse_desc(rfp, rev);
1562: for (;;) {
1563: if (rev != NULL) {
1564: rdp = rcs_findrev(rfp, rev);
1565: if (rdp->rd_text != NULL)
1566: break;
1567: else
1568: ret = rcs_parse_deltatext(rfp);
1569: } else
1570: ret = rcs_parse_deltatext(rfp);
1571: if (ret == 0) {
1572: rfp->rf_flags |= PARSED_DELTATEXTS;
1573: break;
1574: }
1.146 xsa 1575: else if (ret == -1)
1.117 niallo 1576: fatal("problem parsing deltatexts");
1577: }
1578: }
1579:
1580: /* rcs_parse_desc()
1581: *
1582: * Parse RCS description.
1583: */
1.148 xsa 1584: static void
1.117 niallo 1585: rcs_parse_desc(RCSFILE *rfp, RCSNUM *rev)
1586: {
1587: int ret = 0;
1.148 xsa 1588:
1589: if ((rfp->rf_flags & PARSED_DESC) || (rfp->rf_flags & RCS_CREATE))
1590: return;
1.122 reyk 1591: if (!(rfp->rf_flags & PARSED_DELTAS))
1.117 niallo 1592: rcs_parse_deltas(rfp, rev);
1593: /* do parsing */
1594: ret = rcs_gettok(rfp);
1.148 xsa 1595: if (ret != RCS_TOK_DESC)
1596: fatal("token `%s' found where RCS desc expected",
1.117 niallo 1597: RCS_TOKSTR(rfp));
1598:
1599: ret = rcs_gettok(rfp);
1.148 xsa 1600: if (ret != RCS_TOK_STRING)
1601: fatal("token `%s' found where RCS desc expected",
1.117 niallo 1602: RCS_TOKSTR(rfp));
1603:
1604: rfp->rf_desc = xstrdup(RCS_TOKSTR(rfp));
1605: rfp->rf_flags |= PARSED_DESC;
1606: }
1607:
1.1 jfb 1608: /*
1.117 niallo 1609: * rcs_parse_init()
1.1 jfb 1610: *
1.117 niallo 1611: * Initial parsing of file <path>, which are in the RCS format.
1612: * Just does admin section
1.1 jfb 1613: * Returns 0 on success, or -1 on failure.
1614: */
1.26 jfb 1615: static int
1.117 niallo 1616: rcs_parse_init(RCSFILE *rfp)
1.1 jfb 1617: {
1.117 niallo 1618: int ret, count;
1.1 jfb 1619: struct rcs_pdata *pdp;
1620:
1.117 niallo 1621: count = 0;
1.26 jfb 1622: if (rfp->rf_flags & RCS_PARSED)
1.1 jfb 1623: return (0);
1624:
1.110 joris 1625: pdp = (struct rcs_pdata *)xmalloc(sizeof(*pdp));
1.1 jfb 1626: memset(pdp, 0, sizeof(*pdp));
1627:
1.18 jfb 1628: pdp->rp_lines = 0;
1.1 jfb 1629: pdp->rp_pttype = RCS_TOK_ERR;
1630:
1.113 xsa 1631: if ((pdp->rp_file = fopen(rfp->rf_path, "r")) == NULL)
1632: fatal("fopen: `%s': %s", rfp->rf_path, strerror(errno));
1.1 jfb 1633:
1.110 joris 1634: pdp->rp_buf = (char *)xmalloc((size_t)RCS_BUFSIZE);
1.1 jfb 1635: pdp->rp_blen = RCS_BUFSIZE;
1.18 jfb 1636: pdp->rp_bufend = pdp->rp_buf + pdp->rp_blen - 1;
1.1 jfb 1637:
1638: /* ditch the strict lock */
1.26 jfb 1639: rfp->rf_flags &= ~RCS_SLOCK;
1.1 jfb 1640: rfp->rf_pdata = pdp;
1641:
1.31 jfb 1642: if ((ret = rcs_parse_admin(rfp)) < 0) {
1.1 jfb 1643: rcs_freepdata(pdp);
1.117 niallo 1644: fatal("could not parse admin data");
1.1 jfb 1645: }
1646:
1.117 niallo 1647: if (rfp->rf_flags & RCS_PARSE_FULLY)
1648: rcs_parse_deltatexts(rfp, NULL);
1.1 jfb 1649:
1.117 niallo 1650: rfp->rf_flags |= RCS_SYNCED;
1.1 jfb 1651: return (0);
1652: }
1653:
1654: /*
1655: * rcs_parse_admin()
1656: *
1657: * Parse the administrative portion of an RCS file.
1.31 jfb 1658: * Returns the type of the first token found after the admin section on
1659: * success, or -1 on failure.
1.1 jfb 1660: */
1661: static int
1662: rcs_parse_admin(RCSFILE *rfp)
1663: {
1664: u_int i;
1665: int tok, ntok, hmask;
1666: struct rcs_key *rk;
1667:
1668: /* hmask is a mask of the headers already encountered */
1669: hmask = 0;
1670: for (;;) {
1671: tok = rcs_gettok(rfp);
1672: if (tok == RCS_TOK_ERR) {
1.50 jfb 1673: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1674: cvs_log(LP_ERR, "parse error in RCS admin section");
1.147 ray 1675: goto fail;
1.31 jfb 1676: } else if ((tok == RCS_TOK_NUM) || (tok == RCS_TOK_DESC)) {
1677: /*
1678: * Assume this is the start of the first delta or
1679: * that we are dealing with an empty RCS file and
1680: * we just found the description.
1681: */
1.1 jfb 1682: rcs_pushtok(rfp, RCS_TOKSTR(rfp), tok);
1.31 jfb 1683: return (tok);
1.1 jfb 1684: }
1685:
1686: rk = NULL;
1.18 jfb 1687: for (i = 0; i < RCS_NKEYS; i++)
1.1 jfb 1688: if (rcs_keys[i].rk_id == tok)
1689: rk = &(rcs_keys[i]);
1690:
1691: if (hmask & (1 << tok)) {
1.50 jfb 1692: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1693: cvs_log(LP_ERR, "duplicate RCS key");
1.147 ray 1694: goto fail;
1.1 jfb 1695: }
1696: hmask |= (1 << tok);
1697:
1698: switch (tok) {
1699: case RCS_TOK_HEAD:
1700: case RCS_TOK_BRANCH:
1701: case RCS_TOK_COMMENT:
1702: case RCS_TOK_EXPAND:
1703: ntok = rcs_gettok(rfp);
1704: if (ntok == RCS_TOK_SCOLON)
1705: break;
1706: if (ntok != rk->rk_val) {
1.50 jfb 1707: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1708: cvs_log(LP_ERR,
1709: "invalid value type for RCS key `%s'",
1710: rk->rk_str);
1711: }
1712:
1713: if (tok == RCS_TOK_HEAD) {
1.111 joris 1714: if (rfp->rf_head == NULL)
1.28 jfb 1715: rfp->rf_head = rcsnum_alloc();
1.1 jfb 1716: rcsnum_aton(RCS_TOKSTR(rfp), NULL,
1717: rfp->rf_head);
1.14 deraadt 1718: } else if (tok == RCS_TOK_BRANCH) {
1.111 joris 1719: if (rfp->rf_branch == NULL)
1.35 jfb 1720: rfp->rf_branch = rcsnum_alloc();
1721: if (rcsnum_aton(RCS_TOKSTR(rfp), NULL,
1722: rfp->rf_branch) < 0)
1.147 ray 1723: goto fail;
1.14 deraadt 1724: } else if (tok == RCS_TOK_COMMENT) {
1.110 joris 1725: rfp->rf_comment = xstrdup(RCS_TOKSTR(rfp));
1.14 deraadt 1726: } else if (tok == RCS_TOK_EXPAND) {
1.110 joris 1727: rfp->rf_expand = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 1728: }
1729:
1730: /* now get the expected semi-colon */
1731: ntok = rcs_gettok(rfp);
1732: if (ntok != RCS_TOK_SCOLON) {
1.50 jfb 1733: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1734: cvs_log(LP_ERR,
1735: "missing semi-colon after RCS `%s' key",
1.26 jfb 1736: rk->rk_str);
1.147 ray 1737: goto fail;
1.1 jfb 1738: }
1739: break;
1740: case RCS_TOK_ACCESS:
1.29 jfb 1741: if (rcs_parse_access(rfp) < 0)
1.147 ray 1742: goto fail;
1.1 jfb 1743: break;
1744: case RCS_TOK_SYMBOLS:
1.29 jfb 1745: if (rcs_parse_symbols(rfp) < 0)
1.147 ray 1746: goto fail;
1.1 jfb 1747: break;
1748: case RCS_TOK_LOCKS:
1.29 jfb 1749: if (rcs_parse_locks(rfp) < 0)
1.147 ray 1750: goto fail;
1.1 jfb 1751: break;
1752: default:
1.50 jfb 1753: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1754: cvs_log(LP_ERR,
1755: "unexpected token `%s' in RCS admin section",
1756: RCS_TOKSTR(rfp));
1.147 ray 1757: goto fail;
1.1 jfb 1758: }
1759: }
1760:
1.147 ray 1761: fail:
1762: return (-1);
1.1 jfb 1763: }
1764:
1765: /*
1766: * rcs_parse_delta()
1767: *
1768: * Parse an RCS delta section and allocate the structure to store that delta's
1769: * information in the <rfp> delta list.
1770: * Returns 1 if the section was parsed OK, 0 if it is the last delta, and
1771: * -1 on error.
1772: */
1773: static int
1774: rcs_parse_delta(RCSFILE *rfp)
1775: {
1776: int ret, tok, ntok, hmask;
1777: u_int i;
1778: char *tokstr;
1.3 vincent 1779: RCSNUM *datenum;
1.1 jfb 1780: struct rcs_delta *rdp;
1781: struct rcs_key *rk;
1782:
1.110 joris 1783: rdp = (struct rcs_delta *)xmalloc(sizeof(*rdp));
1.1 jfb 1784: memset(rdp, 0, sizeof(*rdp));
1785:
1786: rdp->rd_num = rcsnum_alloc();
1787: rdp->rd_next = rcsnum_alloc();
1788:
1789: TAILQ_INIT(&(rdp->rd_branches));
1.52 jfb 1790: TAILQ_INIT(&(rdp->rd_snodes));
1.1 jfb 1791:
1792: tok = rcs_gettok(rfp);
1793: if (tok != RCS_TOK_NUM) {
1.52 jfb 1794: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1795: cvs_log(LP_ERR, "unexpected token `%s' at start of delta",
1796: RCS_TOKSTR(rfp));
1797: rcs_freedelta(rdp);
1798: return (-1);
1799: }
1800: rcsnum_aton(RCS_TOKSTR(rfp), NULL, rdp->rd_num);
1801:
1802: hmask = 0;
1803: ret = 0;
1804: tokstr = NULL;
1805:
1806: for (;;) {
1807: tok = rcs_gettok(rfp);
1808: if (tok == RCS_TOK_ERR) {
1.50 jfb 1809: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1810: cvs_log(LP_ERR, "parse error in RCS delta section");
1811: rcs_freedelta(rdp);
1812: return (-1);
1.14 deraadt 1813: } else if (tok == RCS_TOK_NUM || tok == RCS_TOK_DESC) {
1.15 tedu 1814: rcs_pushtok(rfp, RCS_TOKSTR(rfp), tok);
1.1 jfb 1815: ret = (tok == RCS_TOK_NUM ? 1 : 0);
1816: break;
1817: }
1818:
1819: rk = NULL;
1.18 jfb 1820: for (i = 0; i < RCS_NKEYS; i++)
1.1 jfb 1821: if (rcs_keys[i].rk_id == tok)
1822: rk = &(rcs_keys[i]);
1823:
1824: if (hmask & (1 << tok)) {
1.50 jfb 1825: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1826: cvs_log(LP_ERR, "duplicate RCS key");
1827: rcs_freedelta(rdp);
1828: return (-1);
1829: }
1830: hmask |= (1 << tok);
1831:
1832: switch (tok) {
1833: case RCS_TOK_DATE:
1834: case RCS_TOK_AUTHOR:
1835: case RCS_TOK_STATE:
1836: case RCS_TOK_NEXT:
1837: ntok = rcs_gettok(rfp);
1838: if (ntok == RCS_TOK_SCOLON) {
1839: if (rk->rk_flags & RCS_VOPT)
1840: break;
1841: else {
1.50 jfb 1842: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1843: cvs_log(LP_ERR, "missing mandatory "
1844: "value to RCS key `%s'",
1845: rk->rk_str);
1846: rcs_freedelta(rdp);
1847: return (-1);
1848: }
1849: }
1850:
1851: if (ntok != rk->rk_val) {
1.50 jfb 1852: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1853: cvs_log(LP_ERR,
1854: "invalid value type for RCS key `%s'",
1855: rk->rk_str);
1856: rcs_freedelta(rdp);
1857: return (-1);
1858: }
1859:
1860: if (tokstr != NULL)
1.110 joris 1861: xfree(tokstr);
1862: tokstr = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 1863: /* now get the expected semi-colon */
1864: ntok = rcs_gettok(rfp);
1865: if (ntok != RCS_TOK_SCOLON) {
1.50 jfb 1866: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1867: cvs_log(LP_ERR,
1868: "missing semi-colon after RCS `%s' key",
1.26 jfb 1869: rk->rk_str);
1.110 joris 1870: xfree(tokstr);
1.1 jfb 1871: rcs_freedelta(rdp);
1872: return (-1);
1873: }
1874:
1875: if (tok == RCS_TOK_DATE) {
1.25 jfb 1876: if ((datenum = rcsnum_parse(tokstr)) == NULL) {
1.110 joris 1877: xfree(tokstr);
1.11 joris 1878: rcs_freedelta(rdp);
1879: return (-1);
1880: }
1.3 vincent 1881: if (datenum->rn_len != 6) {
1.50 jfb 1882: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1883: cvs_log(LP_ERR,
1884: "RCS date specification has %s "
1885: "fields",
1.3 vincent 1886: (datenum->rn_len > 6) ? "too many" :
1.1 jfb 1887: "missing");
1.110 joris 1888: xfree(tokstr);
1.1 jfb 1889: rcs_freedelta(rdp);
1.37 tedu 1890: rcsnum_free(datenum);
1891: return (-1);
1.1 jfb 1892: }
1.3 vincent 1893: rdp->rd_date.tm_year = datenum->rn_id[0];
1.19 jfb 1894: if (rdp->rd_date.tm_year >= 1900)
1895: rdp->rd_date.tm_year -= 1900;
1.3 vincent 1896: rdp->rd_date.tm_mon = datenum->rn_id[1] - 1;
1897: rdp->rd_date.tm_mday = datenum->rn_id[2];
1898: rdp->rd_date.tm_hour = datenum->rn_id[3];
1899: rdp->rd_date.tm_min = datenum->rn_id[4];
1900: rdp->rd_date.tm_sec = datenum->rn_id[5];
1901: rcsnum_free(datenum);
1.14 deraadt 1902: } else if (tok == RCS_TOK_AUTHOR) {
1.1 jfb 1903: rdp->rd_author = tokstr;
1904: tokstr = NULL;
1.14 deraadt 1905: } else if (tok == RCS_TOK_STATE) {
1.1 jfb 1906: rdp->rd_state = tokstr;
1907: tokstr = NULL;
1.14 deraadt 1908: } else if (tok == RCS_TOK_NEXT) {
1.1 jfb 1909: rcsnum_aton(tokstr, NULL, rdp->rd_next);
1910: }
1911: break;
1912: case RCS_TOK_BRANCHES:
1.46 jfb 1913: if (rcs_parse_branches(rfp, rdp) < 0) {
1914: rcs_freedelta(rdp);
1915: return (-1);
1916: }
1.1 jfb 1917: break;
1918: default:
1.50 jfb 1919: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1920: cvs_log(LP_ERR,
1921: "unexpected token `%s' in RCS delta",
1922: RCS_TOKSTR(rfp));
1923: rcs_freedelta(rdp);
1924: return (-1);
1925: }
1926: }
1927:
1.13 jfb 1928: if (tokstr != NULL)
1.110 joris 1929: xfree(tokstr);
1.13 jfb 1930:
1.1 jfb 1931: TAILQ_INSERT_TAIL(&(rfp->rf_delta), rdp, rd_list);
1.26 jfb 1932: rfp->rf_ndelta++;
1.1 jfb 1933:
1934: return (ret);
1935: }
1936:
1937: /*
1938: * rcs_parse_deltatext()
1939: *
1940: * Parse an RCS delta text section and fill in the log and text field of the
1941: * appropriate delta section.
1942: * Returns 1 if the section was parsed OK, 0 if it is the last delta, and
1943: * -1 on error.
1944: */
1945: static int
1946: rcs_parse_deltatext(RCSFILE *rfp)
1947: {
1948: int tok;
1949: RCSNUM *tnum;
1950: struct rcs_delta *rdp;
1951:
1952: tok = rcs_gettok(rfp);
1953: if (tok == RCS_TOK_EOF)
1954: return (0);
1955:
1956: if (tok != RCS_TOK_NUM) {
1.50 jfb 1957: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1958: cvs_log(LP_ERR,
1959: "unexpected token `%s' at start of RCS delta text",
1960: RCS_TOKSTR(rfp));
1961: return (-1);
1962: }
1.13 jfb 1963:
1964: tnum = rcsnum_alloc();
1.1 jfb 1965: rcsnum_aton(RCS_TOKSTR(rfp), NULL, tnum);
1966:
1967: TAILQ_FOREACH(rdp, &(rfp->rf_delta), rd_list) {
1968: if (rcsnum_cmp(tnum, rdp->rd_num, 0) == 0)
1969: break;
1970: }
1.13 jfb 1971: rcsnum_free(tnum);
1972:
1.1 jfb 1973: if (rdp == NULL) {
1974: cvs_log(LP_ERR, "RCS delta text `%s' has no matching delta",
1975: RCS_TOKSTR(rfp));
1976: return (-1);
1977: }
1978:
1979: tok = rcs_gettok(rfp);
1980: if (tok != RCS_TOK_LOG) {
1.50 jfb 1981: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1982: cvs_log(LP_ERR, "unexpected token `%s' where RCS log expected",
1983: RCS_TOKSTR(rfp));
1984: return (-1);
1985: }
1986:
1987: tok = rcs_gettok(rfp);
1988: if (tok != RCS_TOK_STRING) {
1.50 jfb 1989: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1990: cvs_log(LP_ERR, "unexpected token `%s' where RCS log expected",
1991: RCS_TOKSTR(rfp));
1992: return (-1);
1993: }
1.110 joris 1994: rdp->rd_log = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 1995: tok = rcs_gettok(rfp);
1996: if (tok != RCS_TOK_TEXT) {
1.50 jfb 1997: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 1998: cvs_log(LP_ERR, "unexpected token `%s' where RCS text expected",
1999: RCS_TOKSTR(rfp));
2000: return (-1);
2001: }
2002:
2003: tok = rcs_gettok(rfp);
2004: if (tok != RCS_TOK_STRING) {
1.50 jfb 2005: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2006: cvs_log(LP_ERR, "unexpected token `%s' where RCS text expected",
2007: RCS_TOKSTR(rfp));
2008: return (-1);
2009: }
2010:
1.110 joris 2011: rdp->rd_text = (u_char *)xmalloc(RCS_TOKLEN(rfp) + 1);
1.74 joris 2012: strlcpy(rdp->rd_text, RCS_TOKSTR(rfp), (RCS_TOKLEN(rfp) + 1));
1.42 jfb 2013: rdp->rd_tlen = RCS_TOKLEN(rfp);
1.1 jfb 2014:
2015: return (1);
2016: }
2017:
2018: /*
2019: * rcs_parse_access()
2020: *
2021: * Parse the access list given as value to the `access' keyword.
2022: * Returns 0 on success, or -1 on failure.
2023: */
2024: static int
2025: rcs_parse_access(RCSFILE *rfp)
2026: {
2027: int type;
2028:
2029: while ((type = rcs_gettok(rfp)) != RCS_TOK_SCOLON) {
2030: if (type != RCS_TOK_ID) {
1.50 jfb 2031: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2032: cvs_log(LP_ERR, "unexpected token `%s' in access list",
2033: RCS_TOKSTR(rfp));
2034: return (-1);
2035: }
1.29 jfb 2036:
2037: if (rcs_access_add(rfp, RCS_TOKSTR(rfp)) < 0)
2038: return (-1);
1.1 jfb 2039: }
2040:
2041: return (0);
2042: }
2043:
2044: /*
2045: * rcs_parse_symbols()
2046: *
2047: * Parse the symbol list given as value to the `symbols' keyword.
2048: * Returns 0 on success, or -1 on failure.
2049: */
2050: static int
2051: rcs_parse_symbols(RCSFILE *rfp)
2052: {
2053: int type;
2054: struct rcs_sym *symp;
2055:
2056: for (;;) {
2057: type = rcs_gettok(rfp);
2058: if (type == RCS_TOK_SCOLON)
2059: break;
2060:
1.41 jfb 2061: if (type != RCS_TOK_ID) {
1.50 jfb 2062: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2063: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2064: RCS_TOKSTR(rfp));
2065: return (-1);
2066: }
2067:
1.110 joris 2068: symp = (struct rcs_sym *)xmalloc(sizeof(*symp));
2069: symp->rs_name = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 2070: symp->rs_num = rcsnum_alloc();
2071:
2072: type = rcs_gettok(rfp);
2073: if (type != RCS_TOK_COLON) {
1.50 jfb 2074: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2075: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2076: RCS_TOKSTR(rfp));
1.11 joris 2077: rcsnum_free(symp->rs_num);
1.110 joris 2078: xfree(symp->rs_name);
2079: xfree(symp);
1.1 jfb 2080: return (-1);
2081: }
2082:
2083: type = rcs_gettok(rfp);
2084: if (type != RCS_TOK_NUM) {
1.50 jfb 2085: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2086: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2087: RCS_TOKSTR(rfp));
1.11 joris 2088: rcsnum_free(symp->rs_num);
1.110 joris 2089: xfree(symp->rs_name);
2090: xfree(symp);
1.1 jfb 2091: return (-1);
2092: }
2093:
2094: if (rcsnum_aton(RCS_TOKSTR(rfp), NULL, symp->rs_num) < 0) {
2095: cvs_log(LP_ERR, "failed to parse RCS NUM `%s'",
2096: RCS_TOKSTR(rfp));
1.11 joris 2097: rcsnum_free(symp->rs_num);
1.110 joris 2098: xfree(symp->rs_name);
2099: xfree(symp);
1.1 jfb 2100: return (-1);
2101: }
2102:
1.43 jfb 2103: TAILQ_INSERT_TAIL(&(rfp->rf_symbols), symp, rs_list);
1.1 jfb 2104: }
2105:
2106: return (0);
2107: }
2108:
2109: /*
2110: * rcs_parse_locks()
2111: *
2112: * Parse the lock list given as value to the `locks' keyword.
2113: * Returns 0 on success, or -1 on failure.
2114: */
2115: static int
2116: rcs_parse_locks(RCSFILE *rfp)
2117: {
2118: int type;
2119: struct rcs_lock *lkp;
2120:
2121: for (;;) {
2122: type = rcs_gettok(rfp);
2123: if (type == RCS_TOK_SCOLON)
2124: break;
2125:
2126: if (type != RCS_TOK_ID) {
1.50 jfb 2127: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2128: cvs_log(LP_ERR, "unexpected token `%s' in lock list",
2129: RCS_TOKSTR(rfp));
2130: return (-1);
2131: }
2132:
1.110 joris 2133: lkp = (struct rcs_lock *)xmalloc(sizeof(*lkp));
2134: lkp->rl_name = xstrdup(RCS_TOKSTR(rfp));
1.1 jfb 2135: lkp->rl_num = rcsnum_alloc();
2136:
2137: type = rcs_gettok(rfp);
2138: if (type != RCS_TOK_COLON) {
1.50 jfb 2139: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2140: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2141: RCS_TOKSTR(rfp));
1.37 tedu 2142: rcsnum_free(lkp->rl_num);
1.110 joris 2143: xfree(lkp->rl_name);
2144: xfree(lkp);
1.1 jfb 2145: return (-1);
2146: }
2147:
2148: type = rcs_gettok(rfp);
2149: if (type != RCS_TOK_NUM) {
1.50 jfb 2150: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2151: cvs_log(LP_ERR, "unexpected token `%s' in symbol list",
2152: RCS_TOKSTR(rfp));
1.37 tedu 2153: rcsnum_free(lkp->rl_num);
1.110 joris 2154: xfree(lkp->rl_name);
2155: xfree(lkp);
1.1 jfb 2156: return (-1);
2157: }
2158:
2159: if (rcsnum_aton(RCS_TOKSTR(rfp), NULL, lkp->rl_num) < 0) {
2160: cvs_log(LP_ERR, "failed to parse RCS NUM `%s'",
2161: RCS_TOKSTR(rfp));
1.37 tedu 2162: rcsnum_free(lkp->rl_num);
1.110 joris 2163: xfree(lkp->rl_name);
2164: xfree(lkp);
1.1 jfb 2165: return (-1);
2166: }
2167:
2168: TAILQ_INSERT_HEAD(&(rfp->rf_locks), lkp, rl_list);
2169: }
2170:
2171: /* check if we have a `strict' */
2172: type = rcs_gettok(rfp);
2173: if (type != RCS_TOK_STRICT) {
2174: rcs_pushtok(rfp, RCS_TOKSTR(rfp), type);
1.14 deraadt 2175: } else {
1.26 jfb 2176: rfp->rf_flags |= RCS_SLOCK;
1.1 jfb 2177:
2178: type = rcs_gettok(rfp);
2179: if (type != RCS_TOK_SCOLON) {
1.50 jfb 2180: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2181: cvs_log(LP_ERR,
2182: "missing semi-colon after `strict' keyword");
2183: return (-1);
2184: }
2185: }
2186:
2187: return (0);
2188: }
2189:
2190: /*
2191: * rcs_parse_branches()
2192: *
2193: * Parse the list of branches following a `branches' keyword in a delta.
2194: * Returns 0 on success, or -1 on failure.
2195: */
2196: static int
2197: rcs_parse_branches(RCSFILE *rfp, struct rcs_delta *rdp)
2198: {
2199: int type;
2200: struct rcs_branch *brp;
2201:
2202: for (;;) {
2203: type = rcs_gettok(rfp);
2204: if (type == RCS_TOK_SCOLON)
2205: break;
2206:
2207: if (type != RCS_TOK_NUM) {
1.50 jfb 2208: rcs_errno = RCS_ERR_PARSE;
1.1 jfb 2209: cvs_log(LP_ERR,
2210: "unexpected token `%s' in list of branches",
2211: RCS_TOKSTR(rfp));
2212: return (-1);
2213: }
2214:
1.110 joris 2215: brp = (struct rcs_branch *)xmalloc(sizeof(*brp));
1.46 jfb 2216: brp->rb_num = rcsnum_parse(RCS_TOKSTR(rfp));
1.11 joris 2217: if (brp->rb_num == NULL) {
1.110 joris 2218: xfree(brp);
1.11 joris 2219: return (-1);
2220: }
1.1 jfb 2221:
2222: TAILQ_INSERT_TAIL(&(rdp->rd_branches), brp, rb_list);
2223: }
2224:
2225: return (0);
2226: }
2227:
2228: /*
2229: * rcs_freedelta()
2230: *
2231: * Free the contents of a delta structure.
2232: */
1.18 jfb 2233: static void
1.1 jfb 2234: rcs_freedelta(struct rcs_delta *rdp)
2235: {
1.12 jfb 2236: struct rcs_branch *rb;
1.1 jfb 2237: struct rcs_delta *crdp;
2238:
1.12 jfb 2239: if (rdp->rd_num != NULL)
2240: rcsnum_free(rdp->rd_num);
2241: if (rdp->rd_next != NULL)
2242: rcsnum_free(rdp->rd_next);
2243:
1.1 jfb 2244: if (rdp->rd_author != NULL)
1.110 joris 2245: xfree(rdp->rd_author);
1.109 joris 2246: if (rdp->rd_locker != NULL)
1.110 joris 2247: xfree(rdp->rd_locker);
1.1 jfb 2248: if (rdp->rd_state != NULL)
1.110 joris 2249: xfree(rdp->rd_state);
1.1 jfb 2250: if (rdp->rd_log != NULL)
1.110 joris 2251: xfree(rdp->rd_log);
1.1 jfb 2252: if (rdp->rd_text != NULL)
1.110 joris 2253: xfree(rdp->rd_text);
1.12 jfb 2254:
2255: while ((rb = TAILQ_FIRST(&(rdp->rd_branches))) != NULL) {
2256: TAILQ_REMOVE(&(rdp->rd_branches), rb, rb_list);
2257: rcsnum_free(rb->rb_num);
1.110 joris 2258: xfree(rb);
1.12 jfb 2259: }
1.1 jfb 2260:
2261: while ((crdp = TAILQ_FIRST(&(rdp->rd_snodes))) != NULL) {
2262: TAILQ_REMOVE(&(rdp->rd_snodes), crdp, rd_list);
2263: rcs_freedelta(crdp);
2264: }
2265:
1.110 joris 2266: xfree(rdp);
1.1 jfb 2267: }
2268:
2269: /*
2270: * rcs_freepdata()
2271: *
2272: * Free the contents of the parser data structure.
2273: */
2274: static void
2275: rcs_freepdata(struct rcs_pdata *pd)
2276: {
2277: if (pd->rp_file != NULL)
2278: (void)fclose(pd->rp_file);
2279: if (pd->rp_buf != NULL)
1.110 joris 2280: xfree(pd->rp_buf);
2281: xfree(pd);
1.1 jfb 2282: }
2283:
2284: /*
2285: * rcs_gettok()
2286: *
2287: * Get the next RCS token from the string <str>.
2288: */
2289: static int
2290: rcs_gettok(RCSFILE *rfp)
2291: {
2292: u_int i;
2293: int ch, last, type;
1.18 jfb 2294: size_t len;
2295: char *bp;
1.1 jfb 2296: struct rcs_pdata *pdp = (struct rcs_pdata *)rfp->rf_pdata;
2297:
2298: type = RCS_TOK_ERR;
2299: bp = pdp->rp_buf;
1.42 jfb 2300: pdp->rp_tlen = 0;
1.1 jfb 2301: *bp = '\0';
2302:
2303: if (pdp->rp_pttype != RCS_TOK_ERR) {
2304: type = pdp->rp_pttype;
2305: strlcpy(pdp->rp_buf, pdp->rp_ptok, pdp->rp_blen);
2306: pdp->rp_pttype = RCS_TOK_ERR;
2307: return (type);
2308: }
2309:
2310: /* skip leading whitespace */
2311: /* XXX we must skip backspace too for compatibility, should we? */
2312: do {
2313: ch = getc(pdp->rp_file);
2314: if (ch == '\n')
1.18 jfb 2315: pdp->rp_lines++;
1.1 jfb 2316: } while (isspace(ch));
2317:
2318: if (ch == EOF) {
2319: type = RCS_TOK_EOF;
1.14 deraadt 2320: } else if (ch == ';') {
1.1 jfb 2321: type = RCS_TOK_SCOLON;
1.14 deraadt 2322: } else if (ch == ':') {
1.1 jfb 2323: type = RCS_TOK_COLON;
1.14 deraadt 2324: } else if (isalpha(ch)) {
1.31 jfb 2325: type = RCS_TOK_ID;
1.1 jfb 2326: *(bp++) = ch;
1.18 jfb 2327: for (;;) {
1.1 jfb 2328: ch = getc(pdp->rp_file);
1.11 joris 2329: if (!isalnum(ch) && ch != '_' && ch != '-') {
1.1 jfb 2330: ungetc(ch, pdp->rp_file);
2331: break;
2332: }
2333: *(bp++) = ch;
1.42 jfb 2334: pdp->rp_tlen++;
1.18 jfb 2335: if (bp == pdp->rp_bufend - 1) {
2336: len = bp - pdp->rp_buf;
1.151 ! xsa 2337: rcs_growbuf(rfp);
1.18 jfb 2338: bp = pdp->rp_buf + len;
2339: }
1.1 jfb 2340: }
2341: *bp = '\0';
2342:
1.18 jfb 2343: if (type != RCS_TOK_ERR) {
2344: for (i = 0; i < RCS_NKEYS; i++) {
2345: if (strcmp(rcs_keys[i].rk_str,
2346: pdp->rp_buf) == 0) {
2347: type = rcs_keys[i].rk_id;
2348: break;
2349: }
1.1 jfb 2350: }
2351: }
1.14 deraadt 2352: } else if (ch == '@') {
1.1 jfb 2353: /* we have a string */
1.18 jfb 2354: type = RCS_TOK_STRING;
1.1 jfb 2355: for (;;) {
2356: ch = getc(pdp->rp_file);
2357: if (ch == '@') {
2358: ch = getc(pdp->rp_file);
2359: if (ch != '@') {
2360: ungetc(ch, pdp->rp_file);
2361: break;
2362: }
1.14 deraadt 2363: } else if (ch == '\n')
1.18 jfb 2364: pdp->rp_lines++;
1.1 jfb 2365:
2366: *(bp++) = ch;
1.42 jfb 2367: pdp->rp_tlen++;
1.18 jfb 2368: if (bp == pdp->rp_bufend - 1) {
2369: len = bp - pdp->rp_buf;
1.151 ! xsa 2370: rcs_growbuf(rfp);
1.18 jfb 2371: bp = pdp->rp_buf + len;
2372: }
1.1 jfb 2373: }
2374:
2375: *bp = '\0';
1.14 deraadt 2376: } else if (isdigit(ch)) {
1.1 jfb 2377: *(bp++) = ch;
2378: last = ch;
2379: type = RCS_TOK_NUM;
2380:
2381: for (;;) {
2382: ch = getc(pdp->rp_file);
1.18 jfb 2383: if (bp == pdp->rp_bufend)
1.1 jfb 2384: break;
2385: if (!isdigit(ch) && ch != '.') {
2386: ungetc(ch, pdp->rp_file);
2387: break;
2388: }
2389:
2390: if (last == '.' && ch == '.') {
2391: type = RCS_TOK_ERR;
2392: break;
2393: }
2394: last = ch;
2395: *(bp++) = ch;
1.42 jfb 2396: pdp->rp_tlen++;
1.1 jfb 2397: }
1.18 jfb 2398: *bp = '\0';
1.1 jfb 2399: }
2400:
2401: return (type);
2402: }
2403:
2404: /*
2405: * rcs_pushtok()
2406: *
2407: * Push a token back in the parser's token buffer.
2408: */
2409: static int
2410: rcs_pushtok(RCSFILE *rfp, const char *tok, int type)
2411: {
2412: struct rcs_pdata *pdp = (struct rcs_pdata *)rfp->rf_pdata;
2413:
2414: if (pdp->rp_pttype != RCS_TOK_ERR)
2415: return (-1);
2416:
2417: pdp->rp_pttype = type;
2418: strlcpy(pdp->rp_ptok, tok, sizeof(pdp->rp_ptok));
2419: return (0);
2420: }
2421:
1.18 jfb 2422:
2423: /*
2424: * rcs_growbuf()
2425: *
2426: * Attempt to grow the internal parse buffer for the RCS file <rf> by
2427: * RCS_BUFEXTSIZE.
2428: * In case of failure, the original buffer is left unmodified.
2429: */
1.151 ! xsa 2430: static void
1.18 jfb 2431: rcs_growbuf(RCSFILE *rf)
2432: {
2433: void *tmp;
2434: struct rcs_pdata *pdp = (struct rcs_pdata *)rf->rf_pdata;
2435:
1.119 niallo 2436: tmp = xrealloc(pdp->rp_buf, pdp->rp_blen + RCS_BUFEXTSIZE);
1.18 jfb 2437: pdp->rp_buf = (char *)tmp;
2438: pdp->rp_blen += RCS_BUFEXTSIZE;
2439: pdp->rp_bufend = pdp->rp_buf + pdp->rp_blen - 1;
1.42 jfb 2440: }
2441:
2442: /*
2443: * rcs_strprint()
2444: *
2445: * Output an RCS string <str> of size <slen> to the stream <stream>. Any
2446: * '@' characters are escaped. Otherwise, the string can contain arbitrary
2447: * binary data.
2448: */
2449: static int
2450: rcs_strprint(const u_char *str, size_t slen, FILE *stream)
2451: {
2452: const u_char *ap, *ep, *sp;
2453: size_t ret;
1.52 jfb 2454:
2455: if (slen == 0)
2456: return (0);
1.42 jfb 2457:
2458: ep = str + slen - 1;
2459:
2460: for (sp = str; sp <= ep;) {
2461: ap = memchr(sp, '@', ep - sp);
2462: if (ap == NULL)
2463: ap = ep;
2464: ret = fwrite(sp, sizeof(u_char), ap - sp + 1, stream);
2465:
2466: if (*ap == '@')
2467: putc('@', stream);
2468: sp = ap + 1;
1.63 joris 2469: }
2470:
2471: return (0);
2472: }
2473:
2474: /*
2475: * rcs_expand_keywords()
2476: *
1.125 niallo 2477: * Return expansion any RCS keywords in <data>
2478: *
2479: * On error, return NULL.
1.63 joris 2480: */
1.125 niallo 2481: static char *
2482: rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, char *data,
1.63 joris 2483: size_t len, int mode)
2484: {
1.147 ray 2485: size_t i;
1.125 niallo 2486: int kwtype, sizdiff;
1.147 ray 2487: u_int j, found, start_offset, c_offset;
1.140 xsa 2488: char *c, *kwstr, *start, *end, *tbuf;
1.125 niallo 2489: char expbuf[256], buf[256];
1.140 xsa 2490: struct tm *tb;
1.134 joris 2491: char *fmt;
1.63 joris 2492:
1.65 niallo 2493: kwtype = 0;
2494: kwstr = NULL;
1.63 joris 2495: i = 0;
2496:
2497: /*
1.134 joris 2498: * -z support for RCS
2499: */
2500: tb = &rdp->rd_date;
1.140 xsa 2501: if (timezone_flag != NULL)
2502: tb = rcs_set_tz(timezone_flag, rdp);
1.134 joris 2503:
2504: /*
1.63 joris 2505: * Keyword formats:
2506: * $Keyword$
2507: * $Keyword: value$
2508: */
1.144 deraadt 2509: for (c = data; *c != '\0' && i < len; c++) {
1.63 joris 2510: if (*c == '$') {
2511: /* remember start of this possible keyword */
2512: start = c;
1.125 niallo 2513: start_offset = start - data;
1.63 joris 2514:
2515: /* first following character has to be alphanumeric */
1.144 deraadt 2516: c++;
1.63 joris 2517: if (!isalpha(*c)) {
2518: c = start;
2519: continue;
2520: }
2521:
2522: /* look for any matching keywords */
2523: found = 0;
2524: for (j = 0; j < RCS_NKWORDS; j++) {
2525: if (!strncmp(c, rcs_expkw[j].kw_str,
2526: strlen(rcs_expkw[j].kw_str))) {
2527: found = 1;
2528: kwstr = rcs_expkw[j].kw_str;
2529: kwtype = rcs_expkw[j].kw_type;
2530: break;
2531: }
2532: }
2533:
2534: /* unknown keyword, continue looking */
2535: if (found == 0) {
2536: c = start;
2537: continue;
2538: }
2539:
2540: /* next character has to be ':' or '$' */
2541: c += strlen(kwstr);
2542: if (*c != ':' && *c != '$') {
2543: c = start;
2544: continue;
2545: }
2546:
2547: /*
2548: * if the next character was ':' we need to look for
2549: * an '$' before the end of the line to be sure it is
2550: * in fact a keyword.
2551: */
2552: if (*c == ':') {
2553: while (*c++) {
2554: if (*c == '$' || *c == '\n')
2555: break;
2556: }
2557:
2558: if (*c != '$') {
2559: c = start;
2560: continue;
2561: }
2562: }
1.125 niallo 2563: c_offset = c - data;
2564: end = c + 1;
1.63 joris 2565:
2566: /* start constructing the expansion */
2567: expbuf[0] = '\0';
2568:
2569: if (mode & RCS_KWEXP_NAME) {
2570: strlcat(expbuf, "$", sizeof(expbuf));
2571: strlcat(expbuf, kwstr, sizeof(expbuf));
2572: if (mode & RCS_KWEXP_VAL)
2573: strlcat(expbuf, ": ", sizeof(expbuf));
2574: }
2575:
2576: /*
1.80 reyk 2577: * order matters because of RCS_KW_ID and
2578: * RCS_KW_HEADER here
1.63 joris 2579: */
2580: if (mode & RCS_KWEXP_VAL) {
2581: if (kwtype & RCS_KW_RCSFILE) {
2582: if (!(kwtype & RCS_KW_FULLPATH))
1.80 reyk 2583: strlcat(expbuf,
2584: basename(rcsfile),
1.63 joris 2585: sizeof(expbuf));
2586: else
2587: strlcat(expbuf, rcsfile,
2588: sizeof(expbuf));
2589: strlcat(expbuf, " ", sizeof(expbuf));
2590: }
2591:
2592: if (kwtype & RCS_KW_REVISION) {
1.80 reyk 2593: rcsnum_tostr(rdp->rd_num, buf,
2594: sizeof(buf));
1.63 joris 2595: strlcat(buf, " ", sizeof(buf));
2596: strlcat(expbuf, buf, sizeof(expbuf));
2597: }
2598:
2599: if (kwtype & RCS_KW_DATE) {
1.134 joris 2600: if (timezone_flag != NULL)
2601: fmt = "%Y/%m/%d %H:%M:%S%z ";
2602: else
2603: fmt = "%Y/%m/%d %H:%M:%S ";
2604:
2605: strftime(buf, sizeof(buf), fmt, tb);
1.63 joris 2606: strlcat(expbuf, buf, sizeof(expbuf));
2607: }
2608:
2609: if (kwtype & RCS_KW_AUTHOR) {
2610: strlcat(expbuf, rdp->rd_author,
2611: sizeof(expbuf));
2612: strlcat(expbuf, " ", sizeof(expbuf));
2613: }
2614:
2615: if (kwtype & RCS_KW_STATE) {
2616: strlcat(expbuf, rdp->rd_state,
2617: sizeof(expbuf));
2618: strlcat(expbuf, " ", sizeof(expbuf));
2619: }
2620:
2621: /* order does not matter anymore below */
2622: if (kwtype & RCS_KW_LOG)
2623: strlcat(expbuf, " ", sizeof(expbuf));
2624:
2625: if (kwtype & RCS_KW_SOURCE) {
1.80 reyk 2626: strlcat(expbuf, rcsfile,
2627: sizeof(expbuf));
1.63 joris 2628: strlcat(expbuf, " ", sizeof(expbuf));
2629: }
2630:
2631: if (kwtype & RCS_KW_NAME)
2632: strlcat(expbuf, " ", sizeof(expbuf));
2633: }
2634:
2635: /* end the expansion */
2636: if (mode & RCS_KWEXP_NAME)
2637: strlcat(expbuf, "$", sizeof(expbuf));
1.138 deraadt 2638:
1.125 niallo 2639: sizdiff = strlen(expbuf) - (end - start);
2640: tbuf = xmalloc(strlen(end) + 1);
2641: strlcpy(tbuf, end, strlen(end) + 1);
2642: /* only realloc if we have to */
2643: if (sizdiff > 0) {
2644: len += sizdiff;
2645: data = xrealloc(data, len);
2646: /*
2647: * ensure string pointers are not invalidated
2648: * after realloc()
2649: */
2650: start = data + start_offset;
2651: c = data + c_offset;
2652: }
2653: strlcpy(start, expbuf, len);
2654: strlcat(data, tbuf, len);
2655: xfree(tbuf);
1.63 joris 2656: i += strlen(expbuf);
2657: }
1.42 jfb 2658: }
1.81 niallo 2659:
1.125 niallo 2660: return (data);
1.81 niallo 2661: }
2662:
2663: /*
2664: * rcs_deltatext_set()
2665: *
2666: * Set deltatext for <rev> in RCS file <rfp> to <dtext>
1.96 xsa 2667: * Returns -1 on error, 0 on success.
1.81 niallo 2668: */
2669: int
2670: rcs_deltatext_set(RCSFILE *rfp, RCSNUM *rev, const char *dtext)
2671: {
2672: size_t len;
2673: struct rcs_delta *rdp;
1.117 niallo 2674:
2675: /* Write operations require full parsing */
2676: rcs_parse_deltatexts(rfp, NULL);
1.81 niallo 2677:
2678: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2679: return (-1);
2680:
2681: if (rdp->rd_text != NULL)
1.110 joris 2682: xfree(rdp->rd_text);
1.81 niallo 2683:
2684: len = strlen(dtext);
1.103 joris 2685: if (len != 0) {
1.110 joris 2686: rdp->rd_text = (u_char *)xmalloc(len);
1.103 joris 2687: rdp->rd_tlen = len - 1;
2688: strlcpy(rdp->rd_text, dtext, len);
2689: } else {
2690: rdp->rd_text = NULL;
2691: rdp->rd_tlen = 0;
2692: }
1.18 jfb 2693:
1.86 joris 2694: return (0);
2695: }
2696:
2697: /*
2698: * rcs_rev_setlog()
2699: *
2700: * Sets the log message of revision <rev> to <logtext>
2701: */
2702: int
2703: rcs_rev_setlog(RCSFILE *rfp, RCSNUM *rev, const char *logtext)
2704: {
2705: struct rcs_delta *rdp;
2706: char buf[16];
2707:
2708: rcsnum_tostr(rev, buf, sizeof(buf));
2709:
2710: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2711: return (-1);
2712:
2713: if (rdp->rd_log != NULL)
1.110 joris 2714: xfree(rdp->rd_log);
1.86 joris 2715:
1.110 joris 2716: rdp->rd_log = xstrdup(logtext);
1.86 joris 2717: rfp->rf_flags &= ~RCS_SYNCED;
1.95 niallo 2718: return (0);
2719: }
1.97 niallo 2720: /*
2721: * rcs_rev_getdate()
2722: *
2723: * Get the date corresponding to a given revision.
2724: * Returns the date on success, -1 on failure.
2725: */
2726: time_t
2727: rcs_rev_getdate(RCSFILE *rfp, RCSNUM *rev)
2728: {
2729: struct rcs_delta *rdp;
2730:
2731: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2732: return (-1);
2733:
2734: return (mktime(&rdp->rd_date));
2735: }
1.95 niallo 2736:
2737: /*
2738: * rcs_state_set()
2739: *
2740: * Sets the state of revision <rev> to <state>
2741: * NOTE: default state is 'Exp'. States may not contain spaces.
2742: *
2743: * Returns -1 on failure, 0 on success.
2744: */
2745: int
2746: rcs_state_set(RCSFILE *rfp, RCSNUM *rev, const char *state)
2747: {
2748: struct rcs_delta *rdp;
2749:
2750: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2751: return (-1);
2752:
2753: if (rdp->rd_state != NULL)
1.110 joris 2754: xfree(rdp->rd_state);
1.95 niallo 2755:
1.110 joris 2756: rdp->rd_state = xstrdup(state);
1.95 niallo 2757:
2758: rfp->rf_flags &= ~RCS_SYNCED;
2759:
2760: return (0);
2761: }
2762:
2763: /*
2764: * rcs_state_check()
2765: *
2766: * Check if string <state> is valid.
2767: *
1.96 xsa 2768: * Returns 0 if the string is valid, -1 otherwise.
1.95 niallo 2769: */
2770: int
2771: rcs_state_check(const char *state)
2772: {
2773: if (strchr(state, ' ') != NULL)
2774: return (-1);
2775:
1.18 jfb 2776: return (0);
1.1 jfb 2777: }
1.97 niallo 2778:
2779: /*
2780: * rcs_state_get()
2781: *
2782: * Get the state for a given revision of a specified RCSFILE.
2783: *
2784: * Returns NULL on failure.
2785: */
2786: const char *
2787: rcs_state_get(RCSFILE *rfp, RCSNUM *rev)
2788: {
2789: struct rcs_delta *rdp;
2790:
2791: if ((rdp = rcs_findrev(rfp, rev)) == NULL)
2792: return (NULL);
2793:
2794: return (rdp->rd_state);
2795: }
2796:
1.131 niallo 2797: /*
2798: * rcs_kwexp_buf()
2799: *
2800: * Do keyword expansion on a buffer if necessary
2801: *
2802: */
2803: BUF *
2804: rcs_kwexp_buf(BUF *bp, RCSFILE *rf, RCSNUM *rev)
2805: {
2806: struct rcs_delta *rdp;
2807: char *expanded, *tbuf;
2808: int expmode;
2809: size_t len;
2810:
2811: /*
2812: * Do keyword expansion if required.
2813: */
2814: if (rf->rf_expand != NULL)
2815: expmode = rcs_kwexp_get(rf);
2816: else
2817: expmode = RCS_KWEXP_DEFAULT;
2818:
2819: if (!(expmode & RCS_KWEXP_NONE)) {
2820: if ((rdp = rcs_findrev(rf, rev)) == NULL)
2821: fatal("could not fetch revision");
2822: cvs_buf_putc(bp, '\0');
2823: len = cvs_buf_len(bp);
2824: tbuf = cvs_buf_release(bp);
2825: expanded = rcs_expand_keywords(rf->rf_path, rdp,
2826: tbuf, len, expmode);
2827: bp = cvs_buf_alloc(len, BUF_AUTOEXT);
1.138 deraadt 2828: cvs_buf_set(bp, expanded, strlen(expanded), 0);
1.131 niallo 2829: xfree(expanded);
2830: }
2831: return (bp);
2832: }
2833:
1.105 joris 2834:
1.106 joris 2835: #if !defined(RCSPROG)
2836:
1.105 joris 2837: static char *month_tab[] = {
2838: "Jan",
2839: "Feb",
2840: "Mar",
2841: "Apr",
2842: "May",
2843: "Jun",
2844: "Jul",
2845: "Aug",
2846: "Sep",
2847: "Oct",
2848: "Nov",
2849: "Dec"
2850: };
2851:
2852: /*
2853: * Checkout a certain revision <rev> of RCS file <rf> to either standard
2854: * output when running in server mode, or to <fpath> when running in local mode.
2855: *
2856: * If type is CHECKOUT_REV_MERGED we have an extra argument, which
2857: * is the buffer containing the merged file.
2858: *
2859: * If type is CHECKOUT_REV_REMOVED, the file has been removed and we
2860: * need to do the same thing.
2861: */
2862: int
2863: cvs_checkout_rev(RCSFILE *rf, RCSNUM *rev, CVSFILE *cf, char *fpath,
2864: int local, int type, ...)
2865: {
2866: BUF *bp;
2867: int l, ret, fsize;
2868: char timebuf[32], entry[MAXPATHLEN], copyfile[MAXPATHLEN];
2869: char *content, *repo, buf[MAXPATHLEN], modestr[16];
2870: struct cvsroot *root;
2871: struct cvs_ent *ent;
2872: va_list ap;
2873: time_t rcstime;
2874: struct timeval tv[2];
2875: struct tm *tp;
2876: RCSNUM *oldrev;
2877:
2878: bp = NULL;
2879: ret = -1;
2880: content = NULL;
2881: oldrev = NULL;
2882:
2883: if ((type != CHECKOUT_REV_MERGED) && (type != CHECKOUT_REV_REMOVED)) {
2884: /* fetch the contents of the revision */
2885: if ((bp = rcs_getrev(rf, rev)) == NULL) {
2886: cvs_log(LP_ERR, "revision '%s' not found in file '%s'",
2887: rcsnum_tostr(rev, buf, sizeof(buf)), fpath);
2888: goto out;
2889: }
1.131 niallo 2890: bp = rcs_kwexp_buf(bp, rf, rev);
1.105 joris 2891: } else if (type != CHECKOUT_REV_REMOVED) {
2892: va_start(ap, type);
2893: bp = va_arg(ap, BUF *);
2894: va_end(ap);
2895: }
2896:
2897: if (type == CHECKOUT_REV_CREATED)
2898: rcstime = rcs_rev_getdate(rf, rev);
1.108 joris 2899: else if (type == CHECKOUT_REV_MERGED ||
2900: type == CHECKOUT_REV_UPDATED) {
1.105 joris 2901: time(&rcstime);
1.108 joris 2902: if ((rcstime = cvs_hack_time(rcstime, 1)) < 0)
2903: goto out;
2904: }
1.105 joris 2905:
1.108 joris 2906: if (type == CHECKOUT_REV_CREATED ||
1.130 niallo 2907: type == CHECKOUT_REV_MERGED ||
1.108 joris 2908: type == CHECKOUT_REV_UPDATED) {
1.105 joris 2909: ctime_r(&rcstime, timebuf);
2910: l = strlen(timebuf);
2911: if ((l > 0) && (timebuf[l - 1] == '\n'))
2912: timebuf[--l] = '\0';
2913:
2914: l = snprintf(entry, sizeof(entry), "/%s/%s/%s/%s/", cf->cf_name,
2915: rcsnum_tostr(rev, buf, sizeof(buf)),
2916: (local == 1) ? timebuf : "",
2917: (type == CHECKOUT_REV_MERGED) ? "+=" : "");
2918: if (l == -1 || l >= (int)sizeof(buf))
2919: goto out;
2920: }
2921:
2922: if (type == CHECKOUT_REV_MERGED) {
1.111 joris 2923: oldrev = rcsnum_alloc();
2924: rcsnum_cpy(rev, oldrev, 0);
1.105 joris 2925:
1.143 niallo 2926: if (oldrev->rn_id[oldrev->rn_len - 1] <= 0)
1.105 joris 2927: goto out;
1.143 niallo 2928: oldrev = rcsnum_dec(oldrev);
1.105 joris 2929:
2930: l = snprintf(copyfile, sizeof(copyfile), ".#%s.%s",
2931: cf->cf_name, rcsnum_tostr(oldrev, buf, sizeof(buf)));
2932: if (l == -1 || l >= (int)sizeof(copyfile))
2933: goto out;
2934: }
2935:
2936: root = CVS_DIR_ROOT(cf);
2937: repo = CVS_DIR_REPO(cf);
2938:
2939: /*
2940: * In local mode, just copy the entire contents to fpath.
2941: * In server mode, we need to send it to the client together with
2942: * some responses.
2943: */
2944: if (local) {
2945: l = 0;
2946: if (cf->cf_entry == NULL) {
2947: l = 1;
2948: cf->cf_entry = cvs_ent_open(cf->cf_dir, O_RDWR);
2949: if (cf->cf_entry == NULL) {
1.122 reyk 2950: cvs_log(LP_ERR, "failed to open Entry "
2951: "file '%s'", cf->cf_dir);
1.105 joris 2952: goto out;
2953: }
2954: }
2955:
2956: cvs_ent_remove(cf->cf_entry, cf->cf_name, 1);
2957: if (type != CHECKOUT_REV_REMOVED) {
2958: cvs_ent_addln(cf->cf_entry, entry);
2959: ent = cvs_ent_get(cf->cf_entry, cf->cf_name);
2960: ent->processed = 1;
2961: }
2962:
2963: if (l == 1)
2964: cvs_ent_close(cf->cf_entry);
2965:
2966: switch (type) {
2967: case CHECKOUT_REV_REMOVED:
2968: if (cvs_unlink(fpath) < 0)
2969: goto out;
2970: break;
2971: case CHECKOUT_REV_MERGED:
2972: /* XXX move the old file when merging */
1.108 joris 2973: case CHECKOUT_REV_UPDATED:
1.105 joris 2974: case CHECKOUT_REV_CREATED:
1.114 xsa 2975: cvs_buf_write(bp, fpath, cf->cf_mode);
1.107 joris 2976: /*
2977: * correct the time first
2978: */
2979: if ((rcstime = cvs_hack_time(rcstime, 0)) == 0)
2980: goto out;
2981:
1.105 joris 2982: tv[0].tv_sec = rcstime;
2983: tv[0].tv_usec = 0;
2984: tv[1] = tv[0];
2985: if (utimes(fpath, tv) == -1)
2986: cvs_log(LP_ERRNO, "failed to set timestamps");
2987: break;
2988: }
2989: } else {
2990: /* sanity */
2991: if (cf->cf_type != DT_REG) {
2992: cvs_log(LP_ERR, "cvs_checkout_rev: none DT_REG file");
2993: goto out;
2994: }
2995:
2996: /*
2997: * if we are removing a file, we don't need this stuff.
2998: */
2999: if (type != CHECKOUT_REV_REMOVED) {
1.107 joris 3000: if ((rcstime = cvs_hack_time(rcstime, 0)) == 0)
3001: goto out;
3002:
1.105 joris 3003: tp = gmtime(&rcstime);
3004: l = snprintf(timebuf, sizeof(timebuf),
3005: "%02d %s %d %02d:%02d:%02d -0000",
3006: tp->tm_mday, month_tab[tp->tm_mon],
3007: tp->tm_year + 1900, tp->tm_hour,
3008: tp->tm_min, tp->tm_sec);
3009: if (l == -1 || l >= (int)sizeof(timebuf))
3010: goto out;
3011:
3012: fsize = cvs_buf_len(bp);
3013: cvs_modetostr(cf->cf_mode, modestr, sizeof(modestr));
1.114 xsa 3014: cvs_buf_putc(bp, '\0');
1.105 joris 3015: content = cvs_buf_release(bp);
3016: bp = NULL;
3017: }
3018:
3019: if (type == CHECKOUT_REV_MERGED) {
3020: printf("Copy-file %s/\n", (cf->cf_dir != NULL) ?
3021: cf->cf_dir : ".");
3022: printf("%s/%s/%s\n", root->cr_dir, repo, cf->cf_name);
3023: printf("%s\n", copyfile);
3024: }
3025:
3026: switch (type) {
3027: case CHECKOUT_REV_MERGED:
3028: printf("Merged");
3029: break;
3030: case CHECKOUT_REV_REMOVED:
3031: printf("Removed");
3032: break;
3033: case CHECKOUT_REV_CREATED:
3034: printf("Mod-time %s\n", timebuf);
3035: printf("Created");
3036: break;
3037: default:
3038: cvs_log(LP_ERR, "cvs_checkout_rev: bad type %d",
3039: type);
3040: goto out;
3041: }
3042:
3043: printf(" %s/\n", (cf->cf_dir != NULL) ? cf->cf_dir : ".");
3044: printf("%s/%s\n", repo, cf->cf_name);
3045:
3046: if (type != CHECKOUT_REV_REMOVED) {
3047: printf("%s\n", entry);
3048: printf("%s\n%d\n%s", modestr, fsize, content);
3049: }
3050: }
3051:
3052: ret = 0;
3053:
3054: out:
3055: if (oldrev != NULL)
3056: rcsnum_free(oldrev);
3057: if (bp != NULL)
3058: cvs_buf_free(bp);
3059: if (content != NULL)
1.110 joris 3060: xfree(content);
1.105 joris 3061:
3062: return (ret);
3063: }
1.106 joris 3064:
3065: #endif
![[BACK]](/icons/back.gif){kind=icon}
Return to rcs.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs