Annotation of src/usr.bin/cvs/admin.c, Revision 1.47
1.47 ! xsa 1: /* $OpenBSD: admin.c,v 1.46 2007/01/25 18:56:33 otto 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.26 xsa 20: #include "includes.h"
1.1 joris 21:
22: #include "cvs.h"
23: #include "log.h"
1.35 xsa 24: #include "remote.h"
1.1 joris 25:
1.35 xsa 26: #define ADM_EFLAG 0x01
1.1 joris 27:
1.35 xsa 28: void cvs_admin_local(struct cvs_file *);
1.15 jfb 29:
30: struct cvs_cmd cvs_cmd_admin = {
1.35 xsa 31: CVS_OP_ADMIN, 0, "admin",
1.15 jfb 32: { "adm", "rcs" },
33: "Administrative front-end for RCS",
1.45 xsa 34: "[-ILqU] [-A oldfile] [-a users] [-b branch]\n"
1.35 xsa 35: "[-c string] [-e [users]] [-k mode] [-l [rev]] [-m rev:msg]\n"
36: "[-N tag[:rev]] [-n tag[:rev]] [-o rev] [-s state[:rev]]"
37: "[-t file | str]\n"
38: "[-u [rev]] file ...",
39: "A:a:b::c:e::Ik:l::Lm:N:n:o:qs:t:Uu::",
1.15 jfb 40: NULL,
1.35 xsa 41: cvs_admin
1.7 joris 42: };
43:
1.35 xsa 44: static int runflags = 0;
45: static int lkmode = RCS_LOCK_INVAL;
1.47 ! xsa 46: static int kflag = RCS_KWEXP_DEFAULT;
! 47: static char *alist, *comment, *elist, *logmsg, *logstr, *koptstr;
1.45 xsa 48: static char *oldfilename, *orange, *state, *statestr;
1.40 xsa 49: static RCSNUM *logrev;
1.7 joris 50:
1.35 xsa 51: int
52: cvs_admin(int argc, char **argv)
1.1 joris 53: {
1.7 joris 54: int ch;
1.35 xsa 55: int flags;
56: struct cvs_recursion cr;
1.1 joris 57:
1.35 xsa 58: flags = CR_RECURSE_DIRS;
1.1 joris 59:
1.45 xsa 60: alist = comment = elist = logmsg = logstr = NULL;
61: oldfilename = orange = state = statestr = NULL;
1.40 xsa 62:
1.35 xsa 63: while ((ch = getopt(argc, argv, cvs_cmd_admin.cmd_opts)) != -1) {
1.1 joris 64: switch (ch) {
1.35 xsa 65: case 'A':
1.45 xsa 66: oldfilename = optarg;
1.35 xsa 67: break;
1.1 joris 68: case 'a':
1.36 xsa 69: alist = optarg;
1.1 joris 70: break;
71: case 'b':
72: break;
73: case 'c':
74: comment = optarg;
75: break;
76: case 'e':
1.35 xsa 77: elist = optarg;
78: runflags |= ADM_EFLAG;
1.1 joris 79: break;
80: case 'I':
81: break;
82: case 'k':
1.47 ! xsa 83: koptstr = optarg;
! 84: kflag = rcs_kflag_get(koptstr);
! 85: if (RCS_KWEXP_INVAL(kflag)) {
! 86: cvs_log(LP_ERR,
! 87: "invalid RCS keyword expension mode");
! 88: fatal("%s", cvs_cmd_admin.cmd_synopsis);
! 89: }
1.35 xsa 90: break;
91: case 'L':
92: if (lkmode == RCS_LOCK_LOOSE) {
93: cvs_log(LP_ERR, "-L and -U are incompatible");
94: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.3 joris 95: }
1.35 xsa 96: lkmode = RCS_LOCK_STRICT;
1.1 joris 97: break;
98: case 'l':
99: break;
1.35 xsa 100: case 'm':
1.40 xsa 101: logstr = optarg;
1.1 joris 102: break;
1.35 xsa 103: case 'N':
1.1 joris 104: break;
105: case 'n':
106: break;
107: case 'o':
1.36 xsa 108: orange = optarg;
1.1 joris 109: break;
110: case 'q':
1.35 xsa 111: verbosity = 0;
1.1 joris 112: break;
113: case 's':
1.42 xsa 114: statestr = optarg;
1.1 joris 115: break;
116: case 't':
117: break;
118: case 'U':
1.35 xsa 119: if (lkmode == RCS_LOCK_STRICT) {
120: cvs_log(LP_ERR, "-U and -L are incompatible");
121: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.16 jfb 122: }
123: lkmode = RCS_LOCK_LOOSE;
1.1 joris 124: break;
1.35 xsa 125: case 'u':
126: break;
1.1 joris 127: default:
1.35 xsa 128: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.1 joris 129: }
130: }
131:
132: argc -= optind;
133: argv += optind;
134:
1.38 xsa 135: if (argc == 0)
1.35 xsa 136: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.16 jfb 137:
1.35 xsa 138: cr.enterdir = NULL;
139: cr.leavedir = NULL;
1.25 joris 140:
1.35 xsa 141: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.44 joris 142: cvs_client_connect_to_server();
1.35 xsa 143: cr.fileproc = cvs_client_sendfile;
1.1 joris 144:
1.45 xsa 145: if (oldfilename != NULL)
146: cvs_client_send_request("Argument -A%s", oldfilename);
147:
1.36 xsa 148: if (alist != NULL)
149: cvs_client_send_request("Argument -a%s", alist);
150:
1.35 xsa 151: if (comment != NULL)
152: cvs_client_send_request("Argument -c%s", comment);
1.1 joris 153:
1.36 xsa 154: if (runflags & ADM_EFLAG)
155: cvs_client_send_request("Argument -e%s",
156: (elist != NULL) ? elist : "");
157:
1.47 ! xsa 158: if (koptstr != NULL)
! 159: cvs_client_send_request("Argument -k%s", koptstr);
! 160:
1.35 xsa 161: if (lkmode == RCS_LOCK_STRICT)
162: cvs_client_send_request("Argument -L");
163: else if (lkmode == RCS_LOCK_LOOSE)
164: cvs_client_send_request("Argument -U");
1.41 xsa 165:
166: if (logstr != NULL)
167: cvs_client_send_request("Argument -m%s", logstr);
1.25 joris 168:
1.36 xsa 169: if (orange != NULL)
170: cvs_client_send_request("Argument -o%s", orange);
171:
1.42 xsa 172: if (statestr != NULL)
173: cvs_client_send_request("Argument -s%s", statestr);
174:
1.35 xsa 175: if (verbosity == 0)
176: cvs_client_send_request("Argument -q");
1.25 joris 177:
1.35 xsa 178: } else {
1.39 xsa 179: flags |= CR_REPO;
1.35 xsa 180: cr.fileproc = cvs_admin_local;
1.7 joris 181: }
1.1 joris 182:
1.35 xsa 183: cr.flags = flags;
1.1 joris 184:
1.35 xsa 185: cvs_file_run(argc, argv, &cr);
1.5 joris 186:
1.35 xsa 187: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
188: cvs_client_send_files(argv, argc);
189: cvs_client_senddir(".");
190: cvs_client_send_request("admin");
191: cvs_client_get_responses();
1.1 joris 192: }
193:
194: return (0);
195: }
196:
1.35 xsa 197: void
198: cvs_admin_local(struct cvs_file *cf)
1.1 joris 199: {
1.35 xsa 200: int i;
1.1 joris 201:
1.35 xsa 202: cvs_log(LP_TRACE, "cvs_admin_local(%s)", cf->file_path);
1.14 joris 203:
1.39 xsa 204: cvs_file_classify(cf, NULL, 0);
205:
1.35 xsa 206: if (cf->file_type == CVS_DIR) {
207: if (verbosity > 1)
208: cvs_log(LP_NOTICE, "Administrating %s", cf->file_name);
209: return;
1.1 joris 210: }
211:
1.35 xsa 212: if (cf->file_status == FILE_UNKNOWN)
213: return;
214: else if (cf->file_status == FILE_ADDED) {
215: cvs_log(LP_ERR, "cannot admin newly added file `%s'",
216: cf->file_name);
217: return;
1.16 jfb 218: }
1.1 joris 219:
1.35 xsa 220: if (verbosity > 0)
1.39 xsa 221: cvs_printf("RCS file: %s\n", cf->file_rcs->rf_path);
1.45 xsa 222:
223: if (oldfilename != NULL) {
224: struct cvs_file *ocf;
225: struct rcs_access *acp;
226: int ofd;
1.46 otto 227: char *d, *f, fpath[MAXPATHLEN], repo[MAXPATHLEN];
1.45 xsa 228:
229:
230: if ((f = basename(oldfilename)) == NULL)
231: fatal("cvs_admin_local: basename failed");
232: if ((d = dirname(oldfilename)) == NULL)
233: fatal("cvs_admin_local: dirname failed");
234:
235: cvs_get_repository_path(d, repo, MAXPATHLEN);
236:
237: if (cvs_path_cat(repo, f, fpath, MAXPATHLEN) >= MAXPATHLEN)
238: fatal("cvs_admin_local: truncation");
239:
240: if (strlcat(fpath, RCS_FILE_EXT, MAXPATHLEN) >= MAXPATHLEN)
241: fatal("cvs_admin_local: truncation");
242:
243: if ((ofd = open(fpath, O_RDONLY)) == -1)
244: fatal("cvs_admin_local: open: `%s': %s", fpath,
245: strerror(errno));
246:
247: /* XXX: S_ISREG() check instead of blindly using CVS_FILE? */
248: ocf = cvs_file_get_cf(d, f, ofd, CVS_FILE);
249:
250: ocf->file_rcs = rcs_open(fpath, ofd, RCS_READ, 0444);
251: if (ocf->file_rcs == NULL)
252: fatal("cvs_admin_local: rcs_open failed");
253:
254: TAILQ_FOREACH(acp, &(ocf->file_rcs->rf_access), ra_list)
255: rcs_access_add(cf->file_rcs, acp->ra_name);
256:
257: (void)close(ofd);
258:
259: cvs_file_free(ocf);
260: }
1.14 joris 261:
1.36 xsa 262: if (alist != NULL) {
263: struct cvs_argvector *aargv;
264:
265: aargv = cvs_strsplit(alist, ",");
266: for (i = 0; aargv->argv[i] != NULL; i++)
267: rcs_access_add(cf->file_rcs, aargv->argv[i]);
268:
269: cvs_argv_destroy(aargv);
270: }
271:
1.35 xsa 272: if (comment != NULL)
273: rcs_comment_set(cf->file_rcs, comment);
1.19 xsa 274:
1.35 xsa 275: if (elist != NULL) {
276: struct cvs_argvector *eargv;
1.1 joris 277:
1.35 xsa 278: eargv = cvs_strsplit(elist, ",");
279: for (i = 0; eargv->argv[i] != NULL; i++)
280: rcs_access_remove(cf->file_rcs, eargv->argv[i]);
1.1 joris 281:
1.35 xsa 282: cvs_argv_destroy(eargv);
283: } else if (runflags & ADM_EFLAG) {
284: struct rcs_access *rap;
1.1 joris 285:
1.35 xsa 286: while (!TAILQ_EMPTY(&(cf->file_rcs->rf_access))) {
287: rap = TAILQ_FIRST(&(cf->file_rcs->rf_access));
288: TAILQ_REMOVE(&(cf->file_rcs->rf_access), rap, ra_list);
289: xfree(rap->ra_name);
290: xfree(rap);
291: }
292: /* no synced anymore */
293: cf->file_rcs->rf_flags &= ~RCS_SYNCED;
1.47 ! xsa 294: }
! 295:
! 296: /* Default `-kv' is accepted here. */
! 297: if (koptstr != NULL) {
! 298: if (cf->file_rcs->rf_expand == NULL ||
! 299: strcmp(cf->file_rcs->rf_expand, koptstr) != 0)
! 300: rcs_kwexp_set(cf->file_rcs, kflag);
1.40 xsa 301: }
302:
303: if (logstr != NULL) {
304: if ((logmsg = strchr(logstr, ':')) == NULL) {
305: cvs_log(LP_ERR, "missing log message");
306: return;
307: }
308:
309: *logmsg++ = '\0';
310: if ((logrev = rcsnum_parse(logstr)) == NULL) {
311: cvs_log(LP_ERR, "`%s' bad revision number", logstr);
312: return;
313: }
314:
315: if (rcs_rev_setlog(cf->file_rcs, logrev, logmsg) < 0) {
316: cvs_log(LP_ERR, "failed to set logmsg for `%s' to `%s'",
317: logstr, logmsg);
318: rcsnum_free(logrev);
319: return;
320: }
321:
322: rcsnum_free(logrev);
1.36 xsa 323: }
324:
325: if (orange != NULL) {
326: struct rcs_delta *rdp, *nrdp;
327: char b[16];
328:
329: cvs_revision_select(cf->file_rcs, orange);
330: for (rdp = TAILQ_FIRST(&(cf->file_rcs->rf_delta));
331: rdp != NULL; rdp = nrdp) {
332: nrdp = TAILQ_NEXT(rdp, rd_list);
333:
334: /*
335: * Delete selected revisions.
336: */
337: if (rdp->rd_flags & RCS_RD_SELECT) {
338: rcsnum_tostr(rdp->rd_num, b, sizeof(b));
339: if (verbosity > 0)
340: cvs_printf("deleting revision %s\n", b);
341:
342: (void)rcs_rev_remove(cf->file_rcs, rdp->rd_num);
343: }
344: }
1.42 xsa 345: }
346:
347: if (statestr != NULL) {
348: struct cvs_argvector *sargv;
349:
350: sargv = cvs_strsplit(statestr, ":");
351: if (sargv->argv[1] != NULL) {
352: state = xstrdup(sargv->argv[0]);
353:
354: if ((logrev = rcsnum_parse(sargv->argv[1])) == NULL) {
355: cvs_log(LP_ERR, "`%s' bad revision number", statestr);
1.43 xsa 356: cvs_argv_destroy(sargv);
357: xfree(state);
1.42 xsa 358: return;
359: }
360: } else {
361: state = xstrdup(statestr);
362: logrev = rcsnum_alloc();
363: rcsnum_cpy(cf->file_rcs->rf_head, logrev, 0);
364: }
365:
366: if (rcs_state_check(state) < 0) {
367: cvs_log(LP_ERR, "invalid state `%s'", state);
368: cvs_argv_destroy(sargv);
369: rcsnum_free(logrev);
370: xfree(state);
371: return;
372: }
373:
374: (void)rcs_state_set(cf->file_rcs, logrev, state);
375:
376: cvs_argv_destroy(sargv);
377: rcsnum_free(logrev);
378: xfree(state);
1.35 xsa 379: }
1.33 xsa 380:
1.16 jfb 381: if (lkmode != RCS_LOCK_INVAL)
1.35 xsa 382: (void)rcs_lock_setmode(cf->file_rcs, lkmode);
1.37 xsa 383:
384: rcs_write(cf->file_rcs);
1.29 xsa 385:
1.35 xsa 386: if (verbosity > 0)
1.29 xsa 387: cvs_printf("done\n");
1.1 joris 388: }
![[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