diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1998-06-05 14:43:42 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1998-06-05 14:43:42 +0000 |
| commit | 7840cfdd8b0455c86a32e3935399c006586f2178 (patch) | |
| tree | d664ee8f16f5f1feedab115265870bc5bfbd8001 /usr.sbin/mtree/verify.c | |
| parent | 3dead0b64529cf01abf19bdfb8e156489a0d8f65 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/mtree/verify.c')
| -rw-r--r-- | usr.sbin/mtree/verify.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c index 6610d3a534d8..09b27e729516 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/mtree/verify.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: verify.c,v 1.5 1997/10/01 06:30:02 charnier Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -117,9 +117,10 @@ vwalk() !fnmatch(ep->name, p->fts_name, FNM_PATHNAME)) || !strcmp(ep->name, p->fts_name)) { ep->flags |= F_VISIT; - if (compare(ep->name, ep, p)) + if ((ep->flags & F_NOCHANGE) == 0 && + compare(ep->name, ep, p)) rval = MISMATCHEXIT; - if (ep->flags & F_IGN) + if (ep->flags & (F_IGN | F_NOCHANGE)) (void)fts_set(t, p, FTS_SKIP); else if (ep->child && ep->type == F_DIR && p->fts_info == FTS_D) { @@ -174,13 +175,13 @@ miss(p, tail) create = 0; if (!(p->flags & F_VISIT) && uflag) if (!(p->flags & (F_UID | F_UNAME))) - (void)printf(" (not created: user not specified)"); + (void)printf(" (directory not created: user not specified)"); else if (!(p->flags & (F_GID | F_GNAME))) - (void)printf(" (not created: group not specified)"); + (void)printf(" (directory not created: group not specified)"); else if (!(p->flags & F_MODE)) - (void)printf(" (not created: mode not specified)"); + (void)printf(" (directory not created: mode not specified)"); else if (mkdir(path, S_IRWXU)) - (void)printf(" (not created: %s)", + (void)printf(" (directory not created: %s)", strerror(errno)); else { create = 1; |