===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -c -r1.98 -r1.99
*** src/usr.bin/cvs/file.c	2005/07/18 01:02:20	1.98
--- src/usr.bin/cvs/file.c	2005/07/22 16:27:29	1.99
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.98 2005/07/18 01:02:20 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.99 2005/07/22 16:27:29 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 550,556 ****
  		}
  
  		SIMPLEQ_FOREACH(sf, &(cf->cf_files), cf_list)
! 			if (cvs_file_cmpname(pp, CVS_FILE_NAME(sf)) == 0)
  				break;
  		if (sf == NULL)
  			return (NULL);
--- 550,556 ----
  		}
  
  		SIMPLEQ_FOREACH(sf, &(cf->cf_files), cf_list)
! 			if (cvs_file_cmpname(pp, sf->cf_name) == 0)
  				break;
  		if (sf == NULL)
  			return (NULL);
***************
*** 584,590 ****
  
  	/* find the top node */
  	for (top = file; (top != NULL) && (i > 0); top = top->cf_parent) {
! 		fp = CVS_FILE_NAME(top);
  
  		/* skip self-references */
  		if ((fp[0] == '.') && (fp[1] == '\0'))
--- 584,590 ----
  
  	/* find the top node */
  	for (top = file; (top != NULL) && (i > 0); top = top->cf_parent) {
! 		fp = top->cf_name;
  
  		/* skip self-references */
  		if ((fp[0] == '.') && (fp[1] == '\0'))
***************
*** 886,892 ****
  			cfp->cf_flags &= ~CVS_GDIR_IGNORE;
  
  		if (cvs_file_getdir(cfp, flags, np, cb, arg) < 0) {
! 			cvs_log(LP_ERR, "failed to get %s", CVS_FILE_NAME(cfp));
  			continue;
  		}
  	}
--- 886,892 ----
  			cfp->cf_flags &= ~CVS_GDIR_IGNORE;
  
  		if (cvs_file_getdir(cfp, flags, np, cb, arg) < 0) {
! 			cvs_log(LP_ERR, "failed to get %s", cfp->cf_name);
  			continue;
  		}
  	}
***************
*** 1020,1026 ****
  	const CVSFILE *cf1, *cf2;
  	cf1 = *(CVSFILE * const *)f1;
  	cf2 = *(CVSFILE * const *)f2;
! 	return cvs_file_cmpname(CVS_FILE_NAME(cf1), CVS_FILE_NAME(cf2));
  }
  
  
--- 1020,1026 ----
  	const CVSFILE *cf1, *cf2;
  	cf1 = *(CVSFILE * const *)f1;
  	cf2 = *(CVSFILE * const *)f2;
! 	return cvs_file_cmpname(cf1->cf_name, cf2->cf_name);
  }