From owner-p4-projects@FreeBSD.ORG Wed May 12 00:00:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F68A106567D; Wed, 12 May 2010 00:00:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D4AB1065679 for ; Wed, 12 May 2010 00:00:27 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 12F388FC25 for ; Wed, 12 May 2010 00:00:27 +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 o4C00QIp094701 for ; Wed, 12 May 2010 00:00:26 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4C00QrL094699 for perforce@freebsd.org; Wed, 12 May 2010 00:00:26 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 May 2010 00:00:26 GMT Message-Id: <201005120000.o4C00QrL094699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2010 00:00:27 -0000 http://p4web.freebsd.org/@@178128?ac=10 Change 178128 by gcooper@starr-bastion on 2010/05/11 23:59:48 Push tar-like -X support into pkg_create(8) again. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#5 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#16 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_bsdtar_platform.h#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_config.h#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_line_reader.c#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_line_reader.h#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_matching.c#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_matching.h#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_pathmatch.c#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_pathmatch.h#1 add Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#5 (text+ko) ==== @@ -3,6 +3,8 @@ PROG= pkg_create SRCS= main.c perform.c pl.c +SRCS+= tar_line_reader.c tar_matching.c tar_pathmatch.c + WARNS?= 3 WFORMAT?= 1 ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#16 (text+ko) ==== @@ -19,8 +19,9 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.85 2010/04/23 11:07:43 flz Exp $"); +__FBSDID("$FreeBSD$"); +/* XXX (gcooper): needs to come before sys/stat.h for stat(2). */ #include #include #include @@ -36,6 +37,7 @@ #include #include +#include "tar_matching.h" #include #include "create.h" @@ -374,6 +376,7 @@ struct stat *sb; struct archive *archive = NULL; struct archive_entry *entry = NULL; + struct lafe_matching *match_patterns = NULL; char *destbase = NULL; char *destfile = NULL; char *prefix = NULL; @@ -432,6 +435,20 @@ error = archive_error_string(archive); else { + /* + * XXX (gcooper): replace these bits with a proper callback + * via archive(3) when the time rolls around. + */ + if (ExcludeFrom != NULL) { + if (lafe_exclude_from_file(&match_patterns, + ExcludeFrom) < 0) + error = strerror(EINVAL); + } + + } + + if (error == NULL) { + switch(Zipper) { case BZIP2: cname = "bzipp"; @@ -465,14 +482,6 @@ error = archive_error_string(archive); if (error != NULL) { -#ifdef NOTYET - /* - * XXX (gcooper): Need to fill bits for the exclude - * stuff - */ - if (ExcludeFrom != NULL) ; -#endif - if (Verbose) printf("Creating %sed tar ball in '%s'\n", cname, tball); @@ -544,7 +553,9 @@ PATH_MAX) error = strerror(ENAMETOOLONG); - ADD_FILE(srcfile, destfile, archive_entry_open_flags); + if (lafe_excluded(match_patterns, srcfile) != 0) + ADD_FILE(srcfile, destfile, + archive_entry_open_flags); break; @@ -683,16 +694,11 @@ warn("%s: failed to remove incomplete package - '%s'", __func__, tball); } - if (destbase != NULL) - free(destbase); - if (destfile != NULL) - free(destfile); - if (srcbase != NULL) - free(srcbase); - if (srcfile != NULL) - free(srcfile); - if (destfile != NULL) - free(destfile); + free(destbase); + free(destfile); + free(srcbase); + free(srcfile); + free(destfile); }