From owner-p4-projects@FreeBSD.ORG  Wed Jul 21 21:43:19 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D257D106567F; Wed, 21 Jul 2010 21:43:18 +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 968131065679
	for <perforce@FreeBSD.org>; Wed, 21 Jul 2010 21:43:18 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8415E8FC0A
	for <perforce@FreeBSD.org>; Wed, 21 Jul 2010 21:43:18 +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 o6LLhIEX029661
	for <perforce@FreeBSD.org>; Wed, 21 Jul 2010 21:43:18 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6LLhI1R029659
	for perforce@freebsd.org; Wed, 21 Jul 2010 21:43:18 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Wed, 21 Jul 2010 21:43:18 GMT
Message-Id: <201007212143.o6LLhI1R029659@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye <jlaffaye@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181284 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: Wed, 21 Jul 2010 21:43:19 -0000

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

Change 181284 by jlaffaye@jlaffaye-chulak on 2010/07/21 21:43:07

	Do not extract files on fake mode (!!!)
	Error checking.
	Use Boolean type when appropriate.

Affected files ...

.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#4 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#4 (text+ko) ====

@@ -43,7 +43,7 @@
 
 	char **matched;
 	char *conflict[2];
-	int conflictsfound = 0;
+	Boolean conflictsfound = FALSE;
 	int code = 0;
 	int errcode = 0;
 	char cmd[FILENAME_MAX];
@@ -144,11 +144,11 @@
 			    if (isinstalledpkg(matched[i]) > 0) {
 				warnx("package '%s' conflicts with %s",
 				      pkg.name, matched[i]);
-				conflictsfound = 1;
+				conflictsfound = TRUE;
 			    }
 		}
 	    }
-	    if(conflictsfound) {
+	    if(conflictsfound == TRUE) {
 		if(!Force) {
 		    warnx("please use pkg_delete first to remove conflicting "
 			  "package(s) or -f to force installation");
@@ -400,7 +400,14 @@
 		    printf("extract: %s/%s\n", last_dir, p->name);
 		if (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
 		    assert(strcmp(p->name, archive_entry_pathname(entry)) == 0);
-		    archive_read_extract(a, entry, ARCHIVE_EXTRACT_PERM);
+		    if (!Fake &&
+			archive_read_extract(a, entry, ARCHIVE_EXTRACT_PERM) !=
+			ARCHIVE_OK) {
+			warnx("Can not extract '%s': %s",
+			      archive_entry_pathname(entry),
+			      archive_error_string(a));
+			return (1);
+		    }
 		} else {
 		    warnx("Can not read archive: %s", archive_error_string(a));
 		    return (1);