svn commit: r252363 - in head/usr.sbin/pkg_install: add create lib

David E. O'Brien obrien at FreeBSD.org
Sat Jun 29 00:37:50 UTC 2013


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);


More information about the svn-src-all mailing list