From 8ccc1f551a2f70bbd55383f71bc9d7654a476ed9 Mon Sep 17 00:00:00 2001 From: millert Date: Wed, 15 Jun 2005 18:44:01 +0000 Subject: bye bye whiteouts --- usr.bin/diff/diffdir.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'usr.bin/diff/diffdir.c') diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 771052243fb..764cd9d535a 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diffdir.c,v 1.29 2004/11/26 20:09:56 otto Exp $ */ +/* $OpenBSD: diffdir.c,v 1.30 2005/06/15 18:44:01 millert Exp $ */ /* * Copyright (c) 2003 Todd C. Miller @@ -21,7 +21,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.29 2004/11/26 20:09:56 otto Exp $"; +static const char rcsid[] = "$OpenBSD: diffdir.c,v 1.30 2005/06/15 18:44:01 millert Exp $"; #endif /* not lint */ #include @@ -219,7 +219,7 @@ slurpdir(char *path, char **bufp, int enoentok) */ for (entries = 0, cp = buf; cp < ebuf; ) { dp = (struct dirent *)cp; - if (dp->d_fileno != 0 && dp->d_type != DT_WHT) + if (dp->d_fileno != 0) entries++; if (dp->d_reclen <= 0) break; @@ -228,8 +228,7 @@ slurpdir(char *path, char **bufp, int enoentok) 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)) { + if (dp->d_fileno != 0 && !excluded(dp->d_name)) { dp->d_status = 0; dirlist[entries++] = dp; } -- cgit v1.2.3-59-g8ed1b