===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/repository.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/cvs/repository.c	2008/03/09 03:14:52	1.20
--- src/usr.bin/cvs/repository.c	2009/02/21 13:44:18	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: repository.c,v 1.20 2008/03/09 03:14:52 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: repository.c,v 1.21 2009/02/21 13:44:18 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 96,102 ****
  
  void
  cvs_repository_getdir(const char *dir, const char *wdir,
! 	struct cvs_flisthead *fl, struct cvs_flisthead *dl, int dodirs)
  {
  	int type;
  	DIR *dirp;
--- 96,102 ----
  
  void
  cvs_repository_getdir(const char *dir, const char *wdir,
! 	struct cvs_flisthead *fl, struct cvs_flisthead *dl, int flags)
  {
  	int type;
  	DIR *dirp;
***************
*** 157,177 ****
  			}
  		}
  
! 		if (dodirs == 0 && type == CVS_DIR)
  			continue;
  
  		switch (type) {
  		case CVS_DIR:
! 			if (!strcmp(dp->d_name, CVS_PATH_ATTIC))
! 				cvs_repository_getdir(rpath, wdir, fl, dl, 0);
! 			else
  				cvs_file_get(fpath, 0, dl);
  			break;
  		case CVS_FILE:
  			if ((s = strrchr(fpath, ',')) != NULL &&
  			    s != fpath && !strcmp(s, RCS_FILE_EXT)) {
  				*s = '\0';
! 				cvs_file_get(fpath, 0, fl);
  			}
  			break;
  		default:
--- 157,181 ----
  			}
  		}
  
! 		if (!(flags & REPOSITORY_DODIRS) && type == CVS_DIR)
  			continue;
  
  		switch (type) {
  		case CVS_DIR:
! 			if (!strcmp(dp->d_name, CVS_PATH_ATTIC)) {
! 				cvs_repository_getdir(rpath, wdir, fl, dl,
! 				    REPOSITORY_IS_ATTIC);
! 			} else {
  				cvs_file_get(fpath, 0, dl);
+ 			}
  			break;
  		case CVS_FILE:
  			if ((s = strrchr(fpath, ',')) != NULL &&
  			    s != fpath && !strcmp(s, RCS_FILE_EXT)) {
  				*s = '\0';
! 				cvs_file_get(fpath, 
! 				    (flags & REPOSITORY_IS_ATTIC) ?
! 				    FILE_INSIDE_ATTIC : 0, fl);
  			}
  			break;
  		default: