From owner-p4-projects@FreeBSD.ORG  Sun Mar 28 06:03:46 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 801291065672; Sun, 28 Mar 2010 06:03:46 +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 4470F106566C
	for <perforce@FreeBSD.org>; Sun, 28 Mar 2010 06:03:46 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 317048FC08
	for <perforce@FreeBSD.org>; Sun, 28 Mar 2010 06:03: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 o2S63kVP070776
	for <perforce@FreeBSD.org>; Sun, 28 Mar 2010 06:03:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2S63kGl070774
	for perforce@freebsd.org; Sun, 28 Mar 2010 06:03:46 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sun, 28 Mar 2010 06:03:46 GMT
Message-Id: <201003280603.o2S63kGl070774@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 176182 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, 28 Mar 2010 06:03:46 -0000

http://p4web.freebsd.org/chv.cgi?CH=176182

Change 176182 by gcooper@gcooper-bayonetta on 2010/03/28 06:03:36

	There no sense lying about this point anymore: vsystem calls are limited by ARG_MAX, not by any factor of FILENAME_MAX or PATH_MAX.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#3 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#3 (text+ko) ====

@@ -262,15 +262,15 @@
 void
 copy_file(const char *dir, const char *fname, const char *to)
 {
-    char cmd[FILENAME_MAX];
+    char cmd[ARG_MAX];
 
     if (fname[0] == '/')
-	snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s %s", fname, to);
+	snprintf(cmd, ARG_MAX, "/bin/cp -r %s %s", fname, to);
     else
-	snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s/%s %s", dir, fname, to);
+	snprintf(cmd, ARG_MAX, "/bin/cp -r %s/%s %s", dir, fname, to);
     if (vsystem(cmd)) {
 	cleanup(0);
-	errx(2, "%s: could not perform '%s'", __func__, cmd);
+	errx(2, "%s.%s: could not perform '%s'", progname, __func__, cmd);
     }
 }
 
@@ -281,12 +281,12 @@
 void
 move_file(const char *dir, const char *fname, const char *to)
 {
-    char cmd[FILENAME_MAX];
+    char cmd[ARG_MAX];
 
     if (fname[0] == '/')
- 	snprintf(cmd, FILENAME_MAX, "/bin/mv %s %s", fname, to);
+ 	snprintf(cmd, ARG_MAX, "/bin/mv %s %s", fname, to);
     else
-	snprintf(cmd, FILENAME_MAX, "/bin/mv %s/%s %s", dir, fname, to);
+	snprintf(cmd, ARG_MAX, "/bin/mv %s/%s %s", dir, fname, to);
     if (vsystem(cmd) != 0) {
 	cleanup(0);
 	errx(2, "%s.%s: could not perform '%s'", progname, __func__, cmd);
@@ -304,17 +304,17 @@
 void
 copy_hierarchy(const char *dir, const char *fname, Boolean to)
 {
-    char cmd[FILENAME_MAX * 3];
+    char cmd[ARG_MAX];
 
     if (!to) {
 	/* If absolute path, use it */
 	if (*fname == '/')
 	    dir = "/";
-	snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -",
+	snprintf(cmd, ARG_MAX, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -",
 		 dir, fname);
     }
     else
-	snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s",
+	snprintf(cmd, ARG_MAX, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s",
 		 fname, dir);
 #ifdef DEBUG
     printf("Using '%s' to copy trees.\n", cmd);