From owner-p4-projects@FreeBSD.ORG  Thu May 27 11:27: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 E696D1065675; Thu, 27 May 2010 11:27:22 +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 AAE61106567D
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:27:22 +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 7EBAB8FC1A
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:27: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 o4RBRMXD030745
	for <perforce@FreeBSD.org>; Thu, 27 May 2010 11:27:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4RBRMLP030743
	for perforce@freebsd.org; Thu, 27 May 2010 11:27:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 27 May 2010 11:27:22 GMT
Message-Id: <201005271127.o4RBRMLP030743@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 178877 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, 27 May 2010 11:27:23 -0000

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

Change 178877 by gcooper@gcooper-bayonetta on 2010/05/27 11:26:31

	Reorder fields for alignment, and properly capture and playback errors
	from read_plist.

Affected files ...

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

Differences ...

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

@@ -22,6 +22,8 @@
 __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/perform.c,v 1.46 2010/04/23 11:07:43 flz Exp $");
 
 #include <err.h>
+#include <errno.h>
+
 #include <pkg.h>
 #include "delete.h"
 
@@ -122,19 +124,22 @@
 static int
 pkg_do(char *pkg)
 {
+    PackingList p;
+    struct stat sb;
+    struct reqr_by_entry *rb_entry;
+    struct reqr_by_head *rb_list;
     char *deporigin, **deporigins = NULL, **depnames = NULL, ***depmatches, home[FILENAME_MAX];
-    PackingList p;
+    const char *pre_script = DEINSTALL_FNAME;
+    const char *post_script, *pre_arg, *post_arg;
     int cfile;
-    int i, len;
+    int i;
+    int len;
     int isinstalled;
     /* support for separate pre/post install scripts */
     int new_m = 0, dep_count = 0;
-    const char *pre_script = DEINSTALL_FNAME;
-    const char *post_script, *pre_arg, *post_arg;
-    struct reqr_by_entry *rb_entry;
-    struct reqr_by_head *rb_list;
     int fd;
-    struct stat sb;
+    int rc;
+    int serrno;
 
     if (!pkg || !(len = strlen(pkg)))
 	return 1;
@@ -213,8 +218,13 @@
     /* If we have a prefix, add it now */
     if (Prefix)
 	add_plist(&Plist, PLIST_CWD, Prefix);
-    read_plist(&Plist, cfile);
+    rc = read_plist(&Plist, cfile);
+    serrno = errno;
     (void) close(cfile);
+    if (rc == -1) {
+	warnx("error occurred when reading plist: %s", strerror(serrno));
+	return 1;
+    }
     p = find_plist(&Plist, PLIST_CWD);
 
     if (!p) {