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