===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/tag.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/cvs/tag.c	2005/04/16 20:31:18	1.12
--- src/usr.bin/cvs/tag.c	2005/04/18 21:02:50	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: tag.c,v 1.12 2005/04/16 20:31:18 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tag.c,v 1.13 2005/04/18 21:02:50 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
***************
*** 158,164 ****
  	int ret, l;
  	char *repo, fpath[MAXPATHLEN], rcspath[MAXPATHLEN];
  	RCSFILE *rf;
- 	struct cvs_ent *entp;
  	struct cvsroot *root;
  
  	ret = 0;
--- 158,163 ----
***************
*** 172,182 ****
  	}
  
  	cvs_file_getpath(cfp, fpath, sizeof(fpath));
- 	entp = cvs_ent_getent(fpath);
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if ((entp != NULL) && (cvs_sendentry(root, entp) < 0)) {
! 			cvs_ent_free(entp);
  			return (CVS_EX_PROTO);
  		}
  
--- 171,179 ----
  	}
  
  	cvs_file_getpath(cfp, fpath, sizeof(fpath));
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if (cvs_sendentry(root, cfp) < 0) {
  			return (CVS_EX_PROTO);
  		}
  
***************
*** 201,233 ****
  			return (0);
  		}
  
! 		if (cfp->cf_parent != NULL)
! 			repo = cfp->cf_parent->cf_ddat->cd_repo;
! 		else
! 			repo = NULL;
! 
  		l = snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s",
  		    root->cr_dir, repo, CVS_FILE_NAME(cfp), RCS_FILE_EXT);
  		if (l == -1 || l >= (int)sizeof(rcspath)) {
  			errno = ENAMETOOLONG;
  			cvs_log(LP_ERRNO, "%s", rcspath);
- 
- 			cvs_ent_free(entp);
  			return (-1);
  		}
  
  		rf = rcs_open(rcspath, RCS_READ);
  		if (rf == NULL) {
- 			if (entp != NULL)
- 				cvs_ent_free(entp);
  			return (CVS_EX_DATA);
  		}
  
  		rcs_close(rf);
  	}
- 
- 	if (entp != NULL)
- 		cvs_ent_free(entp);
  
  	return (ret);
  }
--- 198,219 ----
  			return (0);
  		}
  
! 		repo = CVS_DIR_REPO(cfp);
  		l = snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s",
  		    root->cr_dir, repo, CVS_FILE_NAME(cfp), RCS_FILE_EXT);
  		if (l == -1 || l >= (int)sizeof(rcspath)) {
  			errno = ENAMETOOLONG;
  			cvs_log(LP_ERRNO, "%s", rcspath);
  			return (-1);
  		}
  
  		rf = rcs_open(rcspath, RCS_READ);
  		if (rf == NULL) {
  			return (CVS_EX_DATA);
  		}
  
  		rcs_close(rf);
  	}
  
  	return (ret);
  }