Annotation of src/usr.bin/cvs/remove.c, Revision 1.55
1.55 ! xsa 1: /* $OpenBSD: remove.c,v 1.54 2006/06/19 05:05:17 joris Exp $ */
1.1 xsa 2: /*
1.46 joris 3: * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
1.1 xsa 4: *
1.46 joris 5: * Permission to use, copy, modify, and distribute this software for any
6: * purpose with or without fee is hereby granted, provided that the above
7: * copyright notice and this permission notice appear in all copies.
1.1 xsa 8: *
1.46 joris 9: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1.1 xsa 16: */
17:
1.40 xsa 18: #include "includes.h"
1.1 xsa 19:
20: #include "cvs.h"
21: #include "log.h"
1.55 ! xsa 22: #include "remote.h"
1.1 xsa 23:
24: extern char *__progname;
25:
1.46 joris 26: void cvs_remove_local(struct cvs_file *);
1.1 xsa 27:
1.46 joris 28: static int force_remove = 0;
29: static int removed = 0;
30: static int existing = 0;
1.4 joris 31:
1.16 jfb 32: struct cvs_cmd cvs_cmd_remove = {
1.53 joris 33: CVS_OP_REMOVE, 0, "remove",
1.16 jfb 34: { "rm", "delete" },
35: "Remove an entry from the repository",
36: "[-flR] [file ...]",
37: "flR",
1.4 joris 38: NULL,
1.46 joris 39: cvs_remove
1.4 joris 40: };
1.1 xsa 41:
1.46 joris 42: int
43: cvs_remove(int argc, char **argv)
1.1 xsa 44: {
1.4 joris 45: int ch;
1.47 joris 46: int flags;
1.46 joris 47: char *arg = ".";
48: struct cvs_recursion cr;
1.1 xsa 49:
1.47 joris 50: flags = CR_RECURSE_DIRS;
1.48 xsa 51: while ((ch = getopt(argc, argv, cvs_cmd_remove.cmd_opts)) != -1) {
1.1 xsa 52: switch (ch) {
53: case 'f':
1.3 xsa 54: force_remove = 1;
1.1 xsa 55: break;
56: case 'l':
1.47 joris 57: flags &= ~CR_RECURSE_DIRS;
1.1 xsa 58: break;
59: case 'R':
60: break;
61: default:
1.48 xsa 62: fatal("%s", cvs_cmd_remove.cmd_synopsis);
1.1 xsa 63: }
64: }
65:
66: argc -= optind;
67: argv += optind;
68:
1.46 joris 69: cr.enterdir = NULL;
70: cr.leavedir = NULL;
1.55 ! xsa 71:
! 72: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
! 73: cr.fileproc = cvs_client_sendfile;
! 74:
! 75: if (force_remove == 1)
! 76: cvs_client_send_request("Argument -f");
! 77:
! 78: if (!(flags & CR_RECURSE_DIRS))
! 79: cvs_client_send_request("Argument -l");
! 80: } else {
! 81: cr.fileproc = cvs_remove_local;
! 82: }
! 83:
1.47 joris 84: cr.flags = flags;
1.46 joris 85:
86: if (argc > 0)
87: cvs_file_run(argc, argv, &cr);
88: else
89: cvs_file_run(1, &arg, &cr);
1.11 xsa 90:
1.55 ! xsa 91: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
! 92: cvs_client_send_files(argv, argc);
! 93: cvs_client_senddir(".");
! 94: cvs_client_send_request("remove");
! 95: cvs_client_get_responses();
! 96: } else {
! 97: if (existing != 0) {
! 98: cvs_log(LP_ERR, "%d file(s) exist, remove them first",
! 99: existing);
! 100: }
1.49 joris 101:
1.55 ! xsa 102: if (removed != 0) {
! 103: if (verbosity > 1) {
! 104: cvs_log(LP_NOTICE,
! 105: "use '%s commit' to remove %s "
! 106: "permanently", __progname, (removed > 1) ?
! 107: "these files" : "this file");
! 108: }
! 109: }
1.49 joris 110: }
111:
1.18 joris 112: return (0);
113: }
114:
1.46 joris 115: void
116: cvs_remove_local(struct cvs_file *cf)
1.18 joris 117: {
1.46 joris 118: int l;
119: CVSENTRIES *entlist;
120: char *entry, buf[MAXPATHLEN], tbuf[32], rbuf[16];
1.20 xsa 121:
1.46 joris 122: cvs_log(LP_TRACE, "cvs_remove_local(%s)", cf->file_path);
1.20 xsa 123:
1.46 joris 124: if (cf->file_type == CVS_DIR) {
1.19 xsa 125: if (verbosity > 1)
1.46 joris 126: cvs_log(LP_NOTICE, "Removing %s", cf->file_path);
127: return;
1.19 xsa 128: }
129:
1.50 joris 130: cvs_file_classify(cf, NULL, 0);
1.51 joris 131:
132: if (cf->file_status == FILE_UNKNOWN) {
133: if (verbosity > 1)
134: cvs_log(LP_NOTICE, "nothing known about '%s'",
135: cf->file_path);
136: return;
137: }
1.20 xsa 138:
1.46 joris 139: if (force_remove == 1) {
140: if (unlink(cf->file_path) == -1)
141: fatal("cvs_remove_local: %s", strerror(errno));
142: (void)close(cf->fd);
143: cf->fd = -1;
1.20 xsa 144: }
145:
1.46 joris 146: if (cf->fd != -1) {
147: if (verbosity > 1)
148: cvs_log(LP_ERR, "file `%s' still in working directory",
149: cf->file_name);
1.20 xsa 150: existing++;
151: } else {
1.46 joris 152: switch(cf->file_status) {
153: case FILE_ADDED:
154: entlist = cvs_ent_open(cf->file_wd);
155: cvs_ent_remove(entlist, cf->file_name);
156: cvs_ent_close(entlist, ENT_SYNC);
157:
158: l = snprintf(buf, sizeof(buf), "%s/%s/%s%s",
159: cf->file_path, CVS_PATH_CVSDIR, cf->file_name,
160: CVS_DESCR_FILE_EXT);
161: if (l == -1 || l >= (int)sizeof(buf))
162: fatal("cvs_remove_local: overflow");
163:
164: (void)unlink(buf);
165:
166: if (verbosity > 1) {
167: cvs_log(LP_NOTICE, "removed `%s'",
168: cf->file_name);
169: }
170: return;
171: case FILE_REMOVED:
172: if (verbosity > 1 ) {
173: cvs_log(LP_ERR,
174: "file `%s' already scheduled for removal",
175: cf->file_name);
176: }
177: return;
178: default:
179: rcsnum_tostr(cf->file_ent->ce_rev, rbuf,
180: sizeof(rbuf));
1.34 xsa 181:
1.46 joris 182: ctime_r(&cf->file_ent->ce_mtime, tbuf);
183: if (tbuf[strlen(tbuf) - 1] == '\n')
184: tbuf[strlen(tbuf) - 1] = '\0';
185:
186: entry = xmalloc(CVS_ENT_MAXLINELEN);
187: l = snprintf(entry, CVS_ENT_MAXLINELEN,
188: "/%s/-%s/%s//", cf->file_name, rbuf, tbuf);
189: if (l == -1 || l >= CVS_ENT_MAXLINELEN)
190: fatal("cvs_remove_local: overflow");
191:
192: entlist = cvs_ent_open(cf->file_wd);
193: cvs_ent_add(entlist, entry);
194: cvs_ent_close(entlist, ENT_SYNC);
195:
196: xfree(entry);
197:
198: if (verbosity > 1) {
199: cvs_log(LP_NOTICE,
200: "scheduling file `%s' for removal",
201: cf->file_name);
202: }
1.34 xsa 203:
1.46 joris 204: cf->file_status = FILE_REMOVED;
205: removed++;
206: break;
207: }
1.20 xsa 208: }
1.1 xsa 209: }
![[BACK]](/icons/back.gif){kind=icon}
Return to remove.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs