diff options
Diffstat (limited to 'pkgtools/mtree/files/verify.c')
| -rw-r--r-- | pkgtools/mtree/files/verify.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgtools/mtree/files/verify.c b/pkgtools/mtree/files/verify.c index 0f233468be3..ade36f92b8a 100644 --- a/pkgtools/mtree/files/verify.c +++ b/pkgtools/mtree/files/verify.c @@ -1,4 +1,4 @@ -/* $NetBSD: verify.c,v 1.3 2004/04/16 23:43:36 heinz Exp $ */ +/* $NetBSD: verify.c,v 1.4 2004/08/21 04:10:45 jlam Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -32,6 +32,10 @@ #if HAVE_CONFIG_H #include "config.h" #endif +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #include <nbcompat.h> #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> @@ -40,7 +44,7 @@ #if 0 static char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: verify.c,v 1.3 2004/04/16 23:43:36 heinz Exp $"); +__RCSID("$NetBSD: verify.c,v 1.4 2004/08/21 04:10:45 jlam Exp $"); #endif #endif /* not lint */ @@ -51,7 +55,7 @@ __RCSID("$NetBSD: verify.c,v 1.3 2004/04/16 23:43:36 heinz Exp $"); #include <sys/stat.h> #endif -#if !HAVE_CONFIG_H +#if ! HAVE_NBTOOL_CONFIG_H #if HAVE_DIRENT_H #include <dirent.h> #endif @@ -211,7 +215,7 @@ miss(NODE *p, char *tail) create = 0; if (!(p->flags & F_VISIT) && uflag) { - if (Wflag || p->type == F_LINK) + if (mtree_Wflag || p->type == F_LINK) goto createit; if (!(p->flags & (F_UID | F_UNAME))) printf( @@ -227,7 +231,7 @@ miss(NODE *p, char *tail) switch (p->type) { case F_BLOCK: case F_CHAR: - if (Wflag) + if (mtree_Wflag) continue; if (!(p->flags & F_DEV)) printf( @@ -278,7 +282,7 @@ miss(NODE *p, char *tail) } else putchar('\n'); - if (!create || Wflag) + if (!create || mtree_Wflag) continue; if ((p->flags & (F_UID | F_UNAME)) && (p->flags & (F_GID | F_GNAME)) && |