aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1998-06-10 06:45:08 +0000
committerPeter Wemm <peter@FreeBSD.org>1998-06-10 06:45:08 +0000
commit573761ee0eb18ff5f364476a04255afdb440f1d9 (patch)
tree555e32a6fd9506cc05d6d0f057d793df11385f4d
parent7a204420d347652842695bd5414595da449db218 (diff)
Notes
-rw-r--r--usr.sbin/mtree/mtree.87
-rw-r--r--usr.sbin/mtree/verify.c4
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index 0d1865515c0b..9d89809fcc02 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)mtree.8 8.2 (Berkeley) 12/11/93
-.\" $Id: mtree.8,v 1.11 1997/10/01 06:30:01 charnier Exp $
+.\" $Id: mtree.8,v 1.12 1998/06/05 14:43:40 peter Exp $
.\"
.Dd February 9, 1995
.Dt MTREE 8
@@ -137,9 +137,6 @@ Ignore any file hierarchy below this file.
The file group as a numeric value.
.It Cm gname
The file group as a symbolic name.
-.It Cm nochange
-Make sure this file or directory exists but otherwise ignore all attributes.
-Ignore any hierarchy below this path.
.It Cm md5digest
The MD5 message digest of the file.
.It Cm mode
@@ -147,6 +144,8 @@ The current file's permissions as a numeric (octal) or symbolic
value.
.It Cm nlink
The number of hard links the file is expected to have.
+.It Cm nochange
+Make sure this file or directory exists but otherwise ignore all attributes.
.It Cm uid
The file owner as a numeric value.
.It Cm uname
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 09b27e729516..a20fc0bff5c4 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: verify.c,v 1.5 1997/10/01 06:30:02 charnier Exp $";
+ "$Id: verify.c,v 1.6 1998/06/05 14:43:42 peter Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -120,7 +120,7 @@ vwalk()
if ((ep->flags & F_NOCHANGE) == 0 &&
compare(ep->name, ep, p))
rval = MISMATCHEXIT;
- if (ep->flags & (F_IGN | F_NOCHANGE))
+ if (ep->flags & F_IGN)
(void)fts_set(t, p, FTS_SKIP);
else if (ep->child && ep->type == F_DIR &&
p->fts_info == FTS_D) {