Annotation of src/usr.bin/cvs/remove.c, Revision 1.83
1.83 ! nicm 1: /* $OpenBSD: remove.c,v 1.82 2015/01/16 06:40:07 deraadt 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>
1.83 ! nicm 19: #include <stdlib.h>
1.64 otto 20: #include <string.h>
21: #include <unistd.h>
1.1 xsa 22:
23: #include "cvs.h"
1.55 xsa 24: #include "remote.h"
1.1 xsa 25:
26: extern char *__progname;
27:
1.59 joris 28: void cvs_remove_force(struct cvs_file *);
1.1 xsa 29:
1.46 joris 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.81 nicm 50: int force_remove = 0;
1.1 xsa 51:
1.47 joris 52: flags = CR_RECURSE_DIRS;
1.48 xsa 53: while ((ch = getopt(argc, argv, cvs_cmd_remove.cmd_opts)) != -1) {
1.1 xsa 54: switch (ch) {
55: case 'f':
1.3 xsa 56: force_remove = 1;
1.1 xsa 57: break;
58: case 'l':
1.47 joris 59: flags &= ~CR_RECURSE_DIRS;
1.1 xsa 60: break;
61: case 'R':
1.68 tobias 62: flags |= CR_RECURSE_DIRS;
1.1 xsa 63: break;
64: default:
1.48 xsa 65: fatal("%s", cvs_cmd_remove.cmd_synopsis);
1.1 xsa 66: }
67: }
68:
69: argc -= optind;
70: argv += optind;
71:
1.46 joris 72: cr.enterdir = NULL;
73: cr.leavedir = NULL;
1.59 joris 74: cr.flags = flags;
75:
1.77 tobias 76: if (force_remove == 1 && cvs_noexec == 0) {
77: cr.fileproc = cvs_remove_force;
78: if (argc > 0)
79: cvs_file_run(argc, argv, &cr);
80: else
81: cvs_file_run(1, &arg, &cr);
82: }
1.55 xsa 83:
84: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.60 joris 85: cvs_client_connect_to_server();
1.55 xsa 86: cr.fileproc = cvs_client_sendfile;
87:
88: if (!(flags & CR_RECURSE_DIRS))
89: cvs_client_send_request("Argument -l");
90: } else {
91: cr.fileproc = cvs_remove_local;
92: }
93:
1.46 joris 94: if (argc > 0)
95: cvs_file_run(argc, argv, &cr);
96: else
97: cvs_file_run(1, &arg, &cr);
1.11 xsa 98:
1.55 xsa 99: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
100: cvs_client_send_files(argv, argc);
101: cvs_client_senddir(".");
102: cvs_client_send_request("remove");
103: cvs_client_get_responses();
104: } else {
105: if (existing != 0) {
1.56 xsa 106: cvs_log(LP_ERR, (existing == 1) ?
107: "%d file exists; remove it first" :
108: "%d files exist; remove them first", existing);
1.55 xsa 109: }
1.49 joris 110:
1.55 xsa 111: if (removed != 0) {
1.58 joris 112: if (verbosity > 0) {
1.55 xsa 113: cvs_log(LP_NOTICE,
114: "use '%s commit' to remove %s "
115: "permanently", __progname, (removed > 1) ?
116: "these files" : "this file");
117: }
118: }
1.49 joris 119: }
120:
1.18 joris 121: return (0);
122: }
123:
1.46 joris 124: void
1.59 joris 125: cvs_remove_force(struct cvs_file *cf)
126: {
127: if (cf->file_type != CVS_DIR) {
1.80 joris 128: if (cf->file_flags & FILE_ON_DISK) {
1.59 joris 129: if (unlink(cf->file_path) == -1)
130: fatal("cvs_remove_force: %s", strerror(errno));
131: (void)close(cf->fd);
132: cf->fd = -1;
133: }
134: }
135: }
136:
137: void
1.46 joris 138: cvs_remove_local(struct cvs_file *cf)
1.18 joris 139: {
1.46 joris 140: CVSENTRIES *entlist;
1.82 deraadt 141: char *entry, buf[PATH_MAX], tbuf[CVS_TIME_BUFSZ], rbuf[CVS_REV_BUFSZ];
1.71 tobias 142: char sticky[CVS_ENT_MAXLINELEN];
1.20 xsa 143:
1.46 joris 144: cvs_log(LP_TRACE, "cvs_remove_local(%s)", cf->file_path);
1.20 xsa 145:
1.46 joris 146: if (cf->file_type == CVS_DIR) {
1.19 xsa 147: if (verbosity > 1)
1.46 joris 148: cvs_log(LP_NOTICE, "Removing %s", cf->file_path);
149: return;
1.19 xsa 150: }
151:
1.73 joris 152: if (cvs_cmdop != CVS_OP_CHECKOUT && cvs_cmdop != CVS_OP_UPDATE)
153: cvs_file_classify(cf, cvs_directory_tag);
1.51 joris 154:
155: if (cf->file_status == FILE_UNKNOWN) {
156: if (verbosity > 1)
157: cvs_log(LP_NOTICE, "nothing known about '%s'",
158: cf->file_path);
159: return;
1.20 xsa 160: }
161:
1.80 joris 162: if (cf->file_flags & FILE_ON_DISK) {
1.46 joris 163: if (verbosity > 1)
164: cvs_log(LP_ERR, "file `%s' still in working directory",
165: cf->file_name);
1.20 xsa 166: existing++;
167: } else {
1.58 joris 168: switch (cf->file_status) {
1.61 joris 169: case FILE_REMOVE_ENTRY:
1.46 joris 170: entlist = cvs_ent_open(cf->file_wd);
171: cvs_ent_remove(entlist, cf->file_name);
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,
1.79 ragge 204: cf->file_ent->ce_opts ?
205: cf->file_ent->ce_opts : "", sticky, 0, 1,
1.72 xsa 206: entry, CVS_ENT_MAXLINELEN);
1.46 joris 207:
1.58 joris 208: if (cvs_server_active == 1) {
209: cvs_server_update_entry("Checked-in", cf);
210: cvs_remote_output(entry);
211: } else {
212: entlist = cvs_ent_open(cf->file_wd);
213: cvs_ent_add(entlist, entry);
214: }
1.46 joris 215:
1.83 ! nicm 216: free(entry);
1.46 joris 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