From owner-svn-src-projects@FreeBSD.ORG  Fri Sep 21 20:30:59 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 D36021065674;
	Fri, 21 Sep 2012 20:30:59 +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 BF6E68FC17;
	Fri, 21 Sep 2012 20:30:59 +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 q8LKUxeQ002392;
	Fri, 21 Sep 2012 20:30:59 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8LKUxdY002390;
	Fri, 21 Sep 2012 20:30:59 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201209212030.q8LKUxdY002390@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Sep 2012 20:30:59 +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: r240791 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Sep 2012 20:30:59 -0000

Author: brooks
Date: Fri Sep 21 20:30:59 2012
New Revision: 240791
URL: http://svn.freebsd.org/changeset/base/240791

Log:
  Don't allow "-f spec1 -f spec2" with -c, -C, -D, or -p.
  
  Obtained from:	Julian Fagir <gnrp@komkon2.de>

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

Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c	Fri Sep 21 20:14:27 2012	(r240790)
+++ projects/mtree/contrib/mtree/mtree.c	Fri Sep 21 20:30:59 2012	(r240791)
@@ -223,6 +223,13 @@ main(int argc, char **argv)
 	if (argc)
 		usage();
 
+	if (spec2 && (cflag || Cflag || Dflag))
+		mtree_err("Double -f, -c, -C and -D flags are mutually "
+		    "exclusive");
+
+	if (dir && spec2)
+		mtree_err("Double -f and -p flags are mutually exclusive");
+
 	if (dir && chdir(dir))
 		mtree_err("%s: %s", dir, strerror(errno));