diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/Makefile | 7 | ||||
| -rw-r--r-- | usr.bin/cvs/cmd.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.h | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/release.c | 190 |
4 files changed, 198 insertions, 6 deletions
diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile index a3e7ee6c623..7603318376e 100644 --- a/usr.bin/cvs/Makefile +++ b/usr.bin/cvs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2007/06/18 17:54:12 joris Exp $ +# $OpenBSD: Makefile,v 1.40 2007/06/26 18:02:43 xsa Exp $ PROG= opencvs MAN= cvs.1 cvs.5 cvsintro.7 @@ -7,8 +7,9 @@ CPPFLAGS+=-I${.CURDIR} SRCS= cvs.c add.c admin.c annotate.c commit.c config.c checkout.c client.c \ buf.c cmd.c date.y diff.c diff3.c diff_internals.c edit.c entries.c \ fatal.c file.c getlog.c history.c log.c logmsg.c import.c init.c \ - remove.c repository.c rcs.c rcsnum.c remote.c root.c server.c \ - status.c tag.c worklist.c util.c update.c version.c watch.c xmalloc.c + release.c remove.c repository.c rcs.c rcsnum.c remote.c root.c \ + server.c status.c tag.c worklist.c util.c update.c version.c \ + watch.c xmalloc.c CFLAGS+=-Wall CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c index 2a4f906c58b..b4074a27426 100644 --- a/usr.bin/cvs/cmd.c +++ b/usr.bin/cvs/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.59 2007/06/26 02:24:10 niallo Exp $ */ +/* $OpenBSD: cmd.c,v 1.60 2007/06/26 18:02:43 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -44,6 +44,7 @@ struct cvs_cmd *cvs_cdt[] = { &cvs_cmd_import, &cvs_cmd_init, &cvs_cmd_log, + &cvs_cmd_release, &cvs_cmd_remove, &cvs_cmd_rlog, &cvs_cmd_server, @@ -60,7 +61,6 @@ struct cvs_cmd *cvs_cdt[] = { &cvs_cmd_logout, #endif &cvs_cmd_rdiff, - &cvs_cmd_release, &cvs_cmd_rtag, &cvs_cmd_unedit, &cvs_cmd_update, diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index b444305bc7f..2bf6fa55cbf 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.136 2007/06/18 17:54:13 joris Exp $ */ +/* $OpenBSD: cvs.h,v 1.137 2007/06/26 18:02:43 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -401,6 +401,7 @@ int cvs_getlog(int, char **); int cvs_history(int, char **); int cvs_import(int, char **); int cvs_init(int, char **); +int cvs_release(int, char **); int cvs_remove(int, char **); int cvs_status(int, char **); int cvs_tag(int, char **); diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c new file mode 100644 index 00000000000..9ef8bef4357 --- /dev/null +++ b/usr.bin/cvs/release.c @@ -0,0 +1,190 @@ +/* $OpenBSD: release.c,v 1.34 2007/06/26 18:02:43 xsa Exp $ */ +/*- + * Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/stat.h> + +#include <string.h> +#include <unistd.h> + +#include "cvs.h" +#include "remote.h" + +extern char *__progname; + +void cvs_release_local(struct cvs_file *); + +static void release_check_files(struct cvs_file *); + +static int dflag = 0; +static int files_altered = 0; + +struct cvs_cmd cvs_cmd_release = { + CVS_OP_RELEASE, 0, "release", + { "re", "rel" }, + "Indicate that a Module is no longer in use", + "[-d] dir...", + "d", + NULL, + cvs_release +}; + +int +cvs_release(int argc, char **argv) +{ + int ch; + int flags; + struct cvs_recursion cr; + + flags = CR_REPO; + + while ((ch = getopt(argc, argv, cvs_cmd_release.cmd_opts)) != -1) { + switch (ch) { + case 'd': + dflag = 1; + break; + default: + fatal("%s", cvs_cmd_release.cmd_synopsis); + } + } + + argc -= optind; + argv += optind; + + if (argc == 0) + fatal("%s", cvs_cmd_release.cmd_synopsis); + + cr.enterdir = NULL; + cr.leavedir = NULL; + + if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { + cvs_client_connect_to_server(); + cr.fileproc = cvs_client_sendfile; + + if (dflag == 1) + cvs_client_send_request("Argument -d"); + } else + cr.fileproc = cvs_release_local; + + cr.flags = flags; + + cvs_file_run(argc, argv, &cr); + + if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { + cvs_client_send_files(argv, argc); + cvs_client_senddir("."); + cvs_client_send_request("release"); + cvs_client_get_responses(); + } + + return (0); +} + +void +cvs_release_local(struct cvs_file *cf) +{ + struct stat st; + struct cvs_recursion cr; + char *wdir, cwd[MAXPATHLEN]; + char *arg = "."; + int saved_noexec; + + if (cf->file_type == CVS_FILE) + return; + + cvs_log(LP_TRACE, "cvs_release_local(%s)", cf->file_path); + + cvs_file_classify(cf, NULL); + + if (cvs_server_active == 1) { + cvs_history_add(CVS_HISTORY_RELEASE, cf, NULL); + return; + } + + if ((wdir = getcwd(cwd, sizeof(cwd))) == NULL) + fatal("getcwd failed"); + + if (cf->file_type == CVS_DIR) { + if (!strcmp(cf->file_name, ".")) + return; + + /* chdir before updating the directory. */ + cvs_chdir(cf->file_path, 0); + + if (stat(CVS_PATH_CVSDIR, &st) == -1 || !S_ISDIR(st.st_mode)) { + cvs_log(LP_ERR, "no repository directory: %s", + cf->file_path); + return; + } + } + + saved_noexec = cvs_noexec; + cvs_noexec = 1; + + cr.enterdir = NULL; + cr.leavedir = NULL; + cr.fileproc = cvs_update_local; + cr.flags = CR_REPO | CR_RECURSE_DIRS; + + cvs_file_run(1, &arg, &cr); + + cvs_noexec = saved_noexec; + + cr.enterdir = NULL; + cr.leavedir = NULL; + cr.fileproc = release_check_files; + cr.flags = CR_RECURSE_DIRS; + + cvs_file_run(1, &arg, &cr); + + (void)printf("You have [%d] altered files in this repository.\n", + files_altered); + (void)printf("Are you sure you want to release %sdirectory `%s': ", + (dflag == 1) ? "(and delete) " : "", cf->file_path); + + if (cvs_yesno() == -1) { + (void)fprintf(stderr, + "** `%s' aborted by user choice.\n", cvs_command); + + /* change back to original working dir */ + cvs_chdir(wdir, 0); + + return; + } + + /* change back to original working dir */ + cvs_chdir(wdir, 0); + + if (dflag == 1) { + if (cvs_rmdir(cf->file_path) != 0) + fatal("cvs_release_local: cvs_rmdir failed"); + } +} + +static void +release_check_files(struct cvs_file *cf) +{ + cvs_log(LP_TRACE, "release_check_files(%s)", cf->file_path); + + cvs_file_classify(cf, NULL); + + if (cf->file_status == FILE_MERGE || + cf->file_status == FILE_ADDED || + cf->file_status == FILE_PATCH || + cf->file_status == FILE_CONFLICT) + files_altered++; + return; +} |