From owner-svn-src-all@FreeBSD.ORG  Sat Jun 29 00:37:50 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2AAA8B48;
 Sat, 29 Jun 2013 00:37:50 +0000 (UTC)
 (envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 031001E26;
 Sat, 29 Jun 2013 00:37:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5T0bnXP059401;
 Sat, 29 Jun 2013 00:37:49 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5T0bnLx059398;
 Sat, 29 Jun 2013 00:37:49 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201306290037.r5T0bnLx059398@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 29 Jun 2013 00:37:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252363 - in head/usr.sbin/pkg_install: add create lib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Jun 2013 00:37:50 -0000

Author: obrien
Date: Sat Jun 29 00:37:49 2013
New Revision: 252363
URL: http://svnweb.freebsd.org/changeset/base/252363

Log:
  sysconf(3) returns a long, not an int.

Modified:
  head/usr.sbin/pkg_install/add/extract.c
  head/usr.sbin/pkg_install/create/pl.c
  head/usr.sbin/pkg_install/lib/exec.c

Modified: head/usr.sbin/pkg_install/add/extract.c
==============================================================================
--- head/usr.sbin/pkg_install/add/extract.c	Fri Jun 28 22:47:33 2013	(r252362)
+++ head/usr.sbin/pkg_install/add/extract.c	Sat Jun 29 00:37:49 2013	(r252363)
@@ -110,7 +110,8 @@ extract_plist(const char *home, Package 
     PackingList p = pkg->head;
     char *last_file, *prefix = NULL;
     char *where_args, *perm_args, *last_chdir;
-    int maxargs, where_count = 0, perm_count = 0, add_count;
+    long maxargs;
+    int where_count = 0, perm_count = 0, add_count;
     Boolean preserve;
 
     maxargs = sysconf(_SC_ARG_MAX) / 2;	/* Just use half the argument space */

Modified: head/usr.sbin/pkg_install/create/pl.c
==============================================================================
--- head/usr.sbin/pkg_install/create/pl.c	Fri Jun 28 22:47:33 2013	(r252362)
+++ head/usr.sbin/pkg_install/create/pl.c	Sat Jun 29 00:37:49 2013	(r252363)
@@ -140,7 +140,8 @@ copy_plist(const char *home, Package *pl
     const char *there = NULL, *mythere;
     char *where_args, *prefix = NULL;
     const char *last_chdir, *root = "/";
-    int maxargs, where_count = 0, add_count;
+    long maxargs;
+    int where_count = 0, add_count;
     struct stat stb;
     dev_t curdir;
 

Modified: head/usr.sbin/pkg_install/lib/exec.c
==============================================================================
--- head/usr.sbin/pkg_install/lib/exec.c	Fri Jun 28 22:47:33 2013	(r252362)
+++ head/usr.sbin/pkg_install/lib/exec.c	Sat Jun 29 00:37:49 2013	(r252363)
@@ -65,7 +65,7 @@ vpipe(const char *fmt, ...)
 {
    FILE *fp;
    char *cmd, *rp;
-   int maxargs;
+   long maxargs;
    va_list args;
 
     rp = malloc(MAXPATHLEN);