diff options
| -rw-r--r-- | usr.bin/cvs/edit.c | 113 |
1 files changed, 111 insertions, 2 deletions
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index 0a753edf1cd..27783c7e946 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,6 +1,6 @@ -/* $OpenBSD: edit.c,v 1.14 2007/01/02 13:51:13 xsa Exp $ */ +/* $OpenBSD: edit.c,v 1.15 2007/01/02 14:51:18 xsa Exp $ */ /* - * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> + * Copyright (c) 2006, 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 @@ -22,6 +22,7 @@ #include "remote.h" static void cvs_editors_local(struct cvs_file *); +static void cvs_unedit_local(struct cvs_file *); struct cvs_cmd cvs_cmd_editors = { CVS_OP_EDITORS, 0, "editors", @@ -33,6 +34,16 @@ struct cvs_cmd cvs_cmd_editors = { cvs_editors }; +struct cvs_cmd cvs_cmd_unedit = { + CVS_OP_UNEDIT, 0, "unedit", + { }, + "Undo an edit command", + "[-lR] [file ...]", + "lR", + NULL, + cvs_unedit +}; + int cvs_editors(int argc, char **argv) { @@ -86,7 +97,105 @@ cvs_editors(int argc, char **argv) return (0); } +int +cvs_unedit(int argc, char **argv) +{ + int ch; + int flags; + struct cvs_recursion cr; + + flags = CR_RECURSE_DIRS; + + while ((ch = getopt(argc, argv, cvs_cmd_unedit.cmd_opts)) != -1) { + switch (ch) { + case 'l': + flags &= ~CR_RECURSE_DIRS; + break; + case 'R': + break; + default: + fatal("%s", cvs_cmd_unedit.cmd_synopsis); + } + } + + argc -= optind; + argv += optind; + + if (argc == 0) + fatal("%s", cvs_cmd_unedit.cmd_synopsis); + + cr.enterdir = NULL; + cr.leavedir = NULL; + + if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { + cr.fileproc = cvs_client_sendfile; + + if (!(flags & CR_RECURSE_DIRS)) + cvs_client_send_request("Argument -l"); + } else { + cr.fileproc = cvs_unedit_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("unedit"); + cvs_client_get_responses(); + } + + return (0); +} + static void cvs_editors_local(struct cvs_file *cf) { } + +static void +cvs_unedit_local(struct cvs_file *cf) +{ + FILE *fp; + struct stat st; + struct tm *t; + time_t now; + char *bfpath, *fdate; + + if (cvs_noexec == 1) + return; + + bfpath = xmalloc(MAXPATHLEN); + if (cvs_path_cat(CVS_PATH_BASEDIR, cf->file_name, bfpath, + MAXPATHLEN) >= MAXPATHLEN) + fatal("cvs_unedit_local: truncation"); + + if (stat(bfpath, &st) == -1) { + xfree(bfpath); + return; + } + + /* XXX: compare cf->file_path and bfpath */ + + cvs_rename(bfpath, cf->file_path); + xfree(bfpath); + + if ((fp = fopen(CVS_PATH_NOTIFY, "a")) == NULL) + fatal("cvs_unedit_local: fopen: `%s': %s", + CVS_PATH_NOTIFY, strerror(errno)); + + (void)time(&now); + if ((t = gmtime(&now)) == NULL) + fatal("gmtime failed"); + + fdate = asctime(t); + + (void)fprintf(fp, "U%s\t%s GMT\t%s\t%s\t\n", + cf->file_name, fdate, current_cvsroot->cr_host, cf->file_wd); + + (void)fclose(fp); + + /* XXX: Update revision number in CVS/Entries from CVS/Baserev */ +} |