===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/history.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/cvs/history.c	2005/04/12 14:58:40	1.13
--- src/usr.bin/cvs/history.c	2005/05/24 04:12:25	1.14
***************
*** 1,4 ****
! /*	$OpenBSD: history.c,v 1.13 2005/04/12 14:58:40 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: history.c,v 1.14 2005/05/24 04:12:25 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 53,72 ****
  
  #define CVS_HF_EXCL (CVS_HF_C|CVS_HF_E|CVS_HF_M|CVS_HF_O|CVS_HF_T|CVS_HF_X)
  
! static void  cvs_history_print  (struct cvs_hent *);
! int cvs_history_options(char *, int, char **, int *);
! int cvs_history_sendflags(struct cvsroot *);
  
  extern char *__progname;
  
! struct cvs_cmd_info cvs_history = {
! 	cvs_history_options,
! 	cvs_history_sendflags,
  	NULL,
  	NULL,
  	NULL,
! 	0,
! 	CVS_REQ_HISTORY,
  	CVS_CMD_SENDDIR
  };
  
--- 53,78 ----
  
  #define CVS_HF_EXCL (CVS_HF_C|CVS_HF_E|CVS_HF_M|CVS_HF_O|CVS_HF_T|CVS_HF_X)
  
! static int  cvs_history_init      (struct cvs_cmd *, int, char **, int *);
! static void cvs_history_print     (struct cvs_hent *);
! static int  cvs_history_pre_exec (struct cvsroot *);
  
  extern char *__progname;
  
! struct cvs_cmd cvs_cmd_history = {
! 	CVS_OP_HISTORY, CVS_REQ_HISTORY, "history",
! 	{ "hi", "his" },
! 	"Show repository access history",
! 	"",
! 	"acelm:oTt:u:wx:z:",
  	NULL,
+ 	0,
+ 	cvs_history_init,
+ 	cvs_history_pre_exec,
  	NULL,
  	NULL,
! 	NULL,
! 	NULL,
  	CVS_CMD_SENDDIR
  };
  
***************
*** 78,89 ****
  static u_int rep = 0;
  static char *modules[CVS_HISTORY_MAXMOD];
  
! int
! cvs_history_options(char *opt, int argc, char **argv, int *arg)
  {
  	int ch;
  
! 	while ((ch = getopt(argc, argv, opt)) != -1) {
  		switch (ch) {
  		case 'a':
  			flags |= CVS_HF_A;
--- 84,95 ----
  static u_int rep = 0;
  static char *modules[CVS_HISTORY_MAXMOD];
  
! static int
! cvs_history_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)
  {
  	int ch;
  
! 	while ((ch = getopt(argc, argv, cmd->cmd_opts)) != -1) {
  		switch (ch) {
  		case 'a':
  			flags |= CVS_HF_A;
***************
*** 147,154 ****
  	return (0);
  }
  
! int
! cvs_history_sendflags(struct cvsroot *root)
  {
  
  	if ((flags & CVS_HF_C) && (cvs_sendarg(root, "-c", 0) < 0))
--- 153,160 ----
  	return (0);
  }
  
! static int
! cvs_history_pre_exec(struct cvsroot *root)
  {
  
  	if ((flags & CVS_HF_C) && (cvs_sendarg(root, "-c", 0) < 0))