From owner-p4-projects@FreeBSD.ORG  Mon May 31 03:35:47 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 024841065678; Mon, 31 May 2010 03:35:47 +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 BB0F61065675
	for <perforce@FreeBSD.org>; Mon, 31 May 2010 03:35:46 +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 A87038FC0C
	for <perforce@FreeBSD.org>; Mon, 31 May 2010 03:35:46 +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 o4V3ZkkS094290
	for <perforce@FreeBSD.org>; Mon, 31 May 2010 03:35:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4V3ZkmJ094288
	for perforce@freebsd.org; Mon, 31 May 2010 03:35:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 31 May 2010 03:35:46 GMT
Message-Id: <201005310335.o4V3ZkmJ094288@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 178999 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: Mon, 31 May 2010 03:35:47 -0000

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

Change 178999 by gcooper@gcooper-bayonetta on 2010/05/31 03:34:58

	Fix typos.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#11 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#11 (text+ko) ====

@@ -50,7 +50,7 @@
 
 	if (tmp == NULL)
 		retcode = -1;
-	else
+	else {
 
 		tmp->name = copy_string(arg);
 		tmp->type = type;
@@ -97,7 +97,7 @@
 
 	if (tmp == NULL)
 		retcode = -1;
-	else
+	else {
 
 		tmp->name = copy_string(arg);
 		tmp->type = type;
@@ -690,7 +690,7 @@
 					 */
 					if (issymlink(tmp) &&
 					    verscmp(pkg, 1, 0) > 0) {
-						char linkbuf[PATHNAME_MAX];
+						char linkbuf[PATH_MAX];
 						int len;
 
 						if ((len = readlink(tmp,
@@ -808,10 +808,10 @@
 		if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""),
 		    dir))
 			retcode = -1;
-	} else if (isdir(dir) && !issymlink(dir))
+	} else if (isdir(dir) && !issymlink(dir)) {
 		if (RMDIR(dir) && !ign_err)
 			retcode = -1;
-	else
+	} else
 		if (REMOVE(dir, ign_err))
 			retcode = -1;
 
@@ -831,14 +831,13 @@
 
 		retcode = 0;
 
-		if (nukedirs == TRUE) {
-
+		if (nukedirs == TRUE)
 			while (cp2 != NULL && retcode == 0) {
 
 				if ((cp2 = strrchr(cp1, '/')) != NULL)
 					*cp2 = '\0';
 				if (!isemptydir(dir))
-					retcode == 0;
+					retcode = 0;
 				if (RMDIR(dir) && !ign_err) {
 
 					if (!fexists(dir))