svn commit: r240751 - projects/mtree/contrib/mtree

[Brooks Davis]

Author: brooks
Date: Thu Sep 20 15:19:01 2012
New Revision: 240751
URL: http://svn.freebsd.org/changeset/base/240751

Log:
  Ignore the -w option for compatibility with FreeBSD's mtree.  This version
  produces the same output as FreeBSD's with -w except for not emitting
  a warning.

Modified:
  projects/mtree/contrib/mtree/mtree.8
  projects/mtree/contrib/mtree/mtree.c

Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8	Thu Sep 20 15:11:59 2012	(r240750)
+++ projects/mtree/contrib/mtree/mtree.8	Thu Sep 20 15:19:01 2012	(r240751)
@@ -295,6 +295,9 @@ is given, these flags will be reset.
 Exit with a status of 0 on success,
 2 if the file hierarchy did not match the specification, and
 1 if any other error occurred.
+.It Fl w
+Ignored for compatibility with FreeBSD versions of
+.Nm .
 .It Fl W
 Don't attempt to set various file attributes such as the
 ownership, mode, flags, or time

Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c	Thu Sep 20 15:11:59 2012	(r240750)
+++ projects/mtree/contrib/mtree/mtree.c	Thu Sep 20 15:19:01 2012	(r240751)
@@ -77,7 +77,7 @@ main(int argc, char **argv)
 	init_excludes();
 
 	while ((ch = getopt(argc, argv,
-	    "cCdDeE:f:I:ik:K:lLmMnN:p:PqrR:s:StuUWxX:"))
+	    "cCdDeE:f:I:ik:K:lLmMnN:p:PqrR:s:StuUwWxX:"))
 	    != -1) {
 		switch((char)ch) {
 		case 'c':
@@ -177,6 +177,9 @@ main(int argc, char **argv)
 		case 'U':
 			Uflag = uflag = 1;
 			break;
+		case 'w':
+			/* Ignored for compatibility with FreeBSD's mtree. */
+			break;
 		case 'W':
 			mtree_Wflag = 1;
 			break;