===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/getlog.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/usr.bin/cvs/getlog.c	2005/07/11 08:44:16	1.37
--- src/usr.bin/cvs/getlog.c	2005/07/14 06:50:50	1.38
***************
*** 1,4 ****
! /*	$OpenBSD: getlog.c,v 1.37 2005/07/11 08:44:16 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: getlog.c,v 1.38 2005/07/14 06:50:50 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 203,216 ****
  static int
  cvs_getlog_local(CVSFILE *cf, void *arg)
  {
! 	int nrev, l;
  	char rcspath[MAXPATHLEN], numbuf[64];
- 	char *repo;
  	RCSFILE *rf;
  	struct rcs_sym *sym;
  	struct rcs_delta *rdp;
  	struct rcs_access *acp;
- 	struct cvsroot *root;
  
  	if (cf->cf_cvstat == CVS_FST_UNKNOWN) {
  		if (verbosity > 0)
--- 203,214 ----
  static int
  cvs_getlog_local(CVSFILE *cf, void *arg)
  {
! 	int nrev;
  	char rcspath[MAXPATHLEN], numbuf[64];
  	RCSFILE *rf;
  	struct rcs_sym *sym;
  	struct rcs_delta *rdp;
  	struct rcs_access *acp;
  
  	if (cf->cf_cvstat == CVS_FST_UNKNOWN) {
  		if (verbosity > 0)
***************
*** 225,240 ****
  	}
  
  	nrev = 0;
- 	root = CVS_DIR_ROOT(cf);
- 	repo = CVS_DIR_REPO(cf);
  
! 	l = snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s",
! 	    root->cr_dir, repo, CVS_FILE_NAME(cf), RCS_FILE_EXT);
! 	if (l == -1 || l >= (int)sizeof(rcspath)) {
! 		errno = ENAMETOOLONG;
! 		 cvs_log(LP_ERRNO, "%s", rcspath);
  		return (CVS_EX_DATA);
- 	}
  
  	if (log_rfonly) {
  		cvs_printf("%s\n", rcspath);
--- 223,231 ----
  	}
  
  	nrev = 0;
  
! 	if (cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)) == NULL)
  		return (CVS_EX_DATA);
  
  	if (log_rfonly) {
  		cvs_printf("%s\n", rcspath);