From owner-p4-projects@FreeBSD.ORG  Thu May 13 17:40:41 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A52E1065677; Thu, 13 May 2010 17:40:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3C6A1065670
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 17:40:40 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C18988FC15
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 17:40:40 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4DHeeAK045817
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 17:40:40 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DHeeQb045815
	for perforce@freebsd.org; Thu, 13 May 2010 17:40:40 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 17:40:40 GMT
Message-Id: <201005131740.o4DHeeQb045815@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178213 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 May 2010 17:40:41 -0000

http://p4web.freebsd.org/@@178213?ac=10

Change 178213 by gcooper@starr-bastion on 2010/05/13 17:40:01

	
	Avoid potential issues if the API contract with libarchive changes someday
	with the -X code that was ported over by first ensuring that
	matching == NULL or != NULL.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#22 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#22 (text+ko) ====

@@ -578,7 +578,9 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-			if (lafe_excluded(match_patterns, destfile) == 0)
+			/* Exclude the file according to the */
+			if (match_patterns != NULL &&
+			    lafe_excluded(match_patterns, destfile) == 0)
 	 			ADD_FILE(srcfile, destfile,
 				    archive_entry_open_flags);