===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -c -r1.213 -r1.214
*** src/usr.bin/cvs/file.c	2008/02/03 15:08:04	1.213
--- src/usr.bin/cvs/file.c	2008/02/03 22:50:28	1.214
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.213 2008/02/03 15:08:04 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.214 2008/02/03 22:50:28 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 78,83 ****
--- 78,84 ----
  char *cvs_directory_tag = NULL;
  struct ignore_head cvs_ign_pats;
  struct ignore_head dir_ign_pats;
+ struct ignore_head checkout_ign_pats;
  
  void
  cvs_file_init(void)
***************
*** 88,93 ****
--- 89,95 ----
  
  	TAILQ_INIT(&cvs_ign_pats);
  	TAILQ_INIT(&dir_ign_pats);
+ 	TAILQ_INIT(&checkout_ign_pats);
  
  	/* standard patterns to ignore */
  	for (i = 0; i < (int)(sizeof(cvs_ign_std)/sizeof(char *)); i++)
***************
*** 160,165 ****
--- 162,175 ----
  	}
  
  	TAILQ_FOREACH(ip, &dir_ign_pats, ip_list) {
+ 		if (ip->ip_flags & CVS_IGN_STATIC) {
+ 			if (cvs_file_cmpname(file, ip->ip_pat) == 0)
+ 				return (1);
+ 		} else if (fnmatch(ip->ip_pat, file, flags) == 0)
+ 			return (1);
+ 	}
+ 
+ 	TAILQ_FOREACH(ip, &checkout_ign_pats, ip_list) {
  		if (ip->ip_flags & CVS_IGN_STATIC) {
  			if (cvs_file_cmpname(file, ip->ip_pat) == 0)
  				return (1);