===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/edit.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/cvs/edit.c	2007/01/05 07:13:49	1.17
--- src/usr.bin/cvs/edit.c	2007/01/05 08:37:55	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: edit.c,v 1.17 2007/01/05 07:13:49 xsa Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: edit.c,v 1.18 2007/01/05 08:37:55 xsa Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org>
   *
***************
*** 21,29 ****
--- 21,47 ----
  #include "log.h"
  #include "remote.h"
  
+ #define E_COMMIT	0x01
+ #define E_EDIT		0x02
+ #define E_UNEDIT	0x04
+ #define E_ALL		(E_EDIT|E_COMMIT|E_UNEDIT)
+ 
+ static void	cvs_edit_local(struct cvs_file *);
  static void	cvs_editors_local(struct cvs_file *);
  static void	cvs_unedit_local(struct cvs_file *);
  
+ static int	edit_aflags = 0;
+ 
+ struct cvs_cmd cvs_cmd_edit = {
+ 	CVS_OP_EDIT, 0, "edit",
+ 	{ },
+ 	"Get ready to edit a watched file",
+ 	"[-lR] [-a action] [file ...]",
+ 	"a:lR",
+ 	NULL,
+ 	cvs_edit
+ };
+ 
  struct cvs_cmd cvs_cmd_editors = {
  	CVS_OP_EDITORS, 0, "editors",
  	{ },
***************
*** 45,50 ****
--- 63,138 ----
  };
  
  int
+ cvs_edit(int argc, char **argv)
+ {
+ 	int ch;
+ 	int flags;
+ 	struct cvs_recursion cr;
+ 
+ 	flags = CR_RECURSE_DIRS;
+ 
+ 	while ((ch = getopt(argc, argv, cvs_cmd_edit.cmd_opts)) != -1) {
+ 		switch (ch) {
+ 		case 'a':
+ 			if (strcmp(optarg, "edit") == 0)
+ 				edit_aflags |= E_EDIT;
+ 			else if (strcmp(optarg, "unedit") == 0)
+ 				edit_aflags |= E_UNEDIT;
+ 			else if (strcmp(optarg, "commit") == 0)
+ 				edit_aflags |= E_COMMIT;
+ 			else if (strcmp(optarg, "all") == 0)
+ 				edit_aflags |= E_ALL;
+ 			else if (strcmp(optarg, "none") == 0)
+ 				edit_aflags &= ~E_ALL;
+ 			else
+ 				fatal("%s", cvs_cmd_edit.cmd_synopsis);
+ 			break;
+ 		case 'l':
+ 			flags &= ~CR_RECURSE_DIRS;
+ 			break;
+ 		case 'R':
+ 			break;
+ 		default:
+ 			fatal("%s", cvs_cmd_edit.cmd_synopsis);
+ 		}
+ 	}
+ 
+ 	argc -= optind;
+ 	argv += optind;
+ 
+ 	if (argc == 0)
+ 		fatal("%s", cvs_cmd_edit.cmd_synopsis);
+ 
+ 	if (edit_aflags == 0)
+ 		edit_aflags |= E_ALL;
+ 
+ 	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_edit_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("edit");
+ 		cvs_client_get_responses();
+ 	}
+ 
+ 	return (0);
+ }
+ 
+ int
  cvs_editors(int argc, char **argv)
  {
  	int ch;
***************
*** 148,153 ****
--- 236,291 ----
  	}
  
  	return (0);
+ }
+ 
+ static void
+ cvs_edit_local(struct cvs_file *cf)
+ {
+ 	FILE *fp;
+ 	struct tm *t;
+ 	time_t now;
+ 	char *bfpath, *fdate;
+ 
+ 	if (cvs_noexec == 1)
+ 		return;
+ 
+ 	if ((fp = fopen(CVS_PATH_NOTIFY, "a")) == NULL)
+ 		fatal("cvs_edit_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, "E%s\t%s GMT\t%s\t%s\t\n",
+ 	    cf->file_name, fdate, current_cvsroot->cr_host, cf->file_wd);
+ 
+ 	if (edit_aflags & E_EDIT)
+ 		(void)fprintf(fp, "E");
+ 	if (edit_aflags & E_UNEDIT)
+ 		(void)fprintf(fp, "U");
+ 	if (edit_aflags & E_COMMIT)
+ 		(void)fprintf(fp, "C");
+ 
+ 	(void)fprintf(fp, "\n");
+ 
+ 	(void)fclose(fp);
+ 
+ 	if (fchmod(cf->fd, 0644) == -1)
+ 		fatal("cvs_edit_local: fchmod %s", strerror(errno));
+ 
+ 	bfpath = xmalloc(MAXPATHLEN);
+ 	if (cvs_path_cat(CVS_PATH_BASEDIR, cf->file_name, bfpath,
+ 	    MAXPATHLEN) >= MAXPATHLEN)
+ 		fatal("cvs_edit_local: truncation");
+ 
+ 	/* XXX: copy cf->file_path to bfpath */
+ 
+ 	xfree(bfpath);
+ 
+ 	/* XXX: Update revision number in CVS/Baserev from CVS/Entries */
  }
  
  static void