Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 May 2010 17:40:40 GMT
From:      Garrett Cooper <gcooper@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 178213 for review
Message-ID:  <201005131740.o4DHeeQb045815@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005131740.o4DHeeQb045815>