CVS commit: src/usr.sbin/mtree

[Luke Mewburn <lukem%netbsd.org@localhost>]

Module Name:    src
Committed By:   lukem
Date:           Thu Jul 22 16:51:45 UTC 2004

Modified Files:
        src/usr.sbin/mtree: compare.c extern.h mtree.8 mtree.c mtree.h spec.c
            verify.c

Log Message:
Implement -M to "merge" entries, even with different types.
This can be used in /etc/security to allow special.local to override
types of entries in special (e.g, replacing a dir with a link).

Rename Wflag to mtree_Wflag, to be more "external namespace" friendly.


To generate a diff of this commit:
cvs rdiff -r1.44 -r1.45 src/usr.sbin/mtree/compare.c
cvs rdiff -r1.28 -r1.29 src/usr.sbin/mtree/extern.h
cvs rdiff -r1.38 -r1.39 src/usr.sbin/mtree/mtree.8
cvs rdiff -r1.31 -r1.32 src/usr.sbin/mtree/mtree.c
cvs rdiff -r1.21 -r1.22 src/usr.sbin/mtree/mtree.h
cvs rdiff -r1.56 -r1.57 src/usr.sbin/mtree/spec.c
cvs rdiff -r1.37 -r1.38 src/usr.sbin/mtree/verify.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.