From owner-p4-projects@FreeBSD.ORG  Wed May 12 15:54:23 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 473DC1065673; Wed, 12 May 2010 15:54:23 +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 0C1271065670
	for <perforce@FreeBSD.org>; Wed, 12 May 2010 15:54:23 +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 EE7AF8FC17
	for <perforce@FreeBSD.org>; Wed, 12 May 2010 15:54:22 +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 o4CFsMTB025225
	for <perforce@FreeBSD.org>; Wed, 12 May 2010 15:54:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4CFsMw5025223
	for perforce@freebsd.org; Wed, 12 May 2010 15:54:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 12 May 2010 15:54:22 GMT
Message-Id: <201005121554.o4CFsMw5025223@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 178147 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, 12 May 2010 15:54:23 -0000

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

Change 178147 by gcooper@starr-bastion on 2010/05/12 15:53:44

	Fix an uncaught error when open(2) fails. Fix some bass ackwards inverted logic while I'm here.

Affected files ...

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

Differences ...

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

@@ -425,10 +425,8 @@
 	 * If the package tarball exists already, and we are running in
 	 * `no clobber' mode, skip this package.
 	 */
-	else if ((archive_fd = open(tball, archive_open_flags)) == -1) {
-		if (Verbose)
-			warn("Skipping package creation for: '%s'", tball);
-	}
+	else if ((archive_fd = open(tball, archive_open_flags)) == -1)
+		error = strerror(errno);
 	else if ((archive = archive_write_new()) == NULL)
 		error = strerror(errno);
 	else if (archive_write_set_format_ustar(archive) != ARCHIVE_OK)
@@ -477,10 +475,10 @@
 
 	}
 
-	if (error != NULL &&
+	if (error == NULL &&
 	    archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK)
 		error = archive_error_string(archive);
-	if (error != NULL) {
+	if (error == NULL) {
 
 		if (Verbose)
 			printf("Creating %sed tar ball in '%s'\n",
@@ -537,7 +535,7 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-			if (error != NULL)
+			if (error == NULL)
 				if (strlcat(destfile, p->name, PATH_MAX) >
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
@@ -548,7 +546,7 @@
 				    PATH_MAX) > PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-			if (error != NULL)
+			if (error == NULL)
 				if (strlcat(srcfile, p->name, PATH_MAX) >
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);