From owner-svn-src-projects@FreeBSD.ORG Thu Sep 20 15:19:01 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C544C106566C; Thu, 20 Sep 2012 15:19:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B07578FC08; Thu, 20 Sep 2012 15:19:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8KFJ1tA042085; Thu, 20 Sep 2012 15:19:01 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8KFJ1aB042082; Thu, 20 Sep 2012 15:19:01 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201209201519.q8KFJ1aB042082@svn.freebsd.org> From: Brooks Davis Date: Thu, 20 Sep 2012 15:19:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240751 - projects/mtree/contrib/mtree X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2012 15:19:01 -0000 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;