===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/config.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/cvs/config.c	2006/06/16 14:07:42	1.4
--- src/usr.bin/cvs/config.c	2006/12/04 09:51:21	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: config.c,v 1.4 2006/06/16 14:07:42 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: config.c,v 1.5 2006/12/04 09:51:21 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 25,31 ****
  void
  cvs_parse_configfile(void)
  {
- 	int i;
  	FILE *fp;
  	size_t len;
  	struct rlimit rl;
--- 25,30 ----
***************
*** 34,43 ****
  
  	cvs_log(LP_TRACE, "cvs_parse_configfile()");
  
! 	i = snprintf(fpath, sizeof(fpath), "%s/%s", current_cvsroot->cr_dir,
! 	    CVS_PATH_CONFIG);
! 	if (i == -1 || i >= (int)sizeof(fpath))
! 		fatal("cvs_parse_configfile: overflow");
  
  	if ((fp = fopen(fpath, "r")) == NULL)
  		fatal("cvs_config_parse: %s: %s",
--- 33,41 ----
  
  	cvs_log(LP_TRACE, "cvs_parse_configfile()");
  
! 	if (cvs_path_cat(current_cvsroot->cr_dir, CVS_PATH_CONFIG,
! 	    fpath, sizeof(fpath)) >= sizeof(fpath))
! 		fatal("cvs_parse_configfile: truncation");
  
  	if ((fp = fopen(fpath, "r")) == NULL)
  		fatal("cvs_config_parse: %s: %s",