===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffdir.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/diff/diffdir.c	2004/11/26 20:09:56	1.29
--- src/usr.bin/diff/diffdir.c	2005/06/15 18:44:01	1.30
***************
*** 1,4 ****
! /*	$OpenBSD: diffdir.c,v 1.29 2004/11/26 20:09:56 otto Exp $	*/
  
  /*
   * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: diffdir.c,v 1.30 2005/06/15 18:44:01 millert Exp $	*/
  
  /*
   * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 21,27 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.29 2004/11/26 20:09:56 otto Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 21,27 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.30 2005/06/15 18:44:01 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 219,225 ****
  	 */
  	for (entries = 0, cp = buf; cp < ebuf; ) {
  		dp = (struct dirent *)cp;
! 		if (dp->d_fileno != 0 && dp->d_type != DT_WHT)
  			entries++;
  		if (dp->d_reclen <= 0)
  			break;
--- 219,225 ----
  	 */
  	for (entries = 0, cp = buf; cp < ebuf; ) {
  		dp = (struct dirent *)cp;
! 		if (dp->d_fileno != 0)
  			entries++;
  		if (dp->d_reclen <= 0)
  			break;
***************
*** 228,235 ****
  	dirlist = emalloc(sizeof(struct dirent *) * (entries + 1));
  	for (entries = 0, cp = buf; cp < ebuf; ) {
  		dp = (struct dirent *)cp;
! 		if (dp->d_fileno != 0 && dp->d_type != DT_WHT &&
! 		    !excluded(dp->d_name)) {
  			dp->d_status = 0;
  			dirlist[entries++] = dp;
  		}
--- 228,234 ----
  	dirlist = emalloc(sizeof(struct dirent *) * (entries + 1));
  	for (entries = 0, cp = buf; cp < ebuf; ) {
  		dp = (struct dirent *)cp;
! 		if (dp->d_fileno != 0 && !excluded(dp->d_name)) {
  			dp->d_status = 0;
  			dirlist[entries++] = dp;
  		}