===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -c -r1.116 -r1.117
*** src/usr.bin/rcs/rcsprog.c	2006/04/25 13:55:49	1.116
--- src/usr.bin/rcs/rcsprog.c	2006/04/26 02:55:13	1.117
***************
*** 1,4 ****
! /*	$OpenBSD: rcsprog.c,v 1.116 2006/04/25 13:55:49 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsprog.c,v 1.117 2006/04/26 02:55:13 joris Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 54,60 ****
  	{ "ident",	ident_main,	ident_usage	},
  };
  
! struct cvs_wklhead rcs_temp_files;
  
  void sighdlr(int);
  static void  rcs_attach_symbol(RCSFILE *, const char *);
--- 54,60 ----
  	{ "ident",	ident_main,	ident_usage	},
  };
  
! struct rcs_wklhead rcs_temp_files;
  
  void sighdlr(int);
  static void  rcs_attach_symbol(RCSFILE *, const char *);
***************
*** 63,69 ****
  void
  sighdlr(int sig)
  {
! 	cvs_worklist_clean(&rcs_temp_files, cvs_worklist_unlink);
  	_exit(1);
  }
  
--- 63,69 ----
  void
  sighdlr(int sig)
  {
! 	rcs_worklist_clean(&rcs_temp_files, rcs_worklist_unlink);
  	_exit(1);
  }
  
***************
*** 148,154 ****
  		}
  
  	/* clean up temporary files */
! 	cvs_worklist_run(&rcs_temp_files, cvs_worklist_unlink);
  
  	exit(ret);
  	/* NOTREACHED */
--- 148,154 ----
  		}
  
  	/* clean up temporary files */
! 	rcs_worklist_run(&rcs_temp_files, rcs_worklist_unlink);
  
  	exit(ret);
  	/* NOTREACHED */
***************
*** 359,384 ****
  
  		/* entries to add to the access list */
  		if (alist != NULL) {
! 			struct cvs_argvector *aargv;
  
! 			aargv = cvs_strsplit(alist, ",");
  			for (j = 0; aargv->argv[j] != NULL; j++)
  				rcs_access_add(file, aargv->argv[j]);
  
! 			cvs_argv_destroy(aargv);
  		}
  
  		if (comment != NULL)
  			rcs_comment_set(file, comment);
  
  		if (elist != NULL) {
! 			struct cvs_argvector *eargv;
  
! 			eargv = cvs_strsplit(elist, ",");
  			for (j = 0; eargv->argv[j] != NULL; j++)
  				rcs_access_remove(file, eargv->argv[j]);
  
! 			cvs_argv_destroy(eargv);
  		} else if (rcsflags & RCSPROG_EFLAG) {
  			struct rcs_access *rap;
  
--- 359,384 ----
  
  		/* entries to add to the access list */
  		if (alist != NULL) {
! 			struct rcs_argvector *aargv;
  
! 			aargv = rcs_strsplit(alist, ",");
  			for (j = 0; aargv->argv[j] != NULL; j++)
  				rcs_access_add(file, aargv->argv[j]);
  
! 			rcs_argv_destroy(aargv);
  		}
  
  		if (comment != NULL)
  			rcs_comment_set(file, comment);
  
  		if (elist != NULL) {
! 			struct rcs_argvector *eargv;
  
! 			eargv = rcs_strsplit(elist, ",");
  			for (j = 0; eargv->argv[j] != NULL; j++)
  				rcs_access_remove(file, eargv->argv[j]);
  
! 			rcs_argv_destroy(eargv);
  		} else if (rcsflags & RCSPROG_EFLAG) {
  			struct rcs_access *rap;