Annotation of src/usr.bin/cvs/remove.c, Revision 1.54
1.54 ! joris 1: /* $OpenBSD: remove.c,v 1.53 2006/06/16 14:07:42 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"
22:
23: extern char *__progname;
24:
1.46 joris 25: int cvs_remove(int, char **);
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.54 ! joris 71: cr.fileproc = cvs_remove_local;
1.47 joris 72: cr.flags = flags;
1.46 joris 73:
74: if (argc > 0)
75: cvs_file_run(argc, argv, &cr);
76: else
77: cvs_file_run(1, &arg, &cr);
1.11 xsa 78:
1.49 joris 79: if (existing != 0) {
80: cvs_log(LP_ERR, "%d file(s) exist, remove them first",
81: existing);
82: }
83:
84: if (removed != 0) {
85: if (verbosity > 1)
86: cvs_log(LP_NOTICE, "use '%s commit' to remove %s "
87: "permanently", __progname, (removed > 1) ?
88: "these files" : "this file");
89: }
90:
1.18 joris 91: return (0);
92: }
93:
1.46 joris 94: void
95: cvs_remove_local(struct cvs_file *cf)
1.18 joris 96: {
1.46 joris 97: int l;
98: CVSENTRIES *entlist;
99: char *entry, buf[MAXPATHLEN], tbuf[32], rbuf[16];
1.20 xsa 100:
1.46 joris 101: cvs_log(LP_TRACE, "cvs_remove_local(%s)", cf->file_path);
1.20 xsa 102:
1.46 joris 103: if (cf->file_type == CVS_DIR) {
1.19 xsa 104: if (verbosity > 1)
1.46 joris 105: cvs_log(LP_NOTICE, "Removing %s", cf->file_path);
106: return;
1.19 xsa 107: }
108:
1.50 joris 109: cvs_file_classify(cf, NULL, 0);
1.51 joris 110:
111: if (cf->file_status == FILE_UNKNOWN) {
112: if (verbosity > 1)
113: cvs_log(LP_NOTICE, "nothing known about '%s'",
114: cf->file_path);
115: return;
116: }
1.20 xsa 117:
1.46 joris 118: if (force_remove == 1) {
119: if (unlink(cf->file_path) == -1)
120: fatal("cvs_remove_local: %s", strerror(errno));
121: (void)close(cf->fd);
122: cf->fd = -1;
1.20 xsa 123: }
124:
1.46 joris 125: if (cf->fd != -1) {
126: if (verbosity > 1)
127: cvs_log(LP_ERR, "file `%s' still in working directory",
128: cf->file_name);
1.20 xsa 129: existing++;
130: } else {
1.46 joris 131: switch(cf->file_status) {
132: case FILE_ADDED:
133: entlist = cvs_ent_open(cf->file_wd);
134: cvs_ent_remove(entlist, cf->file_name);
135: cvs_ent_close(entlist, ENT_SYNC);
136:
137: l = snprintf(buf, sizeof(buf), "%s/%s/%s%s",
138: cf->file_path, CVS_PATH_CVSDIR, cf->file_name,
139: CVS_DESCR_FILE_EXT);
140: if (l == -1 || l >= (int)sizeof(buf))
141: fatal("cvs_remove_local: overflow");
142:
143: (void)unlink(buf);
144:
145: if (verbosity > 1) {
146: cvs_log(LP_NOTICE, "removed `%s'",
147: cf->file_name);
148: }
149: return;
150: case FILE_REMOVED:
151: if (verbosity > 1 ) {
152: cvs_log(LP_ERR,
153: "file `%s' already scheduled for removal",
154: cf->file_name);
155: }
156: return;
157: default:
158: rcsnum_tostr(cf->file_ent->ce_rev, rbuf,
159: sizeof(rbuf));
1.34 xsa 160:
1.46 joris 161: ctime_r(&cf->file_ent->ce_mtime, tbuf);
162: if (tbuf[strlen(tbuf) - 1] == '\n')
163: tbuf[strlen(tbuf) - 1] = '\0';
164:
165: entry = xmalloc(CVS_ENT_MAXLINELEN);
166: l = snprintf(entry, CVS_ENT_MAXLINELEN,
167: "/%s/-%s/%s//", cf->file_name, rbuf, tbuf);
168: if (l == -1 || l >= CVS_ENT_MAXLINELEN)
169: fatal("cvs_remove_local: overflow");
170:
171: entlist = cvs_ent_open(cf->file_wd);
172: cvs_ent_add(entlist, entry);
173: cvs_ent_close(entlist, ENT_SYNC);
174:
175: xfree(entry);
176:
177: if (verbosity > 1) {
178: cvs_log(LP_NOTICE,
179: "scheduling file `%s' for removal",
180: cf->file_name);
181: }
1.34 xsa 182:
1.46 joris 183: cf->file_status = FILE_REMOVED;
184: removed++;
185: break;
186: }
1.20 xsa 187: }
1.1 xsa 188: }
![[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