svn commit: r252640 - in stable/7/usr.sbin/pkg_install: add create lib

[David E. O'Brien]

Author: obrien
Date: Wed Jul  3 23:03:28 2013
New Revision: 252640
URL: http://svnweb.freebsd.org/changeset/base/252640

Log:
  MF8: r252639
       MF9: r252635, r252638:
       MFC: r252348, r252363: sysconf(3) returns a long, not an int.

Modified:
  stable/7/usr.sbin/pkg_install/add/extract.c
  stable/7/usr.sbin/pkg_install/create/pl.c
  stable/7/usr.sbin/pkg_install/lib/exec.c
Directory Properties:
  stable/7/   (props changed)
  stable/7/usr.sbin/   (props changed)
  stable/7/usr.sbin/pkg_install/   (props changed)

Modified: stable/7/usr.sbin/pkg_install/add/extract.c
==============================================================================
--- stable/7/usr.sbin/pkg_install/add/extract.c	Wed Jul  3 22:59:46 2013	(r252639)
+++ stable/7/usr.sbin/pkg_install/add/extract.c	Wed Jul  3 23:03:28 2013	(r252640)
@@ -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/7/usr.sbin/pkg_install/create/pl.c
==============================================================================
--- stable/7/usr.sbin/pkg_install/create/pl.c	Wed Jul  3 22:59:46 2013	(r252639)
+++ stable/7/usr.sbin/pkg_install/create/pl.c	Wed Jul  3 23:03:28 2013	(r252640)
@@ -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/7/usr.sbin/pkg_install/lib/exec.c
==============================================================================
--- stable/7/usr.sbin/pkg_install/lib/exec.c	Wed Jul  3 22:59:46 2013	(r252639)
+++ stable/7/usr.sbin/pkg_install/lib/exec.c	Wed Jul  3 23:03:28 2013	(r252640)
@@ -34,7 +34,8 @@ vsystem(const char *fmt, ...)
 {
     va_list args;
     char *cmd;
-    int ret, maxargs;
+    long maxargs;
+    int ret;
 
     maxargs = sysconf(_SC_ARG_MAX);
     maxargs -= 32;			/* some slop for the sh -c */
@@ -63,7 +64,7 @@ vpipe(const char *fmt, ...)
 {
    FILE *fp;
    char *cmd, *rp;
-   int maxargs;
+   long maxargs;
    va_list args;
 
     rp = malloc(MAXPATHLEN);