Annotation of src/usr.bin/cvs/admin.c, Revision 1.42
1.42 ! xsa 1: /* $OpenBSD: admin.c,v 1.41 2006/12/31 15:38:11 xsa 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.35 xsa 5: * Copyright (c) 2006 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.35 xsa 34: "[-ILqU] [A oldfile] [-a users] [-b branch]\n"
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.42 ! xsa 46: static char *alist, *comment, *elist, *logmsg, *logstr, *orange, *state, *statestr;
1.40 xsa 47: static RCSNUM *logrev;
1.7 joris 48:
1.35 xsa 49: int
50: cvs_admin(int argc, char **argv)
1.1 joris 51: {
1.7 joris 52: int ch;
1.35 xsa 53: int flags;
54: struct cvs_recursion cr;
1.1 joris 55:
1.35 xsa 56: flags = CR_RECURSE_DIRS;
1.1 joris 57:
1.42 ! xsa 58: alist = comment = elist = logmsg = logstr = orange = state = statestr = NULL;
1.40 xsa 59:
1.35 xsa 60: while ((ch = getopt(argc, argv, cvs_cmd_admin.cmd_opts)) != -1) {
1.1 joris 61: switch (ch) {
1.35 xsa 62: case 'A':
63: break;
1.1 joris 64: case 'a':
1.36 xsa 65: alist = optarg;
1.1 joris 66: break;
67: case 'b':
68: break;
69: case 'c':
70: comment = optarg;
71: break;
72: case 'e':
1.35 xsa 73: elist = optarg;
74: runflags |= ADM_EFLAG;
1.1 joris 75: break;
76: case 'I':
77: break;
78: case 'k':
1.35 xsa 79: break;
80: case 'L':
81: if (lkmode == RCS_LOCK_LOOSE) {
82: cvs_log(LP_ERR, "-L and -U are incompatible");
83: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.3 joris 84: }
1.35 xsa 85: lkmode = RCS_LOCK_STRICT;
1.1 joris 86: break;
87: case 'l':
88: break;
1.35 xsa 89: case 'm':
1.40 xsa 90: logstr = optarg;
1.1 joris 91: break;
1.35 xsa 92: case 'N':
1.1 joris 93: break;
94: case 'n':
95: break;
96: case 'o':
1.36 xsa 97: orange = optarg;
1.1 joris 98: break;
99: case 'q':
1.35 xsa 100: verbosity = 0;
1.1 joris 101: break;
102: case 's':
1.42 ! xsa 103: statestr = optarg;
1.1 joris 104: break;
105: case 't':
106: break;
107: case 'U':
1.35 xsa 108: if (lkmode == RCS_LOCK_STRICT) {
109: cvs_log(LP_ERR, "-U and -L are incompatible");
110: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.16 jfb 111: }
112: lkmode = RCS_LOCK_LOOSE;
1.1 joris 113: break;
1.35 xsa 114: case 'u':
115: break;
1.1 joris 116: default:
1.35 xsa 117: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.1 joris 118: }
119: }
120:
121: argc -= optind;
122: argv += optind;
123:
1.38 xsa 124: if (argc == 0)
1.35 xsa 125: fatal("%s", cvs_cmd_admin.cmd_synopsis);
1.16 jfb 126:
1.35 xsa 127: cr.enterdir = NULL;
128: cr.leavedir = NULL;
1.25 joris 129:
1.35 xsa 130: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
131: cr.fileproc = cvs_client_sendfile;
1.1 joris 132:
1.36 xsa 133: if (alist != NULL)
134: cvs_client_send_request("Argument -a%s", alist);
135:
1.35 xsa 136: if (comment != NULL)
137: cvs_client_send_request("Argument -c%s", comment);
1.1 joris 138:
1.36 xsa 139: if (runflags & ADM_EFLAG)
140: cvs_client_send_request("Argument -e%s",
141: (elist != NULL) ? elist : "");
142:
1.35 xsa 143: if (lkmode == RCS_LOCK_STRICT)
144: cvs_client_send_request("Argument -L");
145: else if (lkmode == RCS_LOCK_LOOSE)
146: cvs_client_send_request("Argument -U");
1.41 xsa 147:
148: if (logstr != NULL)
149: cvs_client_send_request("Argument -m%s", logstr);
1.25 joris 150:
1.36 xsa 151: if (orange != NULL)
152: cvs_client_send_request("Argument -o%s", orange);
153:
1.42 ! xsa 154: if (statestr != NULL)
! 155: cvs_client_send_request("Argument -s%s", statestr);
! 156:
1.35 xsa 157: if (verbosity == 0)
158: cvs_client_send_request("Argument -q");
1.25 joris 159:
1.35 xsa 160: } else {
1.39 xsa 161: flags |= CR_REPO;
1.35 xsa 162: cr.fileproc = cvs_admin_local;
1.7 joris 163: }
1.1 joris 164:
1.35 xsa 165: cr.flags = flags;
1.1 joris 166:
1.35 xsa 167: cvs_file_run(argc, argv, &cr);
1.5 joris 168:
1.35 xsa 169: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
170: cvs_client_send_files(argv, argc);
171: cvs_client_senddir(".");
172: cvs_client_send_request("admin");
173: cvs_client_get_responses();
1.1 joris 174: }
175:
176: return (0);
177: }
178:
1.35 xsa 179: void
180: cvs_admin_local(struct cvs_file *cf)
1.1 joris 181: {
1.35 xsa 182: int i;
1.1 joris 183:
1.35 xsa 184: cvs_log(LP_TRACE, "cvs_admin_local(%s)", cf->file_path);
1.14 joris 185:
1.39 xsa 186: cvs_file_classify(cf, NULL, 0);
187:
1.35 xsa 188: if (cf->file_type == CVS_DIR) {
189: if (verbosity > 1)
190: cvs_log(LP_NOTICE, "Administrating %s", cf->file_name);
191: return;
1.1 joris 192: }
193:
1.35 xsa 194: if (cf->file_status == FILE_UNKNOWN)
195: return;
196: else if (cf->file_status == FILE_ADDED) {
197: cvs_log(LP_ERR, "cannot admin newly added file `%s'",
198: cf->file_name);
199: return;
1.16 jfb 200: }
1.1 joris 201:
1.35 xsa 202: if (verbosity > 0)
1.39 xsa 203: cvs_printf("RCS file: %s\n", cf->file_rcs->rf_path);
1.14 joris 204:
1.36 xsa 205: if (alist != NULL) {
206: struct cvs_argvector *aargv;
207:
208: aargv = cvs_strsplit(alist, ",");
209: for (i = 0; aargv->argv[i] != NULL; i++)
210: rcs_access_add(cf->file_rcs, aargv->argv[i]);
211:
212: cvs_argv_destroy(aargv);
213: }
214:
1.35 xsa 215: if (comment != NULL)
216: rcs_comment_set(cf->file_rcs, comment);
1.19 xsa 217:
1.35 xsa 218: if (elist != NULL) {
219: struct cvs_argvector *eargv;
1.1 joris 220:
1.35 xsa 221: eargv = cvs_strsplit(elist, ",");
222: for (i = 0; eargv->argv[i] != NULL; i++)
223: rcs_access_remove(cf->file_rcs, eargv->argv[i]);
1.1 joris 224:
1.35 xsa 225: cvs_argv_destroy(eargv);
226: } else if (runflags & ADM_EFLAG) {
227: struct rcs_access *rap;
1.1 joris 228:
1.35 xsa 229: while (!TAILQ_EMPTY(&(cf->file_rcs->rf_access))) {
230: rap = TAILQ_FIRST(&(cf->file_rcs->rf_access));
231: TAILQ_REMOVE(&(cf->file_rcs->rf_access), rap, ra_list);
232: xfree(rap->ra_name);
233: xfree(rap);
234: }
235: /* no synced anymore */
236: cf->file_rcs->rf_flags &= ~RCS_SYNCED;
1.40 xsa 237: }
238:
239: if (logstr != NULL) {
240: if ((logmsg = strchr(logstr, ':')) == NULL) {
241: cvs_log(LP_ERR, "missing log message");
242: return;
243: }
244:
245: *logmsg++ = '\0';
246: if ((logrev = rcsnum_parse(logstr)) == NULL) {
247: cvs_log(LP_ERR, "`%s' bad revision number", logstr);
248: return;
249: }
250:
251: if (rcs_rev_setlog(cf->file_rcs, logrev, logmsg) < 0) {
252: cvs_log(LP_ERR, "failed to set logmsg for `%s' to `%s'",
253: logstr, logmsg);
254: rcsnum_free(logrev);
255: return;
256: }
257:
258: rcsnum_free(logrev);
1.36 xsa 259: }
260:
261: if (orange != NULL) {
262: struct rcs_delta *rdp, *nrdp;
263: char b[16];
264:
265: cvs_revision_select(cf->file_rcs, orange);
266: for (rdp = TAILQ_FIRST(&(cf->file_rcs->rf_delta));
267: rdp != NULL; rdp = nrdp) {
268: nrdp = TAILQ_NEXT(rdp, rd_list);
269:
270: /*
271: * Delete selected revisions.
272: */
273: if (rdp->rd_flags & RCS_RD_SELECT) {
274: rcsnum_tostr(rdp->rd_num, b, sizeof(b));
275: if (verbosity > 0)
276: cvs_printf("deleting revision %s\n", b);
277:
278: (void)rcs_rev_remove(cf->file_rcs, rdp->rd_num);
279: }
280: }
1.42 ! xsa 281: }
! 282:
! 283: if (statestr != NULL) {
! 284: struct cvs_argvector *sargv;
! 285:
! 286: sargv = cvs_strsplit(statestr, ":");
! 287: if (sargv->argv[1] != NULL) {
! 288: state = xstrdup(sargv->argv[0]);
! 289:
! 290: if ((logrev = rcsnum_parse(sargv->argv[1])) == NULL) {
! 291: cvs_log(LP_ERR, "`%s' bad revision number", statestr);
! 292: return;
! 293: }
! 294: } else {
! 295: state = xstrdup(statestr);
! 296: logrev = rcsnum_alloc();
! 297: rcsnum_cpy(cf->file_rcs->rf_head, logrev, 0);
! 298: }
! 299:
! 300: if (rcs_state_check(state) < 0) {
! 301: cvs_log(LP_ERR, "invalid state `%s'", state);
! 302: cvs_argv_destroy(sargv);
! 303: rcsnum_free(logrev);
! 304: xfree(state);
! 305: return;
! 306: }
! 307:
! 308: (void)rcs_state_set(cf->file_rcs, logrev, state);
! 309:
! 310: cvs_argv_destroy(sargv);
! 311: rcsnum_free(logrev);
! 312: xfree(state);
1.35 xsa 313: }
1.33 xsa 314:
1.16 jfb 315: if (lkmode != RCS_LOCK_INVAL)
1.35 xsa 316: (void)rcs_lock_setmode(cf->file_rcs, lkmode);
1.37 xsa 317:
318: rcs_write(cf->file_rcs);
1.29 xsa 319:
1.35 xsa 320: if (verbosity > 0)
1.29 xsa 321: cvs_printf("done\n");
1.1 joris 322: }
![[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