From owner-p4-projects@FreeBSD.ORG  Sun May  9 07:29:31 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C915E1065676; Sun,  9 May 2010 07:29:31 +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 7AFAF1065674
	for <perforce@FreeBSD.org>; Sun,  9 May 2010 07:29:31 +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 4FC068FC08
	for <perforce@FreeBSD.org>; Sun,  9 May 2010 07:29:31 +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 o497TVM7046215
	for <perforce@FreeBSD.org>; Sun, 9 May 2010 07:29:31 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o497TVeA046213
	for perforce@freebsd.org; Sun, 9 May 2010 07:29:31 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sun, 9 May 2010 07:29:31 GMT
Message-Id: <201005090729.o497TVeA046213@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 177990 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: Sun, 09 May 2010 07:29:32 -0000

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

Change 177990 by gcooper@gcooper-bayonetta on 2010/05/09 07:28:42

	Resolve the full path to all path related arguments so that we won't need to use
	copy_file.

Affected files ...

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

Differences ...

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

@@ -12,9 +12,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.48 2010/04/23 11:07:43 flz Exp $");
 
+#include <sys/param.h>
 #include <err.h>
 #include <getopt.h>
 #include <libgen.h>
+#include <stdlib.h>
 
 #include <pkg.h>
 #include "create.h"
@@ -68,6 +70,12 @@
 	{ NULL,		0,			NULL,		0 },
 };
 
+#define RESOLVE_PATH(v, path)							\
+	do {									\
+		if ((v = malloc(PATH_MAX)) == NULL || realpath(path, v) == NULL)\
+			err(EXIT_FAILURE, "couldn't resolve path for %s", path);\
+	} while (0)
+
 int
 main(int argc, char **argv)
 {
@@ -110,7 +118,7 @@
 	    break;
 
 	case 'p':
-	    Prefix = optarg;
+	    RESOLVE_PATH(Prefix, optarg);
 	    break;
 
 	case 's':
@@ -122,7 +130,7 @@
 	    break;
 
 	case 'f':
-	    Contents = optarg;
+	    RESOLVE_PATH(Contents, optarg);
 	    break;
 
 	case 'C':
@@ -130,39 +138,40 @@
 	    break;
 
 	case 'c':
-	    Comment = optarg;
+	    RESOLVE_PATH(Comment, optarg);
 	    break;
 
 	case 'd':
-	    Desc = optarg;
+	    RESOLVE_PATH(Desc, optarg);
 	    break;
 
 	case 'i':
-	    Install = optarg;
+	    RESOLVE_PATH(Install, optarg);
 	    break;
 
 	case 'I':
-	    PostInstall = optarg;
+	    RESOLVE_PATH(PostInstall, optarg);
 	    break;
 
 	case 'k':
-	    DeInstall = optarg;
+	    RESOLVE_PATH(DeInstall, optarg);
 	    break;
 
 	case 'K':
-	    PostDeInstall = optarg;
+	    RESOLVE_PATH(PostDeInstall, optarg);
 	    break;
 
 	case 'r':
-	    Require = optarg;
+	    RESOLVE_PATH(Require, optarg);
 	    break;
 
 	case 't':
-	    strlcpy(PlayPen, optarg, sizeof(PlayPen));
+	    if (strlcpy(PlayPen, optarg, sizeof(PlayPen)) > sizeof(PlayPen))
+		errx(EXIT_FAILURE, "Playpen template specified invalid");
 	    break;
 
 	case 'X':
-	    ExcludeFrom = optarg;
+	    RESOLVE_PATH(ExcludeFrom, optarg);
 	    break;
 
 	case 'h':
@@ -170,11 +179,11 @@
 	    break;
 
 	case 'D':
-	    Display = optarg;
+	    RESOLVE_PATH(Display, optarg);
 	    break;
 
 	case 'm':
-	    Mtree = optarg;
+	    RESOLVE_PATH(Mtree, optarg);
 	    break;
 
 	case 'P':