Annotation of src/usr.bin/rcs/ci.c, Revision 1.131
1.131 ! xsa 1: /* $OpenBSD: ci.c,v 1.130 2006/03/28 12:07:10 xsa Exp $ */
1.1 niallo 2: /*
1.98 niallo 3: * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org>
1.1 niallo 4: * All rights reserved.
5: *
6: * Redistribution and use in source and binary forms, with or without
7: * modification, are permitted provided that the following cinditions
8: * are met:
9: *
10: * 1. Redistributions of source cide must retain the above cipyright
11: * notice, this list of cinditions and the following disclaimer.
12: * 2. The name of the author may not be used to endorse or promote products
13: * derived from this software without specific prior written permission.
14: *
15: * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
16: * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
17: * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
18: * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19: * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20: * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
21: * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
22: * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23: * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
24: * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25: */
26:
1.91 xsa 27: #include "includes.h"
1.1 niallo 28:
1.92 xsa 29: #include "rcsprog.h"
1.4 niallo 30: #include "diff.h"
1.9 niallo 31:
1.125 ray 32: #define CI_OPTSTRING "d::f::I::i::j::k::l::m:M::N:n:qr::s:Tt:u::Vw:x::z:"
1.107 deraadt 33: #define DATE_NOW -1
34: #define DATE_MTIME -2
35:
36: #define KW_ID "Id"
37: #define KW_AUTHOR "Author"
38: #define KW_DATE "Date"
39: #define KW_STATE "State"
40: #define KW_REVISION "Revision"
41:
42: #define KW_TYPE_ID 1
43: #define KW_TYPE_AUTHOR 2
44: #define KW_TYPE_DATE 3
45: #define KW_TYPE_STATE 4
46: #define KW_TYPE_REVISION 5
47:
48: #define KW_NUMTOKS_ID 10
49: #define KW_NUMTOKS_AUTHOR 3
50: #define KW_NUMTOKS_DATE 4
51: #define KW_NUMTOKS_STATE 3
52: #define KW_NUMTOKS_REVISION 3
1.58 niallo 53:
1.115 niallo 54: #define RCSNUM_ZERO_ENDING(x) (x->rn_id[x->rn_len - 1] == 0)
55:
1.98 niallo 56: extern struct rcs_kw rcs_expkw[];
57:
1.58 niallo 58: struct checkin_params {
59: int flags, openflags;
60: mode_t fmode;
61: time_t date;
62: RCSFILE *file;
63: RCSNUM *frev, *newrev;
64: char fpath[MAXPATHLEN], *rcs_msg, *username, *deltatext, *filename;
1.98 niallo 65: char *author, *state;
66: const char *symbol, *description;
1.58 niallo 67: };
68:
1.94 niallo 69: static int checkin_attach_symbol(struct checkin_params *);
70: static int checkin_checklock(struct checkin_params *);
1.68 xsa 71: static char *checkin_diff_file(struct checkin_params *);
72: static char *checkin_getdesc(void);
73: static char *checkin_getinput(const char *);
74: static char *checkin_getlogmsg(RCSNUM *, RCSNUM *);
75: static int checkin_init(struct checkin_params *);
1.107 deraadt 76: static int checkin_keywordscan(char *, RCSNUM **, time_t *, char **,
1.98 niallo 77: char **);
1.107 deraadt 78: static int checkin_keywordtype(char *);
1.94 niallo 79: static int checkin_mtimedate(struct checkin_params *);
1.107 deraadt 80: static void checkin_parsekeyword(char *, RCSNUM **, time_t *, char **,
1.98 niallo 81: char **);
1.94 niallo 82: static int checkin_update(struct checkin_params *);
83: static void checkin_revert(struct checkin_params *);
1.4 niallo 84:
1.1 niallo 85: void
86: checkin_usage(void)
87: {
88: fprintf(stderr,
1.119 xsa 89: "usage: ci [-jMNqV] [-d[date]] [-f[rev]] [-I[rev]] [-i[rev]]\n"
90: " [-j[rev]] [-k[rev]] [-l[rev]] [-M[rev]] [-mmsg]\n"
91: " [-Nsymbol] [-nsymbol] [-r[rev]] [-sstate] [-tfile|str]\n"
92: " [-u[rev]] [-wusername] [-xsuffixes] [-ztz] file ...\n");
1.58 niallo 93: }
94:
1.55 niallo 95:
1.1 niallo 96:
97: /*
98: * checkin_main()
99: *
100: * Handler for the `ci' program.
101: * Returns 0 on success, or >0 on error.
102: */
103: int
104: checkin_main(int argc, char **argv)
105: {
1.58 niallo 106: int i, ch, status;
107: struct checkin_params pb;
1.1 niallo 108:
1.58 niallo 109: pb.date = DATE_NOW;
110: pb.file = NULL;
1.98 niallo 111: pb.rcs_msg = pb.username = pb.author = pb.state = NULL;
112: pb.symbol = pb.description = NULL;
1.58 niallo 113: pb.newrev = NULL;
1.128 niallo 114: pb.flags = status = 0;
115: pb.fmode = S_IRUSR|S_IRGRP|S_IROTH;
1.1 niallo 116:
1.120 joris 117: pb.flags = INTERACTIVE;
1.90 niallo 118: pb.openflags = RCS_RDWR|RCS_CREATE|RCS_PARSE_FULLY;
1.9 niallo 119:
1.58 niallo 120: while ((ch = rcs_getopt(argc, argv, CI_OPTSTRING)) != -1) {
1.1 niallo 121: switch (ch) {
1.20 niallo 122: case 'd':
1.25 niallo 123: if (rcs_optarg == NULL)
1.58 niallo 124: pb.date = DATE_MTIME;
1.87 xsa 125: else if ((pb.date = cvs_date_parse(rcs_optarg)) <= 0)
126: fatal("invalid date");
1.20 niallo 127: break;
1.29 niallo 128: case 'f':
1.58 niallo 129: rcs_set_rev(rcs_optarg, &pb.newrev);
130: pb.flags |= FORCE;
1.29 niallo 131: break;
1.1 niallo 132: case 'h':
133: (usage)();
134: exit(0);
1.121 ray 135: /* NOTREACHED */
1.119 xsa 136: case 'I':
137: rcs_set_rev(rcs_optarg, &pb.newrev);
138: pb.flags |= INTERACTIVE;
139: break;
1.58 niallo 140: case 'i':
141: rcs_set_rev(rcs_optarg, &pb.newrev);
142: pb.openflags |= RCS_CREATE;
1.66 niallo 143: pb.flags |= CI_INIT;
1.58 niallo 144: break;
145: case 'j':
146: rcs_set_rev(rcs_optarg, &pb.newrev);
147: pb.openflags &= ~RCS_CREATE;
1.66 niallo 148: pb.flags &= ~CI_INIT;
1.58 niallo 149: break;
1.98 niallo 150: case 'k':
151: rcs_set_rev(rcs_optarg, &pb.newrev);
152: pb.flags |= CI_KEYWORDSCAN;
153: break;
1.30 niallo 154: case 'l':
1.58 niallo 155: rcs_set_rev(rcs_optarg, &pb.newrev);
156: pb.flags |= CO_LOCK;
1.54 niallo 157: break;
158: case 'M':
1.58 niallo 159: rcs_set_rev(rcs_optarg, &pb.newrev);
160: pb.flags |= CO_REVDATE;
1.30 niallo 161: break;
1.1 niallo 162: case 'm':
1.58 niallo 163: pb.rcs_msg = rcs_optarg;
1.87 xsa 164: if (pb.rcs_msg == NULL)
165: fatal("missing message for -m option");
1.58 niallo 166: pb.flags &= ~INTERACTIVE;
1.3 joris 167: break;
1.42 niallo 168: case 'N':
1.84 joris 169: pb.symbol = xstrdup(rcs_optarg);
1.87 xsa 170: if (rcs_sym_check(pb.symbol) != 1)
171: fatal("invalid symbol `%s'", pb.symbol);
1.58 niallo 172: pb.flags |= CI_SYMFORCE;
1.42 niallo 173: break;
1.38 niallo 174: case 'n':
1.84 joris 175: pb.symbol = xstrdup(rcs_optarg);
1.87 xsa 176: if (rcs_sym_check(pb.symbol) != 1)
177: fatal("invalid symbol `%s'", pb.symbol);
1.38 niallo 178: break;
1.3 joris 179: case 'q':
180: verbose = 0;
1.1 niallo 181: break;
1.30 niallo 182: case 'r':
1.58 niallo 183: rcs_set_rev(rcs_optarg, &pb.newrev);
184: pb.flags |= CI_DEFAULT;
1.9 niallo 185: break;
1.51 niallo 186: case 's':
1.58 niallo 187: pb.state = rcs_optarg;
1.87 xsa 188: if (rcs_state_check(pb.state) < 0)
189: fatal("invalid state `%s'", pb.state);
1.67 xsa 190: break;
191: case 'T':
192: pb.flags |= PRESERVETIME;
1.51 niallo 193: break;
1.80 niallo 194: case 't':
1.84 joris 195: pb.description = xstrdup(rcs_optarg);
1.80 niallo 196: break;
1.9 niallo 197: case 'u':
1.58 niallo 198: rcs_set_rev(rcs_optarg, &pb.newrev);
199: pb.flags |= CO_UNLOCK;
1.9 niallo 200: break;
1.30 niallo 201: case 'V':
202: printf("%s\n", rcs_version);
203: exit(0);
1.121 ray 204: /* NOTREACHED */
1.31 niallo 205: case 'w':
1.84 joris 206: pb.author = xstrdup(rcs_optarg);
1.64 xsa 207: break;
208: case 'x':
1.125 ray 209: /* Use blank extension if none given. */
210: rcs_suffixes = rcs_optarg ? rcs_optarg : "";
1.110 joris 211: break;
212: case 'z':
213: timezone_flag = rcs_optarg;
1.31 niallo 214: break;
1.1 niallo 215: default:
216: (usage)();
217: exit(1);
218: }
219: }
220:
1.24 joris 221: argc -= rcs_optind;
222: argv += rcs_optind;
223:
1.1 niallo 224: if (argc == 0) {
225: cvs_log(LP_ERR, "no input file");
226: (usage)();
227: exit(1);
228: }
229:
1.86 xsa 230: if ((pb.username = getlogin()) == NULL)
231: fatal("getlogin failed");
1.31 niallo 232:
233:
1.1 niallo 234: for (i = 0; i < argc; i++) {
1.58 niallo 235: pb.filename = argv[i];
1.1 niallo 236:
1.58 niallo 237: /*
238: * Test for existence of ,v file. If we are expected to
239: * create one, set NEWFILE flag.
240: */
1.71 niallo 241: if (rcs_statfile(pb.filename, pb.fpath, sizeof(pb.fpath)) < 0) {
242: if (pb.openflags & RCS_CREATE)
243: pb.flags |= NEWFILE;
244: else {
245: cvs_log(LP_ERR, "No existing RCS file");
246: status = 1;
247: continue;
248: }
1.66 niallo 249: } else {
250: if (pb.flags & CI_INIT) {
251: cvs_log(LP_ERR, "%s already exists", pb.fpath);
252: status = 1;
253: continue;
254: }
1.58 niallo 255: pb.openflags &= ~RCS_CREATE;
1.66 niallo 256: }
1.63 niallo 257: /*
258: * If we are to create a new ,v file, we must decide where it
259: * should go.
260: */
261: if (pb.flags & NEWFILE) {
1.117 ray 262: char *fpath = rcs_choosefile(pb.filename);
1.63 niallo 263: if (fpath == NULL) {
264: status = 1;
265: continue;
266: }
267: strlcpy(pb.fpath, fpath, sizeof(pb.fpath));
1.84 joris 268: xfree(fpath);
1.63 niallo 269: }
270:
1.58 niallo 271: pb.file = rcs_open(pb.fpath, pb.openflags, pb.fmode);
272:
1.87 xsa 273: if (pb.file == NULL)
274: fatal("failed to open rcsfile '%s'", pb.fpath);
1.29 niallo 275:
1.58 niallo 276: if (verbose == 1)
277: printf("%s <-- %s\n", pb.fpath, pb.filename);
1.107 deraadt 278:
1.63 niallo 279: if (pb.flags & NEWFILE)
280: status = checkin_init(&pb);
1.15 niallo 281: else
1.63 niallo 282: status = checkin_update(&pb);
1.114 niallo 283:
284: /* reset NEWFILE flag */
285: pb.flags &= ~NEWFILE;
1.129 niallo 286:
287: rcs_close(pb.file);
1.4 niallo 288: }
289:
1.114 niallo 290: if ((verbose == 1) && (status == 0))
1.93 xsa 291: printf("done\n");
292:
1.16 niallo 293: return (status);
1.4 niallo 294: }
295:
1.59 niallo 296: /*
297: * checkin_diff_file()
298: *
1.65 xsa 299: * Generate the diff between the working file and a revision.
1.59 niallo 300: * Returns pointer to a char array on success, NULL on failure.
301: */
1.4 niallo 302: static char *
1.58 niallo 303: checkin_diff_file(struct checkin_params *pb)
1.4 niallo 304: {
305: char path1[MAXPATHLEN], path2[MAXPATHLEN];
306: BUF *b1, *b2, *b3;
307: char rbuf[64], *deltatext;
308:
1.112 joris 309: b1 = b2 = b3 = NULL;
310: deltatext = NULL;
1.58 niallo 311: rcsnum_tostr(pb->frev, rbuf, sizeof(rbuf));
1.4 niallo 312:
1.58 niallo 313: if ((b1 = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
314: cvs_log(LP_ERR, "failed to load file: '%s'", pb->filename);
1.112 joris 315: goto out;
1.1 niallo 316: }
317:
1.58 niallo 318: if ((b2 = rcs_getrev(pb->file, pb->frev)) == NULL) {
1.4 niallo 319: cvs_log(LP_ERR, "failed to load revision");
1.112 joris 320: goto out;
1.4 niallo 321: }
322:
1.57 xsa 323: if ((b3 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL) {
1.4 niallo 324: cvs_log(LP_ERR, "failed to allocated buffer for diff");
1.112 joris 325: goto out;
1.4 niallo 326: }
327:
1.50 xsa 328: strlcpy(path1, rcs_tmpdir, sizeof(path1));
329: strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1));
1.123 niallo 330: cvs_buf_write_stmp(b1, path1, 0600);
1.112 joris 331:
332: cvs_worklist_add(path1, &rcs_temp_files);
1.4 niallo 333: cvs_buf_free(b1);
1.112 joris 334: b1 = NULL;
1.4 niallo 335:
1.50 xsa 336: strlcpy(path2, rcs_tmpdir, sizeof(path2));
337: strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
1.123 niallo 338: cvs_buf_write_stmp(b2, path2, 0600);
1.112 joris 339:
340: cvs_worklist_add(path2, &rcs_temp_files);
1.4 niallo 341: cvs_buf_free(b2);
1.112 joris 342: b2 = NULL;
1.4 niallo 343:
1.5 niallo 344: diff_format = D_RCSDIFF;
1.4 niallo 345: cvs_diffreg(path1, path2, b3);
346:
347: cvs_buf_putc(b3, '\0');
348: deltatext = (char *)cvs_buf_release(b3);
1.112 joris 349: b3 = NULL;
350:
351: out:
352: cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
353:
354: if (b1 != NULL)
355: cvs_buf_free(b1);
356: if (b2 != NULL)
357: cvs_buf_free(b2);
358: if (b3 != NULL)
359: cvs_buf_free(b3);
1.4 niallo 360:
361: return (deltatext);
1.6 niallo 362: }
363:
364: /*
1.65 xsa 365: * checkin_getlogmsg()
1.59 niallo 366: *
1.6 niallo 367: * Get log message from user interactively.
1.59 niallo 368: * Returns pointer to a char array on success, NULL on failure.
1.6 niallo 369: */
370: static char *
1.34 niallo 371: checkin_getlogmsg(RCSNUM *rev, RCSNUM *rev2)
1.6 niallo 372: {
1.58 niallo 373: char *rcs_msg, nrev[16], prev[16];
1.6 niallo 374: RCSNUM *tmprev;
375:
1.7 niallo 376: rcs_msg = NULL;
1.6 niallo 377: tmprev = rcsnum_alloc();
378: rcsnum_cpy(rev, tmprev, 16);
1.9 niallo 379: rcsnum_tostr(tmprev, prev, sizeof(prev));
1.12 niallo 380: if (rev2 == NULL)
381: rcsnum_tostr(rcsnum_inc(tmprev), nrev, sizeof(nrev));
382: else
383: rcsnum_tostr(rev2, nrev, sizeof(nrev));
1.6 niallo 384: rcsnum_free(tmprev);
385:
1.47 niallo 386: if (verbose == 1)
387: printf("new revision: %s; previous revision: %s\n", nrev,
388: prev);
1.32 joris 389:
1.107 deraadt 390: rcs_msg = checkin_getinput("enter log message, terminated with a "
391: "single '.' or end of file:\n>> ");
1.58 niallo 392: return (rcs_msg);
393: }
394:
395:
396: /*
397: * checkin_getdesc()
398: *
399: * Get file description interactively.
1.59 niallo 400: * Returns pointer to a char array on success, NULL on failure.
1.58 niallo 401: */
402: static char *
403: checkin_getdesc()
404: {
405: char *description;
406:
1.107 deraadt 407: description = checkin_getinput("enter description, terminated with "
408: "single '.' or end of file:\n"
409: "NOTE: This is NOT the log message!\n>> ");
1.58 niallo 410: return (description);
411: }
412:
413: /*
414: * checkin_getinput()
415: *
1.59 niallo 416: * Get some input from the user, in RCS style, prompting with message <prompt>.
417: * Returns pointer to a char array on success, NULL on failure.
1.58 niallo 418: */
419: static char *
420: checkin_getinput(const char *prompt)
421: {
422: BUF *inputbuf;
423: char *input, buf[128];
424:
425: if ((inputbuf = cvs_buf_alloc((size_t)64, BUF_AUTOEXT)) == NULL) {
426: cvs_log(LP_ERR, "failed to allocate input buffer");
427: return (NULL);
428: }
429:
1.119 xsa 430: if (isatty(STDIN_FILENO))
431: fprintf(stderr, "%s", prompt);
432:
1.6 niallo 433: for (;;) {
434: fgets(buf, (int)sizeof(buf), stdin);
1.9 niallo 435: if (feof(stdin) || ferror(stdin) || buf[0] == '.')
1.6 niallo 436: break;
1.58 niallo 437: cvs_buf_append(inputbuf, buf, strlen(buf));
1.119 xsa 438:
439: if (isatty(STDIN_FILENO))
440: fprintf(stderr, ">> ");
1.6 niallo 441: }
1.32 joris 442:
1.58 niallo 443: cvs_buf_putc(inputbuf, '\0');
444: input = (char *)cvs_buf_release(inputbuf);
445:
446: return (input);
447: }
448:
449: /*
1.63 niallo 450: * checkin_update()
451: *
452: * Do a checkin to an existing RCS file.
453: *
454: * On success, return 0. On error return -1.
455: */
456: static int
457: checkin_update(struct checkin_params *pb)
458: {
1.77 xsa 459: char *filec, numb1[64], numb2[64];
1.128 niallo 460: struct stat st;
1.63 niallo 461: BUF *bp;
462:
1.82 joris 463: /*
464: * XXX this is wrong, we need to get the revision the user
1.85 xsa 465: * has the lock for. So we can decide if we want to create a
1.82 joris 466: * branch or not. (if it's not current HEAD we need to branch).
467: */
1.63 niallo 468: pb->frev = pb->file->rf_head;
469:
1.126 niallo 470: /* Load file contents */
471: if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
472: rcs_close(pb->file);
473: return (-1);
474: }
475:
476: cvs_buf_putc(bp, '\0');
477: filec = (char *)cvs_buf_release(bp);
478:
1.115 niallo 479: /* If this is a zero-ending RCSNUM eg 4.0, increment it (eg to 4.1) */
480: if ((pb->newrev != NULL) && (RCSNUM_ZERO_ENDING(pb->newrev)))
481: pb->newrev = rcsnum_inc(pb->newrev);
482:
1.82 joris 483: if (checkin_checklock(pb) < 0)
1.126 niallo 484: goto fail;
1.82 joris 485:
486: /* If revision passed on command line is less than HEAD, bail.
487: * XXX only applies to ci -r1.2 foo for example if HEAD is > 1.2 and
488: * there is no lock set for the user.
489: */
1.63 niallo 490: if ((pb->newrev != NULL)
491: && (rcsnum_cmp(pb->newrev, pb->frev, 0) > 0)) {
1.77 xsa 492: cvs_log(LP_ERR,
493: "%s: revision %s too low; must be higher than %s",
494: pb->file->rf_path,
495: rcsnum_tostr(pb->newrev, numb1, sizeof(numb1)),
496: rcsnum_tostr(pb->frev, numb2, sizeof(numb2)));
1.126 niallo 497: goto fail;
1.63 niallo 498: }
499:
1.104 niallo 500: /*
501: * Set the date of the revision to be the last modification
502: * time of the working file if -d has no argument.
503: */
504: if (pb->date == DATE_MTIME
505: && (checkin_mtimedate(pb) < 0))
1.126 niallo 506: goto fail;
1.104 niallo 507:
508: /* Date from argv/mtime must be more recent than HEAD */
509: if (pb->date != DATE_NOW) {
510: time_t head_date = rcs_rev_getdate(pb->file, pb->frev);
511: if (pb->date <= head_date) {
1.113 xsa 512: char dbuf1[256], dbuf2[256], *fmt;
513: struct tm *t, *t_head;
514:
515: fmt = "%Y/%m/%d %H:%M:%S";
516:
517: t = localtime(&pb->date);
518: strftime(dbuf1, sizeof(dbuf1), fmt, t);
519: t_head = localtime(&head_date);
520: strftime(dbuf2, sizeof(dbuf2), fmt, t_head);
521:
522: fatal("%s: Date %s preceeds %s in revision %s.",
523: pb->file->rf_path, dbuf1, dbuf2,
1.104 niallo 524: rcsnum_tostr(pb->frev, numb2, sizeof(numb2)));
525: }
526: }
527:
1.73 xsa 528: /* Get RCS patch */
1.63 niallo 529: if ((pb->deltatext = checkin_diff_file(pb)) == NULL) {
530: cvs_log(LP_ERR, "failed to get diff");
1.126 niallo 531: goto fail;
1.63 niallo 532: }
533:
534: /*
535: * If -f is not specified and there are no differences, tell
536: * the user and revert to latest version.
537: */
538: if (!(pb->flags & FORCE) && (strlen(pb->deltatext) < 1)) {
539: checkin_revert(pb);
1.126 niallo 540: goto fail;
1.63 niallo 541: }
542:
1.73 xsa 543: /* If no log message specified, get it interactively. */
1.63 niallo 544: if (pb->flags & INTERACTIVE)
545: pb->rcs_msg = checkin_getlogmsg(pb->frev, pb->newrev);
546:
1.82 joris 547: if (rcs_lock_remove(pb->file, pb->username, pb->frev) < 0) {
1.63 niallo 548: if (rcs_errno != RCS_ERR_NOENT)
1.82 joris 549: cvs_log(LP_WARN, "failed to remove lock");
550: else if (!(pb->flags & CO_LOCK))
551: cvs_log(LP_WARN, "previous revision was not locked; "
552: "ignoring -l option");
1.63 niallo 553: }
554:
1.73 xsa 555: /* Current head revision gets the RCS patch as rd_text */
1.87 xsa 556: if (rcs_deltatext_set(pb->file, pb->frev, pb->deltatext) == -1)
557: fatal("failed to set new rd_text for head rev");
1.63 niallo 558:
1.73 xsa 559: /* Now add our new revision */
1.63 niallo 560: if (rcs_rev_add(pb->file,
561: (pb->newrev == NULL ? RCS_HEAD_REV : pb->newrev),
1.82 joris 562: pb->rcs_msg, pb->date, pb->author) != 0) {
1.63 niallo 563: cvs_log(LP_ERR, "failed to add new revision");
1.126 niallo 564: goto fail;
1.63 niallo 565: }
566:
567: /*
568: * If we are checking in to a non-default (ie user-specified)
569: * revision, set head to this revision.
570: */
1.131 ! xsa 571: if (pb->newrev != NULL) {
! 572: if (rcs_head_set(pb->file, pb->newrev) < 0)
! 573: fatal("rcs_head_set failed");
! 574: } else
1.63 niallo 575: pb->newrev = pb->file->rf_head;
576:
1.73 xsa 577: /* New head revision has to contain entire file; */
1.107 deraadt 578: if (rcs_deltatext_set(pb->file, pb->frev, filec) == -1)
1.87 xsa 579: fatal("failed to set new head revision");
1.63 niallo 580:
1.73 xsa 581: /* Attach a symbolic name to this revision if specified. */
1.63 niallo 582: if (pb->symbol != NULL
583: && (checkin_attach_symbol(pb) < 0))
1.126 niallo 584: goto fail;
1.63 niallo 585:
1.73 xsa 586: /* Set the state of this revision if specified. */
1.63 niallo 587: if (pb->state != NULL)
588: (void)rcs_state_set(pb->file, pb->newrev, pb->state);
589:
1.128 niallo 590: /* Maintain RCSFILE permissions */
591: if (stat(pb->filename, &st) == -1)
592: goto fail;
593:
594: /* Strip all the write bits */
595: pb->file->rf_mode = st.st_mode &
596: (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH);
597:
1.84 joris 598: xfree(pb->deltatext);
599: xfree(filec);
1.63 niallo 600: (void)unlink(pb->filename);
1.128 niallo 601:
602: /* Write out RCSFILE before calling checkout_rev() */
603: rcs_write(pb->file);
1.63 niallo 604:
1.73 xsa 605: /* Do checkout if -u or -l are specified. */
1.63 niallo 606: if (((pb->flags & CO_LOCK) || (pb->flags & CO_UNLOCK))
607: && !(pb->flags & CI_DEFAULT))
608: checkout_rev(pb->file, pb->newrev, pb->filename, pb->flags,
1.89 joris 609: pb->username, pb->author, NULL, NULL);
1.63 niallo 610:
611: if (pb->flags & INTERACTIVE) {
1.84 joris 612: xfree(pb->rcs_msg);
1.63 niallo 613: pb->rcs_msg = NULL;
614: }
615: return (0);
1.126 niallo 616:
617: fail:
618: xfree(filec);
619: return (-1);
1.63 niallo 620: }
621:
622: /*
1.58 niallo 623: * checkin_init()
1.65 xsa 624: *
1.58 niallo 625: * Does an initial check in, just enough to create the new ,v file
1.63 niallo 626: * On success, return 0. On error return -1.
1.58 niallo 627: */
1.63 niallo 628: static int
1.58 niallo 629: checkin_init(struct checkin_params *pb)
630: {
1.80 niallo 631: BUF *bp, *dp;
1.93 xsa 632: char *filec, numb[64];
1.115 niallo 633: int fetchlog = 0;
1.80 niallo 634: const char *rcs_desc;
1.128 niallo 635: struct stat st;
1.58 niallo 636:
1.115 niallo 637: /* If this is a zero-ending RCSNUM eg 4.0, increment it (eg to 4.1) */
638: if ((pb->newrev != NULL) && (RCSNUM_ZERO_ENDING(pb->newrev))) {
639: pb->frev = rcsnum_alloc();
640: rcsnum_cpy(pb->newrev, pb->frev, 0);
641: pb->newrev = rcsnum_inc(pb->newrev);
642: fetchlog = 1;
643: }
644:
1.73 xsa 645: /* Load file contents */
1.58 niallo 646: if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
1.106 niallo 647: rcs_close(pb->file);
1.63 niallo 648: return (-1);
1.58 niallo 649: }
650:
1.124 xsa 651: cvs_buf_putc(bp, '\0');
1.58 niallo 652: filec = (char *)cvs_buf_release(bp);
653:
1.98 niallo 654: /* Get default values from working copy if -k specified */
655: if (pb->flags & CI_KEYWORDSCAN)
656: checkin_keywordscan(filec, &pb->newrev, &pb->date, &pb->state,
657: &pb->author);
658:
1.73 xsa 659: /* Get description from user */
1.80 niallo 660: if (pb->description == NULL)
661: rcs_desc = (const char *)checkin_getdesc();
662: else {
663: if (*pb->description == '-') {
664: pb->description++;
1.81 niallo 665: rcs_desc = (const char *)pb->description;
666: } else {
1.80 niallo 667: dp = cvs_buf_load(pb->description, BUF_AUTOEXT);
668: if (dp == NULL) {
669: cvs_log(LP_ERR,
670: "failed to load description file '%s'",
671: pb->description);
1.126 niallo 672: goto fail;
1.80 niallo 673: }
1.124 xsa 674: cvs_buf_putc(dp, '\0');
1.80 niallo 675: rcs_desc = (const char *)cvs_buf_release(dp);
676: }
677: }
1.58 niallo 678: rcs_desc_set(pb->file, rcs_desc);
679:
1.115 niallo 680: /*
681: * If the user had specified a zero-ending revision number e.g. 4
682: * emulate odd GNU behaviour and fetch log message.
683: */
684: if (fetchlog == 1) {
685: pb->rcs_msg = checkin_getlogmsg(pb->frev, pb->newrev);
686: rcsnum_free(pb->frev);
687: }
1.97 niallo 688: /*
689: * Set the date of the revision to be the last modification
690: * time of the working file if -d has no argument.
691: */
692: if (pb->date == DATE_MTIME
693: && (checkin_mtimedate(pb) < 0))
1.126 niallo 694: goto fail;
1.97 niallo 695:
1.73 xsa 696: /* Now add our new revision */
1.96 niallo 697: if (rcs_rev_add(pb->file,
698: (pb->newrev == NULL ? RCS_HEAD_REV : pb->newrev),
1.107 deraadt 699: (pb->rcs_msg == NULL ? "Initial revision" : pb->rcs_msg),
1.103 niallo 700: pb->date, pb->author) != 0) {
1.58 niallo 701: cvs_log(LP_ERR, "failed to add new revision");
1.126 niallo 702: goto fail;
1.63 niallo 703: }
704: /*
705: * If we are checking in to a non-default (ie user-specified)
706: * revision, set head to this revision.
707: */
1.131 ! xsa 708: if (pb->newrev != NULL) {
! 709: if (rcs_head_set(pb->file, pb->newrev) < 0)
! 710: fatal("rcs_head_set failed");
! 711: } else
1.63 niallo 712: pb->newrev = pb->file->rf_head;
713:
1.73 xsa 714: /* New head revision has to contain entire file; */
1.66 niallo 715: if (rcs_deltatext_set(pb->file, pb->file->rf_head, filec) == -1) {
1.63 niallo 716: cvs_log(LP_ERR, "failed to set new head revision");
1.126 niallo 717: goto fail;
1.58 niallo 718: }
1.73 xsa 719: /* Attach a symbolic name to this revision if specified. */
1.66 niallo 720: if (pb->symbol != NULL
721: && (checkin_attach_symbol(pb) < 0))
1.126 niallo 722: goto fail;
1.66 niallo 723:
1.73 xsa 724: /* Set the state of this revision if specified. */
1.66 niallo 725: if (pb->state != NULL)
726: (void)rcs_state_set(pb->file, pb->newrev, pb->state);
727:
1.128 niallo 728: /* Inherit RCSFILE permissions from file being checked in */
729: if (stat(pb->filename, &st) == -1)
730: goto fail;
731: /* Strip all the write bits */
732: pb->file->rf_mode = st.st_mode &
733: (S_IXUSR|S_IXGRP|S_IXOTH|S_IRUSR|S_IRGRP|S_IROTH);
734:
1.84 joris 735: xfree(filec);
1.66 niallo 736: (void)unlink(pb->filename);
737:
1.128 niallo 738: /* Write out RCSFILE before calling checkout_rev() */
739: rcs_write(pb->file);
740:
1.73 xsa 741: /* Do checkout if -u or -l are specified. */
1.66 niallo 742: if (((pb->flags & CO_LOCK) || (pb->flags & CO_UNLOCK))
1.128 niallo 743: && !(pb->flags & CI_DEFAULT)) {
1.66 niallo 744: checkout_rev(pb->file, pb->newrev, pb->filename, pb->flags,
1.89 joris 745: pb->username, pb->author, NULL, NULL);
1.128 niallo 746: }
747:
1.63 niallo 748:
1.119 xsa 749: if (verbose == 1) {
750: fprintf(stderr, "initial revision: %s\n",
751: rcsnum_tostr(pb->newrev, numb, sizeof(numb)));
752: }
1.93 xsa 753:
1.63 niallo 754: return (0);
1.126 niallo 755: fail:
756: xfree(filec);
757: return (-1);
1.58 niallo 758: }
759:
1.59 niallo 760: /*
761: * checkin_attach_symbol()
762: *
763: * Attempt to attach the specified symbol to the revision.
764: * On success, return 0. On error return -1.
765: */
1.58 niallo 766: static int
767: checkin_attach_symbol(struct checkin_params *pb)
768: {
769: char rbuf[16];
770: int ret;
771: if (verbose == 1)
772: printf("symbol: %s\n", pb->symbol);
1.130 xsa 773: if (pb->flags & CI_SYMFORCE) {
774: if (rcs_sym_remove(pb->file, pb->symbol) < 0) {
775: if (rcs_errno != RCS_ERR_NOENT) {
776: cvs_log(LP_ERR,
777: "problem removing symbol: %s", pb->symbol);
778: return (-1);
779: }
780: }
781: }
1.58 niallo 782: if ((ret = rcs_sym_add(pb->file, pb->symbol, pb->newrev) == -1)
783: && (rcs_errno == RCS_ERR_DUPENT)) {
784: rcsnum_tostr(rcs_sym_getrev(pb->file, pb->symbol),
785: rbuf, sizeof(rbuf));
786: cvs_log(LP_ERR,
787: "symbolic name %s already bound to %s",
788: pb->symbol, rbuf);
789: return (-1);
790: } else if (ret == -1) {
791: cvs_log(LP_ERR, "problem adding symbol: %s",
792: pb->symbol);
793: return (-1);
794: }
795: return (0);
796: }
797:
1.59 niallo 798: /*
799: * checkin_revert()
800: *
801: * If there are no differences between the working file and the latest revision
802: * and the -f flag is not specified, simply revert to the latest version and
803: * warn the user.
804: *
805: */
1.58 niallo 806: static void
807: checkin_revert(struct checkin_params *pb)
808: {
809: char rbuf[16];
810:
811: rcsnum_tostr(pb->frev, rbuf, sizeof(rbuf));
812: cvs_log(LP_WARN,
813: "file is unchanged; reverting to previous revision %s",
814: rbuf);
815: (void)unlink(pb->filename);
816: if ((pb->flags & CO_LOCK) || (pb->flags & CO_UNLOCK))
817: checkout_rev(pb->file, pb->frev, pb->filename,
1.89 joris 818: pb->flags, pb->username, pb->author, NULL, NULL);
1.127 xsa 819: if (rcs_lock_remove(pb->file, pb->username, pb->frev) < 0)
820: if (rcs_errno != RCS_ERR_NOENT)
821: cvs_log(LP_WARN, "failed to remove lock");
1.58 niallo 822: }
823:
1.59 niallo 824: /*
825: * checkin_checklock()
826: *
827: * Check for the existence of a lock on the file. If there are no locks, or it
828: * is not locked by the correct user, return -1. Otherwise, return 0.
829: */
1.58 niallo 830: static int
831: checkin_checklock(struct checkin_params *pb)
832: {
833: struct rcs_lock *lkp;
834:
1.82 joris 835: TAILQ_FOREACH(lkp, &(pb->file->rf_locks), rl_list) {
836: if ((!strcmp(lkp->rl_name, pb->username)) &&
837: (!rcsnum_cmp(lkp->rl_num, pb->frev, 0)))
838: return (0);
1.58 niallo 839: }
1.32 joris 840:
1.82 joris 841: cvs_log(LP_ERR,
842: "%s: no lock set by %s", pb->file->rf_path, pb->username);
843: return (-1);
1.61 niallo 844: }
845:
846: /*
1.62 niallo 847: * checkin_mtimedate()
1.61 niallo 848: *
849: * Set the date of the revision to be the last modification
1.62 niallo 850: * time of the working file.
1.61 niallo 851: *
852: * On success, return 0. On error return -1.
853: */
854: static int
1.62 niallo 855: checkin_mtimedate(struct checkin_params *pb)
1.61 niallo 856: {
857: struct stat sb;
858: if (stat(pb->filename, &sb) != 0) {
1.72 xsa 859: cvs_log(LP_ERRNO, "failed to stat `%s'", pb->filename);
1.61 niallo 860: return (-1);
861: }
862: pb->date = (time_t)sb.st_mtimespec.tv_sec;
1.58 niallo 863: return (0);
1.98 niallo 864: }
865:
866: /*
867: * checkin_keywordscan()
868: *
869: * Searches working file for keyword values to determine its revision
870: * number, creation date and author, and uses these values instead of
871: * calculating them locally.
872: *
873: * Params: The data buffer to scan and pointers to pointers of variables in
874: * which to store the outputs.
875: *
876: * On success, return 0. On error return -1.
877: */
878: static int
879: checkin_keywordscan(char *data, RCSNUM **rev, time_t *date, char **author,
880: char **state)
881: {
1.122 ray 882: size_t end;
883: u_int j, found;
1.98 niallo 884: char *c, *kwstr, *start, buf[128];
885:
886: c = start = kwstr = NULL;
887:
1.122 ray 888: found = 0;
1.98 niallo 889:
1.122 ray 890: for (c = data; *c != '\0'; c++) {
1.98 niallo 891: if (*c == '$') {
892: start = c;
1.118 deraadt 893: c++;
1.98 niallo 894: if (!isalpha(*c)) {
895: c = start;
896: continue;
897: }
898: /* look for any matching keywords */
1.107 deraadt 899: found = 0;
900: for (j = 0; j < 10; j++) {
901: if (!strncmp(c, rcs_expkw[j].kw_str,
902: strlen(rcs_expkw[j].kw_str))) {
903: found = 1;
904: kwstr = rcs_expkw[j].kw_str;
905: break;
906: }
907: }
908:
909: /* unknown keyword, continue looking */
910: if (found == 0) {
911: c = start;
912: continue;
913: }
1.98 niallo 914:
915: c += strlen(kwstr);
916: if (*c != ':' && *c != '$') {
917: c = start;
918: continue;
919: }
920:
921: if (*c == ':') {
922: while (*c++) {
923: if (*c == '$') {
924: end = c - start + 2;
925: if (end >= sizeof(buf))
926: fatal("keyword buffer"
927: " too small!");
928: strlcpy(buf, start, end);
929: checkin_parsekeyword(buf, rev,
1.107 deraadt 930: date, author, state);
1.98 niallo 931: break;
932: }
933: }
934:
935: if (*c != '$') {
936: c = start;
937: continue;
938: }
939: }
940: }
941: }
942: if (found == 0)
943: return (-1);
944: else
945: return (0);
946: }
947:
948: /*
949: * checkin_keywordtype()
950: *
951: * Given an RCS keyword string, determine what type of string it is.
952: * This enables us to know what data should be in it.
953: *
954: * Returns type on success, or -1 on failure.
1.107 deraadt 955: */
1.98 niallo 956: static int
957: checkin_keywordtype(char *keystring)
958: {
959: char *p;
1.107 deraadt 960:
1.98 niallo 961: p = keystring;
1.118 deraadt 962: p++;
1.98 niallo 963: if (strncmp(p, KW_ID, strlen(KW_ID)) == 0)
964: return (KW_TYPE_ID);
965: else if (strncmp(p, KW_AUTHOR, strlen(KW_AUTHOR)) == 0)
966: return (KW_TYPE_AUTHOR);
967: else if (strncmp(p, KW_DATE, strlen(KW_DATE)) == 0)
968: return (KW_TYPE_DATE);
969: else if (strncmp(p, KW_STATE, strlen(KW_STATE)) == 0)
970: return (KW_TYPE_STATE);
971: else if (strncmp(p, KW_REVISION, strlen(KW_REVISION)) == 0)
972: return (KW_TYPE_REVISION);
973: else
974: return (-1);
975: }
976:
977: /*
978: * checkin_parsekeyword()
979: *
980: * Do the actual parsing of an RCS keyword string, setting the values passed
981: * to the function to whatever is found.
982: *
983: */
984: static void
985: checkin_parsekeyword(char *keystring, RCSNUM **rev, time_t *date,
986: char **author, char **state)
987: {
988: char *tokens[10], *p, *datestring;
989: size_t len = 0;
1.99 niallo 990: int i = 0;
1.107 deraadt 991:
992: /* Parse data out of the expanded keyword */
1.98 niallo 993: switch (checkin_keywordtype(keystring)) {
994: case KW_TYPE_ID:
1.101 niallo 995: for ((p = strtok(keystring, " ")); p;
1.107 deraadt 996: (p = strtok(NULL, " "))) {
1.99 niallo 997: if (i < KW_NUMTOKS_ID - 1)
998: tokens[i++] = p;
1.107 deraadt 999: }
1.99 niallo 1000: tokens[i] = NULL;
1.98 niallo 1001: if (*author != NULL)
1002: xfree(*author);
1003: if (*state != NULL)
1004: xfree(*state);
1005: /* only parse revision if one is not already set */
1006: if (*rev == NULL) {
1007: if ((*rev = rcsnum_parse(tokens[2])) == NULL)
1008: fatal("could not parse rcsnum");
1009: }
1010: len = strlen(tokens[5]) + 1;
1011: *author = xmalloc(len);
1012: strlcpy(*author, tokens[5], len);
1013: len = strlen(tokens[6]) + 1;
1014: *state = xmalloc(len);
1015: strlcpy(*state, tokens[6], len);
1016: len = strlen(tokens[3]) + strlen(tokens[4]) + 2;
1017: datestring = xmalloc(len);
1018: strlcpy(datestring, tokens[3], len);
1019: strlcat(datestring, " ", len);
1020: strlcat(datestring, tokens[4], len);
1021: if ((*date = cvs_date_parse(datestring)) <= 0)
1022: fatal("could not parse date\n");
1023: xfree(datestring);
1024: break;
1025: case KW_TYPE_AUTHOR:
1.101 niallo 1026: for ((p = strtok(keystring, " ")); p;
1.107 deraadt 1027: (p = strtok(NULL, " "))) {
1.99 niallo 1028: if (i < KW_NUMTOKS_AUTHOR - 1)
1029: tokens[i++] = p;
1.107 deraadt 1030: }
1.98 niallo 1031: if (*author != NULL)
1032: xfree(*author);
1033: len = strlen(tokens[1]) + 1;
1034: *author = xmalloc(len);
1035: strlcpy(*author, tokens[1], len);
1036: break;
1037: case KW_TYPE_DATE:
1.101 niallo 1038: for ((p = strtok(keystring, " ")); p;
1.107 deraadt 1039: (p = strtok(NULL, " "))) {
1.99 niallo 1040: if (i < KW_NUMTOKS_DATE - 1)
1041: tokens[i++] = p;
1.98 niallo 1042: }
1043: len = strlen(tokens[1]) + strlen(tokens[2]) + 2;
1044: datestring = xmalloc(len);
1045: strlcpy(datestring, tokens[1], len);
1046: strlcat(datestring, " ", len);
1047: strlcat(datestring, tokens[2], len);
1048: if ((*date = cvs_date_parse(datestring)) <= 0)
1049: fatal("could not parse date\n");
1050: xfree(datestring);
1051: break;
1052: case KW_TYPE_STATE:
1.101 niallo 1053: for ((p = strtok(keystring, " ")); p;
1.107 deraadt 1054: (p = strtok(NULL, " "))) {
1.99 niallo 1055: if (i < KW_NUMTOKS_STATE - 1)
1056: tokens[i++] = p;
1.107 deraadt 1057: }
1.98 niallo 1058: if (*state != NULL)
1059: xfree(*state);
1060: len = strlen(tokens[1]) + 1;
1061: *state = xmalloc(len);
1062: strlcpy(*state, tokens[1], len);
1063: break;
1064: case KW_TYPE_REVISION:
1065: /* only parse revision if one is not already set */
1066: if (*rev != NULL)
1067: break;
1.102 niallo 1068: for ((p = strtok(keystring, " ")); p;
1.107 deraadt 1069: (p = strtok(NULL, " "))) {
1.99 niallo 1070: if (i < KW_NUMTOKS_REVISION - 1)
1071: tokens[i++] = p;
1.107 deraadt 1072: }
1.98 niallo 1073: if ((*rev = rcsnum_parse(tokens[1])) == NULL)
1074: fatal("could not parse rcsnum");
1075: break;
1076: }
1.1 niallo 1077: }
![[BACK]](/icons/back.gif){kind=icon}
Return to ci.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs