Annotation of src/usr.bin/cvs/admin.c, Revision 1.69
1.69 ! naddy 1: /* $OpenBSD: admin.c,v 1.68 2017/06/01 08:08:24 joris Exp $ */
1.1 joris 2: /*
3: * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
4: * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
1.47 xsa 5: * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org>
1.1 joris 6: *
1.35 xsa 7: * Permission to use, copy, modify, and distribute this software for any
8: * purpose with or without fee is hereby granted, provided that the above
9: * copyright notice and this permission notice appear in all copies.
1.1 joris 10: *
1.35 xsa 11: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1.1 joris 18: */
19:
1.65 deraadt 20: #include <sys/types.h>
1.50 otto 21: #include <sys/dirent.h>
22:
23: #include <errno.h>
24: #include <fcntl.h>
25: #include <libgen.h>
1.66 nicm 26: #include <stdlib.h>
1.50 otto 27: #include <string.h>
28: #include <unistd.h>
1.1 joris 29:
30: #include "cvs.h"
1.35 xsa 31: #include "remote.h"
1.1 joris 32:
1.35 xsa 33: #define ADM_EFLAG 0x01
1.1 joris 34:
1.35 xsa 35: void cvs_admin_local(struct cvs_file *);
1.15 jfb 36:
37: struct cvs_cmd cvs_cmd_admin = {
1.57 joris 38: CVS_OP_ADMIN, CVS_USE_WDIR | CVS_LOCK_REPO, "admin",
1.15 jfb 39: { "adm", "rcs" },
40: "Administrative front-end for RCS",
1.45 xsa 41: "[-ILqU] [-A oldfile] [-a users] [-b branch]\n"
1.35 xsa 42: "[-c string] [-e [users]] [-k mode] [-l [rev]] [-m rev:msg]\n"
43: "[-N tag[:rev]] [-n tag[:rev]] [-o rev] [-s state[:rev]]"
44: "[-t file | str]\n"
45: "[-u [rev]] file ...",
46: "A:a:b::c:e::Ik:l::Lm:N:n:o:qs:t:Uu::",
1.15 jfb 47: NULL,
1.35 xsa 48: cvs_admin
1.7 joris 49: };
50:
1.35 xsa 51: static int runflags = 0;
52: static int lkmode = RCS_LOCK_INVAL;
1.47 xsa 53: static char *alist, *comment, *elist, *logmsg, *logstr, *koptstr;
1.64 tobias 54: static char *oldfilename, *orange, *state, *staterevstr;
1.7 joris 55:
1.35 xsa 56: int
57: cvs_admin(int argc, char **argv)
1.1 joris 58: {
1.7 joris 59: int ch;
1.35 xsa 60: int flags;
1.64 tobias 61: char *statestr;
1.35 xsa 62: struct cvs_recursion cr;
1.1 joris 63:
1.35 xsa 64: flags = CR_RECURSE_DIRS;
1.1 joris 65:
1.45 xsa 66: alist = comment = elist = logmsg = logstr = NULL;
67: oldfilename = orange = state = statestr = NULL;
1.40 xsa 68:
1.35 xsa 69: while ((ch = getopt(argc, argv, cvs_cmd_admin.cmd_opts)) != -1) {
1.1 joris 70: switch (ch) {
1.35 xsa 71: case 'A':
1.45 xsa 72: oldfilename = optarg;
1.35 xsa 73: break;
1.1 joris 74: case 'a':
1.36 xsa 75: alist = optarg;
1.1 joris 76: break;
77: case 'b':
78: break;
79: case 'c':
80: comment = optarg;
81: break;
82: case 'e':
1.35 xsa 83: elist = optarg;
84: runflags |= ADM_EFLAG;
1.1 joris 85: break;
86: case 'I':
87: break;
88: case 'k':
1.47 xsa 89: koptstr = optarg;
90: kflag = rcs_kflag_get(koptstr);
91: if (RCS_KWEXP_INVAL(kflag)) {
92: cvs_log(LP_ERR,
1.59 tobias 93: "invalid RCS keyword expansion mode");
1.47 xsa 94: fatal("%s", cvs_cmd_admin.cmd_synopsis);
95: }
1.35 xsa 96: break;
97: case 'L':
98: if (lkmode == RCS_LOCK_LOOSE) {
99: cvs_log(LP_ERR, "-L and -U are incompatible");
100: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.3 joris 101: }
1.35 xsa 102: lkmode = RCS_LOCK_STRICT;
1.1 joris 103: break;
104: case 'l':
105: break;
1.35 xsa 106: case 'm':
1.40 xsa 107: logstr = optarg;
1.1 joris 108: break;
1.35 xsa 109: case 'N':
1.1 joris 110: break;
111: case 'n':
112: break;
113: case 'o':
1.36 xsa 114: orange = optarg;
1.1 joris 115: break;
116: case 'q':
1.35 xsa 117: verbosity = 0;
1.1 joris 118: break;
119: case 's':
1.42 xsa 120: statestr = optarg;
1.1 joris 121: break;
122: case 't':
123: break;
124: case 'U':
1.35 xsa 125: if (lkmode == RCS_LOCK_STRICT) {
126: cvs_log(LP_ERR, "-U and -L are incompatible");
127: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.16 jfb 128: }
129: lkmode = RCS_LOCK_LOOSE;
1.1 joris 130: break;
1.35 xsa 131: case 'u':
132: break;
1.1 joris 133: default:
1.35 xsa 134: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.1 joris 135: }
136: }
137:
138: argc -= optind;
139: argv += optind;
140:
1.38 xsa 141: if (argc == 0)
1.35 xsa 142: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.16 jfb 143:
1.35 xsa 144: cr.enterdir = NULL;
145: cr.leavedir = NULL;
1.25 joris 146:
1.68 joris 147: if (cvsroot_is_remote()) {
1.44 joris 148: cvs_client_connect_to_server();
1.35 xsa 149: cr.fileproc = cvs_client_sendfile;
1.1 joris 150:
1.45 xsa 151: if (oldfilename != NULL)
152: cvs_client_send_request("Argument -A%s", oldfilename);
153:
1.36 xsa 154: if (alist != NULL)
155: cvs_client_send_request("Argument -a%s", alist);
156:
1.35 xsa 157: if (comment != NULL)
158: cvs_client_send_request("Argument -c%s", comment);
1.1 joris 159:
1.36 xsa 160: if (runflags & ADM_EFLAG)
161: cvs_client_send_request("Argument -e%s",
162: (elist != NULL) ? elist : "");
163:
1.47 xsa 164: if (koptstr != NULL)
165: cvs_client_send_request("Argument -k%s", koptstr);
166:
1.35 xsa 167: if (lkmode == RCS_LOCK_STRICT)
168: cvs_client_send_request("Argument -L");
169: else if (lkmode == RCS_LOCK_LOOSE)
170: cvs_client_send_request("Argument -U");
1.41 xsa 171:
172: if (logstr != NULL)
1.54 tobias 173: cvs_client_send_logmsg(logstr);
1.25 joris 174:
1.36 xsa 175: if (orange != NULL)
176: cvs_client_send_request("Argument -o%s", orange);
177:
1.42 xsa 178: if (statestr != NULL)
179: cvs_client_send_request("Argument -s%s", statestr);
180:
1.35 xsa 181: if (verbosity == 0)
182: cvs_client_send_request("Argument -q");
1.25 joris 183:
1.35 xsa 184: } else {
1.64 tobias 185: if (statestr != NULL) {
186: if ((staterevstr = strchr(statestr, ':')) != NULL)
187: *staterevstr++ = '\0';
188: state = statestr;
189: if (rcs_state_check(state) < 0) {
190: cvs_log(LP_ERR, "invalid state `%s'", state);
191: state = NULL;
192: }
193: }
194:
1.39 xsa 195: flags |= CR_REPO;
1.35 xsa 196: cr.fileproc = cvs_admin_local;
1.7 joris 197: }
1.1 joris 198:
1.35 xsa 199: cr.flags = flags;
1.1 joris 200:
1.35 xsa 201: cvs_file_run(argc, argv, &cr);
1.5 joris 202:
1.68 joris 203: if (cvsroot_is_remote()) {
1.35 xsa 204: cvs_client_send_files(argv, argc);
205: cvs_client_senddir(".");
206: cvs_client_send_request("admin");
207: cvs_client_get_responses();
1.1 joris 208: }
209:
210: return (0);
211: }
212:
1.35 xsa 213: void
214: cvs_admin_local(struct cvs_file *cf)
1.1 joris 215: {
1.35 xsa 216: int i;
1.64 tobias 217: RCSNUM *rev;
1.1 joris 218:
1.35 xsa 219: cvs_log(LP_TRACE, "cvs_admin_local(%s)", cf->file_path);
1.14 joris 220:
1.52 joris 221: cvs_file_classify(cf, cvs_directory_tag);
1.39 xsa 222:
1.35 xsa 223: if (cf->file_type == CVS_DIR) {
224: if (verbosity > 1)
225: cvs_log(LP_NOTICE, "Administrating %s", cf->file_name);
226: return;
1.1 joris 227: }
228:
1.63 tobias 229: if (cf->file_ent == NULL)
1.35 xsa 230: return;
231: else if (cf->file_status == FILE_ADDED) {
232: cvs_log(LP_ERR, "cannot admin newly added file `%s'",
233: cf->file_name);
1.58 tobias 234: return;
235: }
236:
237: if (cf->file_rcs == NULL) {
238: cvs_log(LP_ERR, "lost RCS file for `%s'", cf->file_path);
1.35 xsa 239: return;
1.16 jfb 240: }
1.1 joris 241:
1.35 xsa 242: if (verbosity > 0)
1.39 xsa 243: cvs_printf("RCS file: %s\n", cf->file_rcs->rf_path);
1.45 xsa 244:
245: if (oldfilename != NULL) {
246: struct cvs_file *ocf;
247: struct rcs_access *acp;
248: int ofd;
1.69 ! naddy 249: char *d, dbuf[PATH_MAX], *f, fbuf[PATH_MAX];
! 250: char fpath[PATH_MAX], repo[PATH_MAX];
1.45 xsa 251:
1.69 ! naddy 252: if (strlcpy(fbuf, oldfilename, sizeof(fbuf)) >= sizeof(fbuf))
! 253: fatal("cvs_admin_local: truncation");
! 254: if ((f = basename(fbuf)) == NULL)
! 255: fatal("cvs_admin_local: basename failed");
1.45 xsa 256:
1.69 ! naddy 257: if (strlcpy(dbuf, oldfilename, sizeof(dbuf)) >= sizeof(dbuf))
! 258: fatal("cvs_admin_local: truncation");
! 259: if ((d = dirname(dbuf)) == NULL)
1.45 xsa 260: fatal("cvs_admin_local: dirname failed");
261:
1.65 deraadt 262: cvs_get_repository_path(d, repo, PATH_MAX);
1.45 xsa 263:
1.65 deraadt 264: (void)xsnprintf(fpath, PATH_MAX, "%s/%s", repo, f);
1.45 xsa 265:
1.65 deraadt 266: if (strlcat(fpath, RCS_FILE_EXT, PATH_MAX) >= PATH_MAX)
1.45 xsa 267: fatal("cvs_admin_local: truncation");
268:
269: if ((ofd = open(fpath, O_RDONLY)) == -1)
270: fatal("cvs_admin_local: open: `%s': %s", fpath,
271: strerror(errno));
272:
273: /* XXX: S_ISREG() check instead of blindly using CVS_FILE? */
1.61 joris 274: ocf = cvs_file_get_cf(d, f, oldfilename, ofd, CVS_FILE, 0);
1.45 xsa 275:
276: ocf->file_rcs = rcs_open(fpath, ofd, RCS_READ, 0444);
277: if (ocf->file_rcs == NULL)
278: fatal("cvs_admin_local: rcs_open failed");
279:
280: TAILQ_FOREACH(acp, &(ocf->file_rcs->rf_access), ra_list)
281: rcs_access_add(cf->file_rcs, acp->ra_name);
282:
283: cvs_file_free(ocf);
284: }
1.14 joris 285:
1.36 xsa 286: if (alist != NULL) {
287: struct cvs_argvector *aargv;
288:
289: aargv = cvs_strsplit(alist, ",");
290: for (i = 0; aargv->argv[i] != NULL; i++)
291: rcs_access_add(cf->file_rcs, aargv->argv[i]);
292:
293: cvs_argv_destroy(aargv);
294: }
295:
1.35 xsa 296: if (comment != NULL)
297: rcs_comment_set(cf->file_rcs, comment);
1.19 xsa 298:
1.35 xsa 299: if (elist != NULL) {
300: struct cvs_argvector *eargv;
1.1 joris 301:
1.35 xsa 302: eargv = cvs_strsplit(elist, ",");
303: for (i = 0; eargv->argv[i] != NULL; i++)
304: rcs_access_remove(cf->file_rcs, eargv->argv[i]);
1.1 joris 305:
1.35 xsa 306: cvs_argv_destroy(eargv);
307: } else if (runflags & ADM_EFLAG) {
308: struct rcs_access *rap;
1.1 joris 309:
1.35 xsa 310: while (!TAILQ_EMPTY(&(cf->file_rcs->rf_access))) {
311: rap = TAILQ_FIRST(&(cf->file_rcs->rf_access));
312: TAILQ_REMOVE(&(cf->file_rcs->rf_access), rap, ra_list);
1.66 nicm 313: free(rap->ra_name);
314: free(rap);
1.35 xsa 315: }
316: /* no synced anymore */
317: cf->file_rcs->rf_flags &= ~RCS_SYNCED;
1.47 xsa 318: }
319:
320: /* Default `-kv' is accepted here. */
1.55 tobias 321: if (kflag) {
1.47 xsa 322: if (cf->file_rcs->rf_expand == NULL ||
323: strcmp(cf->file_rcs->rf_expand, koptstr) != 0)
324: rcs_kwexp_set(cf->file_rcs, kflag);
1.40 xsa 325: }
326:
327: if (logstr != NULL) {
328: if ((logmsg = strchr(logstr, ':')) == NULL) {
329: cvs_log(LP_ERR, "missing log message");
330: return;
331: }
332:
333: *logmsg++ = '\0';
1.64 tobias 334: if ((rev = rcsnum_parse(logstr)) == NULL) {
1.40 xsa 335: cvs_log(LP_ERR, "`%s' bad revision number", logstr);
336: return;
337: }
338:
1.64 tobias 339: if (rcs_rev_setlog(cf->file_rcs, rev, logmsg) < 0) {
1.40 xsa 340: cvs_log(LP_ERR, "failed to set logmsg for `%s' to `%s'",
341: logstr, logmsg);
1.67 fcambus 342: free(rev);
1.40 xsa 343: return;
344: }
345:
1.67 fcambus 346: free(rev);
1.36 xsa 347: }
348:
349: if (orange != NULL) {
350: struct rcs_delta *rdp, *nrdp;
1.51 xsa 351: char b[CVS_REV_BUFSZ];
1.36 xsa 352:
353: cvs_revision_select(cf->file_rcs, orange);
354: for (rdp = TAILQ_FIRST(&(cf->file_rcs->rf_delta));
355: rdp != NULL; rdp = nrdp) {
356: nrdp = TAILQ_NEXT(rdp, rd_list);
357:
358: /*
359: * Delete selected revisions.
360: */
361: if (rdp->rd_flags & RCS_RD_SELECT) {
362: rcsnum_tostr(rdp->rd_num, b, sizeof(b));
363: if (verbosity > 0)
364: cvs_printf("deleting revision %s\n", b);
365:
366: (void)rcs_rev_remove(cf->file_rcs, rdp->rd_num);
367: }
368: }
1.42 xsa 369: }
370:
1.64 tobias 371: if (state != NULL) {
372: if (staterevstr != NULL) {
373: if ((rev = rcsnum_parse(staterevstr)) == NULL) {
374: cvs_log(LP_ERR, "`%s' bad revision number",
375: staterevstr);
1.42 xsa 376: return;
377: }
1.62 tobias 378: } else if (cf->file_rcs->rf_head != NULL) {
1.64 tobias 379: rev = rcsnum_alloc();
380: rcsnum_cpy(cf->file_rcs->rf_head, rev, 0);
1.62 tobias 381: } else {
382: cvs_log(LP_ERR, "head revision missing");
1.42 xsa 383: return;
384: }
385:
1.64 tobias 386: (void)rcs_state_set(cf->file_rcs, rev, state);
1.42 xsa 387:
1.67 fcambus 388: free(rev);
1.35 xsa 389: }
1.33 xsa 390:
1.16 jfb 391: if (lkmode != RCS_LOCK_INVAL)
1.35 xsa 392: (void)rcs_lock_setmode(cf->file_rcs, lkmode);
1.37 xsa 393:
394: rcs_write(cf->file_rcs);
1.29 xsa 395:
1.35 xsa 396: if (verbosity > 0)
1.29 xsa 397: cvs_printf("done\n");
1.1 joris 398: }
![[BACK]](/icons/back.gif){kind=icon}
Return to admin.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs