summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2013-06-29 00:37:49 +0000
committerobrien <obrien@FreeBSD.org>2013-06-29 00:37:49 +0000
commitcea740e055253d28645996001e38af68a43c8d1a (patch)
tree8dbda5bdc4411ba9b8291d0b2cf1f34c83b34eb3
parent35739df6c80d6fc83d2abc5edd3111399f2d5f8d (diff)
downloadFreeBSD-src-cea740e055253d28645996001e38af68a43c8d1a.zip
FreeBSD-src-cea740e055253d28645996001e38af68a43c8d1a.tar.gz
sysconf(3) returns a long, not an int.
-rw-r--r--usr.sbin/pkg_install/add/extract.c3
-rw-r--r--usr.sbin/pkg_install/create/pl.c3
-rw-r--r--usr.sbin/pkg_install/lib/exec.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index 9769464..9913126 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -110,7 +110,8 @@ extract_plist(const char *home, Package *pkg)
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 */
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 716fd05..1316eda 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -140,7 +140,8 @@ copy_plist(const char *home, Package *plist)
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;
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
index b7754b3..c0b4ac3 100644
--- a/usr.sbin/pkg_install/lib/exec.c
+++ b/usr.sbin/pkg_install/lib/exec.c
@@ -65,7 +65,7 @@ vpipe(const char *fmt, ...)
{
FILE *fp;
char *cmd, *rp;
- int maxargs;
+ long maxargs;
va_list args;
rp = malloc(MAXPATHLEN);
OpenPOWER on IntegriCloud