Annotation of src/usr.bin/cvs/remove.c, Revision 1.77
1.77 ! tobias 1: /* $OpenBSD: remove.c,v 1.76 2008/06/08 18:08:59 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.64 otto 18: #include <errno.h>
19: #include <string.h>
20: #include <unistd.h>
1.1 xsa 21:
22: #include "cvs.h"
1.55 xsa 23: #include "remote.h"
1.1 xsa 24:
25: extern char *__progname;
26:
1.59 joris 27: void cvs_remove_force(struct cvs_file *);
1.1 xsa 28:
1.46 joris 29: static int force_remove = 0;
30: static int removed = 0;
31: static int existing = 0;
1.4 joris 32:
1.16 jfb 33: struct cvs_cmd cvs_cmd_remove = {
1.69 tobias 34: CVS_OP_REMOVE, CVS_USE_WDIR, "remove",
1.16 jfb 35: { "rm", "delete" },
36: "Remove an entry from the repository",
37: "[-flR] [file ...]",
38: "flR",
1.4 joris 39: NULL,
1.46 joris 40: cvs_remove
1.4 joris 41: };
1.1 xsa 42:
1.46 joris 43: int
44: cvs_remove(int argc, char **argv)
1.1 xsa 45: {
1.4 joris 46: int ch;
1.47 joris 47: int flags;
1.46 joris 48: char *arg = ".";
49: struct cvs_recursion cr;
1.1 xsa 50:
1.47 joris 51: flags = CR_RECURSE_DIRS;
1.48 xsa 52: while ((ch = getopt(argc, argv, cvs_cmd_remove.cmd_opts)) != -1) {
1.1 xsa 53: switch (ch) {
54: case 'f':
1.3 xsa 55: force_remove = 1;
1.1 xsa 56: break;
57: case 'l':
1.47 joris 58: flags &= ~CR_RECURSE_DIRS;
1.1 xsa 59: break;
60: case 'R':
1.68 tobias 61: flags |= CR_RECURSE_DIRS;
1.1 xsa 62: break;
63: default:
1.48 xsa 64: fatal("%s", cvs_cmd_remove.cmd_synopsis);
1.1 xsa 65: }
66: }
67:
68: argc -= optind;
69: argv += optind;
70:
1.46 joris 71: cr.enterdir = NULL;
72: cr.leavedir = NULL;
1.59 joris 73: cr.flags = flags;
74:
1.77 ! tobias 75: if (force_remove == 1 && cvs_noexec == 0) {
! 76: cr.fileproc = cvs_remove_force;
! 77: if (argc > 0)
! 78: cvs_file_run(argc, argv, &cr);
! 79: else
! 80: cvs_file_run(1, &arg, &cr);
! 81: }
1.55 xsa 82:
83: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.60 joris 84: cvs_client_connect_to_server();
1.55 xsa 85: cr.fileproc = cvs_client_sendfile;
86:
87: if (!(flags & CR_RECURSE_DIRS))
88: cvs_client_send_request("Argument -l");
89: } else {
90: cr.fileproc = cvs_remove_local;
91: }
92:
1.46 joris 93: if (argc > 0)
94: cvs_file_run(argc, argv, &cr);
95: else
96: cvs_file_run(1, &arg, &cr);
1.11 xsa 97:
1.55 xsa 98: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
99: cvs_client_send_files(argv, argc);
100: cvs_client_senddir(".");
101: cvs_client_send_request("remove");
102: cvs_client_get_responses();
103: } else {
104: if (existing != 0) {
1.56 xsa 105: cvs_log(LP_ERR, (existing == 1) ?
106: "%d file exists; remove it first" :
107: "%d files exist; remove them first", existing);
1.55 xsa 108: }
1.49 joris 109:
1.55 xsa 110: if (removed != 0) {
1.58 joris 111: if (verbosity > 0) {
1.55 xsa 112: cvs_log(LP_NOTICE,
113: "use '%s commit' to remove %s "
114: "permanently", __progname, (removed > 1) ?
115: "these files" : "this file");
116: }
117: }
1.49 joris 118: }
119:
1.18 joris 120: return (0);
121: }
122:
1.46 joris 123: void
1.59 joris 124: cvs_remove_force(struct cvs_file *cf)
125: {
126: if (cf->file_type != CVS_DIR) {
1.77 ! tobias 127: if (cf->fd != -1) {
1.59 joris 128: if (unlink(cf->file_path) == -1)
129: fatal("cvs_remove_force: %s", strerror(errno));
130: (void)close(cf->fd);
131: cf->fd = -1;
132: }
133: }
134: }
135:
136: void
1.46 joris 137: cvs_remove_local(struct cvs_file *cf)
1.18 joris 138: {
1.46 joris 139: CVSENTRIES *entlist;
1.65 xsa 140: char *entry, buf[MAXPATHLEN], tbuf[CVS_TIME_BUFSZ], rbuf[CVS_REV_BUFSZ];
1.71 tobias 141: char sticky[CVS_ENT_MAXLINELEN];
1.20 xsa 142:
1.46 joris 143: cvs_log(LP_TRACE, "cvs_remove_local(%s)", cf->file_path);
1.20 xsa 144:
1.46 joris 145: if (cf->file_type == CVS_DIR) {
1.19 xsa 146: if (verbosity > 1)
1.46 joris 147: cvs_log(LP_NOTICE, "Removing %s", cf->file_path);
148: return;
1.19 xsa 149: }
150:
1.73 joris 151: if (cvs_cmdop != CVS_OP_CHECKOUT && cvs_cmdop != CVS_OP_UPDATE)
152: cvs_file_classify(cf, cvs_directory_tag);
1.51 joris 153:
154: if (cf->file_status == FILE_UNKNOWN) {
155: if (verbosity > 1)
156: cvs_log(LP_NOTICE, "nothing known about '%s'",
157: cf->file_path);
158: return;
1.20 xsa 159: }
160:
1.46 joris 161: if (cf->fd != -1) {
162: if (verbosity > 1)
163: cvs_log(LP_ERR, "file `%s' still in working directory",
164: cf->file_name);
1.20 xsa 165: existing++;
166: } else {
1.58 joris 167: switch (cf->file_status) {
1.61 joris 168: case FILE_REMOVE_ENTRY:
1.46 joris 169: entlist = cvs_ent_open(cf->file_wd);
170: cvs_ent_remove(entlist, cf->file_name);
171: cvs_ent_close(entlist, ENT_SYNC);
172:
1.62 xsa 173: (void)xsnprintf(buf, sizeof(buf), "%s/%s/%s%s",
1.74 tobias 174: cf->file_wd, CVS_PATH_CVSDIR, cf->file_name,
1.46 joris 175: CVS_DESCR_FILE_EXT);
176:
177: (void)unlink(buf);
178:
179: if (verbosity > 1) {
180: cvs_log(LP_NOTICE, "removed `%s'",
181: cf->file_name);
182: }
183: return;
184: case FILE_REMOVED:
1.58 joris 185: if (verbosity > 0) {
1.46 joris 186: cvs_log(LP_ERR,
187: "file `%s' already scheduled for removal",
188: cf->file_name);
189: }
190: return;
1.75 joris 191: case FILE_LOST:
1.70 tobias 192: rcsnum_tostr(cf->file_ent->ce_rev, rbuf, sizeof(rbuf));
1.34 xsa 193:
1.46 joris 194: ctime_r(&cf->file_ent->ce_mtime, tbuf);
1.67 tobias 195: tbuf[strcspn(tbuf, "\n")] = '\0';
1.46 joris 196:
1.71 tobias 197: sticky[0] = '\0';
198: if (cf->file_ent->ce_tag != NULL)
199: (void)xsnprintf(sticky, sizeof(sticky), "T%s",
200: cf->file_ent->ce_tag);
201:
1.46 joris 202: entry = xmalloc(CVS_ENT_MAXLINELEN);
1.72 xsa 203: cvs_ent_line_str(cf->file_name, rbuf, tbuf,
204: cf->file_ent->ce_opts ? : "", sticky, 0, 1,
205: entry, CVS_ENT_MAXLINELEN);
1.46 joris 206:
1.58 joris 207: if (cvs_server_active == 1) {
208: cvs_server_update_entry("Checked-in", cf);
209: cvs_remote_output(entry);
210: } else {
211: entlist = cvs_ent_open(cf->file_wd);
212: cvs_ent_add(entlist, entry);
213: cvs_ent_close(entlist, ENT_SYNC);
214: }
1.46 joris 215:
216: xfree(entry);
217:
1.58 joris 218: if (verbosity > 0) {
1.46 joris 219: cvs_log(LP_NOTICE,
220: "scheduling file `%s' for removal",
221: cf->file_name);
222: }
1.34 xsa 223:
1.46 joris 224: cf->file_status = FILE_REMOVED;
225: removed++;
226: break;
227: }
1.20 xsa 228: }
1.1 xsa 229: }
![[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