From owner-svn-src-all@FreeBSD.ORG Wed Jul 3 22:57:21 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 782BFD0; Wed, 3 Jul 2013 22:57:21 +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 500081CFE; Wed, 3 Jul 2013 22:57:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63MvLZX050453; Wed, 3 Jul 2013 22:57:21 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63MvKhd050450; Wed, 3 Jul 2013 22:57:20 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201307032257.r63MvKhd050450@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 3 Jul 2013 22:57:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252638 - in stable/9/usr.sbin/pkg_install: add create lib X-SVN-Group: stable-9 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2013 22:57:21 -0000 Author: obrien Date: Wed Jul 3 22:57:20 2013 New Revision: 252638 URL: http://svnweb.freebsd.org/changeset/base/252638 Log: Really MFC r252363 (sysconf(3) returns a long, not an int). Modified: stable/9/usr.sbin/pkg_install/add/extract.c stable/9/usr.sbin/pkg_install/create/pl.c stable/9/usr.sbin/pkg_install/lib/exec.c Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/pkg_install/ (props changed) stable/9/usr.sbin/pkg_install/add/ (props changed) Modified: stable/9/usr.sbin/pkg_install/add/extract.c ============================================================================== --- stable/9/usr.sbin/pkg_install/add/extract.c Wed Jul 3 22:46:30 2013 (r252637) +++ stable/9/usr.sbin/pkg_install/add/extract.c Wed Jul 3 22:57:20 2013 (r252638) @@ -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: stable/9/usr.sbin/pkg_install/create/pl.c ============================================================================== --- stable/9/usr.sbin/pkg_install/create/pl.c Wed Jul 3 22:46:30 2013 (r252637) +++ stable/9/usr.sbin/pkg_install/create/pl.c Wed Jul 3 22:57:20 2013 (r252638) @@ -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: stable/9/usr.sbin/pkg_install/lib/exec.c ============================================================================== --- stable/9/usr.sbin/pkg_install/lib/exec.c Wed Jul 3 22:46:30 2013 (r252637) +++ stable/9/usr.sbin/pkg_install/lib/exec.c Wed Jul 3 22:57:20 2013 (r252638) @@ -64,7 +64,7 @@ vpipe(const char *fmt, ...) { FILE *fp; char *cmd, *rp; - int maxargs; + long maxargs; va_list args; rp = malloc(MAXPATHLEN);