===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/repository.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/cvs/repository.c	2009/02/21 13:44:18	1.21
--- src/usr.bin/cvs/repository.c	2009/03/26 22:54:37	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: repository.c,v 1.21 2009/02/21 13:44:18 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: repository.c,v 1.22 2009/03/26 22:54:37 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 157,164 ****
  			}
  		}
  
! 		if (!(flags & REPOSITORY_DODIRS) && type == CVS_DIR)
! 			continue;
  
  		switch (type) {
  		case CVS_DIR:
--- 157,166 ----
  			}
  		}
  
! 		if (!(flags & REPOSITORY_DODIRS) && type == CVS_DIR) {
! 			if (strcmp(dp->d_name, CVS_PATH_ATTIC))
! 				continue;
! 		}
  
  		switch (type) {
  		case CVS_DIR:
***************
*** 166,172 ****
  				cvs_repository_getdir(rpath, wdir, fl, dl,
  				    REPOSITORY_IS_ATTIC);
  			} else {
! 				cvs_file_get(fpath, 0, dl);
  			}
  			break;
  		case CVS_FILE:
--- 168,174 ----
  				cvs_repository_getdir(rpath, wdir, fl, dl,
  				    REPOSITORY_IS_ATTIC);
  			} else {
! 				cvs_file_get(fpath, 0, dl, CVS_DIR);
  			}
  			break;
  		case CVS_FILE:
***************
*** 175,181 ****
  				*s = '\0';
  				cvs_file_get(fpath, 
  				    (flags & REPOSITORY_IS_ATTIC) ?
! 				    FILE_INSIDE_ATTIC : 0, fl);
  			}
  			break;
  		default:
--- 177,183 ----
  				*s = '\0';
  				cvs_file_get(fpath, 
  				    (flags & REPOSITORY_IS_ATTIC) ?
! 				    FILE_INSIDE_ATTIC : 0, fl, CVS_FILE);
  			}
  			break;
  		default: