Fix breakage introduced on 64-bit platforms with my last commit. Need

to change to size_t in a couple of other places too.

10 files changed, 53 insertions, 52 deletions

diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 467d6dc18970..4029dce5386d 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -195,7 +195,7 @@ Arch_ParseArchive(char **linePtr, Lst nodeLst, GNode *ctxt)
 	     * Variable spec, so call the Var module to parse the puppy
 	     * so we can safely advance beyond it...
 	     */
-	    int 	length;
+	    size_t length;
 	    Boolean	freeIt;
 	    char	*result;
 
@@ -237,11 +237,11 @@ Arch_ParseArchive(char **linePtr, Lst nodeLst, GNode *ctxt)
 		 * Variable spec, so call the Var module to parse the puppy
 		 * so we can safely advance beyond it...
 		 */
-		int 	length;
+		size_t length;
 		Boolean	freeIt;
 		char	*result;
 
-		result=Var_Parse(cp, ctxt, TRUE, &length, &freeIt);
+		result = Var_Parse(cp, ctxt, TRUE, &length, &freeIt);
 		if (result == var_Error) {
 		    return (FAILURE);
 		} else {
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 0acea8226bf4..e290c9069c93 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -180,7 +180,7 @@ static int
 CondGetArg(char **linePtr, char **argPtr, char *func, Boolean parens)
 {
     char	  *cp;
-    int	    	  argLen;
+    size_t    	  argLen;
     Buffer	  buf;
 
     cp = *linePtr;
@@ -223,7 +223,7 @@ CondGetArg(char **linePtr, char **argPtr, char *func, Boolean parens)
 	     * though perhaps we should...
 	     */
 	    char  	*cp2;
-	    int		len;
+	    size_t	len;
 	    Boolean	doFree;
 
 	    cp2 = Var_Parse(cp, VAR_CMD, TRUE, &len, &doFree);
@@ -507,7 +507,7 @@ CondToken(Boolean doEval)
 		char	*lhs;
 		char	*rhs;
 		char	*op;
-		int	varSpecLen;
+		size_t	varSpecLen;
 		Boolean	doFree;
 
 		/*
@@ -621,7 +621,7 @@ do_string_compare:
 			    cp++;
 			    Buf_AddByte(buf, (Byte)*cp);
 			} else if (*cp == '$') {
-			    int	len;
+			    size_t len;
 			    Boolean freeIt;
 
 			    cp2 = Var_Parse(cp, VAR_CMD, doEval, &len, &freeIt);
@@ -641,7 +641,7 @@ do_string_compare:
 
 		    Buf_AddByte(buf, (Byte)0);
 
-		    string = (char *)Buf_GetAll(buf, (int *)NULL);
+		    string = (char *)Buf_GetAll(buf, (size_t *)NULL);
 		    Buf_Destroy(buf, FALSE);
 
 		    DEBUGF(COND, ("lhs = \"%s\", rhs = \"%s\", op = %.2s\n",
@@ -673,7 +673,7 @@ do_string_compare:
 		    if (*CondCvtArg(lhs, &left) != '\0')
 			goto do_string_compare;
 		    if (*rhs == '$') {
-			int 	len;
+			size_t len;
 			Boolean	freeIt;
 
 			string = Var_Parse(rhs, VAR_CMD, doEval, &len, &freeIt);
@@ -794,7 +794,7 @@ error:
 		     * Use Var_Parse to parse the spec in parens and return
 		     * True if the resulting string is empty.
 		     */
-		    int	    length;
+		    size_t length;
 		    Boolean doFree;
 		    char    *val;
 
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 72d27cb49dc5..c4a11b8ce246 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -114,7 +114,7 @@ For_Eval(char *line)
 
     if (forLevel == 0) {
 	Buffer	    buf;
-	int	    varlen;
+	size_t varlen;
 
 	for (ptr++; *ptr && isspace((unsigned char)*ptr); ptr++)
 	    continue;
@@ -248,7 +248,7 @@ ForExec(void *namep, void *argp)
 {
     char *name = namep;
     For *arg = argp;
-    int len;
+    size_t len;
 
     Var_Set(arg->var, name, VAR_GLOBAL);
     DEBUGF(FOR, ("--- %s = %s\n", arg->var, name));
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 1e5e7de8c4bb..7a660a7b7716 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1007,7 +1007,8 @@ Cmd_Exec(char *cmd, char **error)
     int		status;		/* command exit status */
     Buffer	buf;		/* buffer to store the result */
     char	*cp;
-    int		cc;
+    size_t blen;
+    ssize_t rcnt;
 
     *error = NULL;
 
@@ -1065,12 +1066,10 @@ Cmd_Exec(char *cmd, char **error)
 
 	do {
 	    char   result[BUFSIZ];
-	    cc = read(fds[0], result, sizeof(result));
-	    if (cc > 0)
-		Buf_AddBytes(buf, cc, (Byte *)result);
-	}
-	while (cc > 0 || (cc == -1 && errno == EINTR));
-
+	    rcnt = read(fds[0], result, sizeof(result));
+	    if (rcnt != -1)
+		Buf_AddBytes(buf, (size_t)rcnt, (Byte *)result);
+	} while (rcnt > 0 || (rcnt == -1 && errno == EINTR));
 	/*
 	 * Close the input side of the pipe.
 	 */
@@ -1082,10 +1081,10 @@ Cmd_Exec(char *cmd, char **error)
 	while (((pid = wait(&status)) != cpid) && (pid >= 0))
 	    continue;
 
-	if (cc == -1)
+	if (rcnt == -1)
 	    *error = "Error reading shell's output for \"%s\"";
 
-	res = (char *)Buf_GetAll(buf, &cc);
+	res = (char *)Buf_GetAll(buf, &blen);
 	Buf_Destroy(buf, FALSE);
 
 	if (status)
@@ -1095,8 +1094,8 @@ Cmd_Exec(char *cmd, char **error)
 	 * Null-terminate the result, convert newlines to spaces and
 	 * install it in the variable.
 	 */
-	res[cc] = '\0';
-	cp = &res[cc] - 1;
+	res[blen] = '\0';
+	cp = &res[blen] - 1;
 
 	if (*cp == '\n') {
 	    /*
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index f6e07008aaa4..76354a4fe113 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -137,7 +137,7 @@ void Var_Append(char *, char *, GNode *);
 Boolean Var_Exists(char *, GNode *);
 char *Var_Value(char *, GNode *, char **);
 char *Var_Quote(const char *);
-char *Var_Parse(char *, GNode *, Boolean, int *, Boolean *);
+char *Var_Parse(char *, GNode *, Boolean, size_t *, Boolean *);
 char *Var_Subst(char *, char *, GNode *, Boolean);
 char *Var_GetTail(char *);
 char *Var_GetHead(char *);
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 0b9c60e823d7..4c39d2493b7f 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -701,7 +701,7 @@ ParseDoDependency (char *line)
 		 * no errors in this, as they would have been discovered
 		 * in the initial Var_Subst and we wouldn't be here.
 		 */
-		int 	length;
+		size_t length;
 		Boolean	freeIt;
 		char	*result;
 
@@ -2013,7 +2013,8 @@ static char *
 ParseSkipLine(int skip, int keep_newline)
 {
     char *line;
-    int c, lastc, lineLength = 0;
+    int c, lastc;
+    size_t lineLength = 0;
     Buffer buf;
 
     buf = Buf_Init(MAKE_BSIZE);
@@ -2095,7 +2096,7 @@ ParseReadLine(void)
 				 * shell command */
     char 	  *line;    	/* Result */
     char          *ep;		/* to strip trailing blanks */
-    int	    	  lineLength;	/* Length of result */
+    size_t lineLength;		/* Length of result */
     int		  lineno;	/* Saved line # */
 
     semiNL = FALSE;
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index b029c810938d..4d7165d6ffbb 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1340,7 +1340,7 @@ SuffExpandChildren(void *cgnp, void *pgnp)
 			 * to find the end so we can skip over it.
 			 */
 			char	*junk;
-			int 	len;
+			size_t len;
 			Boolean	doFree;
 
 			junk = Var_Parse(cp, pgn, TRUE, &len, &doFree);
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index f1bd2645aa22..d571b0d44a2b 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -135,7 +135,7 @@ static void VarPossiblyExpand(char **, GNode *);
 static Var *VarFind(char *, GNode *, int);
 static void VarAdd(char *, char *, GNode *);
 static void VarDelete(void *);
-static char *VarGetPattern(GNode *, int, char **, int, int *, int *,
+static char *VarGetPattern(GNode *, int, char **, int, int *, size_t *,
 			   VarPattern *);
 static char *VarModify(char *,
 		       Boolean (*)(const char *, Boolean, Buffer, void *),
@@ -482,7 +482,7 @@ Var_Append(char *name, char *val, GNode *ctxt)
 	Buf_AddBytes(v->val, strlen(val), (Byte *)val);
 
 	DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name,
-	       (char *)Buf_GetAll(v->val, (int *)NULL)));
+	       (char *)Buf_GetAll(v->val, (size_t *)NULL)));
 
 	if (v->flags & VAR_FROM_ENV) {
 	    /*
@@ -552,7 +552,7 @@ Var_Value(char *name, GNode *ctxt, char **frp)
     free(name);
     *frp = NULL;
     if (v != NULL) {
-	char *p = (char *)Buf_GetAll(v->val, (int *)NULL);
+	char *p = (char *)Buf_GetAll(v->val, (size_t *)NULL);
 
 	if (v->flags & VAR_FROM_ENV) {
 	    Buf_Destroy(v->val, FALSE);
@@ -600,7 +600,7 @@ VarModify(char *str, Boolean (*modProc)(const char *, Boolean, Buffer, void *),
 	addSpace = (*modProc)(av[i], addSpace, buf, datum);
 
     Buf_AddByte (buf, '\0');
-    str = (char *)Buf_GetAll(buf, (int *)NULL);
+    str = (char *)Buf_GetAll(buf, (size_t *)NULL);
     Buf_Destroy(buf, FALSE);
     return (str);
 }
@@ -636,7 +636,7 @@ VarSortWords(char *str, int (*cmp)(const void *, const void *))
 		Buf_AddBytes(buf, strlen(av[i]), (Byte *)av[i]);
 		Buf_AddByte(buf, (Byte)((i < ac - 1) ? ' ' : '\0'));
 	}
-	str = (char *)Buf_GetAll(buf, (int *)NULL);
+	str = (char *)Buf_GetAll(buf, (size_t *)NULL);
 	Buf_Destroy(buf, FALSE);
 	return (str);
 }
@@ -672,11 +672,11 @@ SortIncreasing(const void *l, const void *r)
  */
 static char *
 VarGetPattern(GNode *ctxt, int err, char **tstr, int delim, int *flags,
-    int *length, VarPattern *pattern)
+    size_t *length, VarPattern *pattern)
 {
     char *cp;
     Buffer buf = Buf_Init(0);
-    int junk;
+    size_t junk;
 
     if (length == NULL)
 	length = &junk;
@@ -708,7 +708,7 @@ VarGetPattern(GNode *ctxt, int err, char **tstr, int delim, int *flags,
 	    } else {
 		if (flags == NULL || (*flags & VAR_NOSUBST) == 0) {
 		    char   *cp2;
-		    int	    len;
+		    size_t len;
 		    Boolean freeIt;
 
 		    /*
@@ -851,7 +851,8 @@ VarREError(int err, regex_t *pat, const char *str)
  *-----------------------------------------------------------------------
  */
 char *
-Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
+Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
+    Boolean *freePtr)
 {
     char	    *tstr;    	/* Pointer into str */
     Var	    	    *v;	    	/* Variable in invocation */
@@ -941,7 +942,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 	 */
 	for (tstr = str + 2; *tstr != '\0' && *tstr != endc && *tstr != ':'; tstr++)
 		if (*tstr == '$') {
-			int	rlen;
+			size_t rlen;
 			Boolean	rfree;
 			char*	rval = Var_Parse(tstr, ctxt, err, &rlen, &rfree);
 
@@ -970,7 +971,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 	*tstr = '\0';
 
 	Buf_AddByte(buf, (Byte)'\0');
-	str = Buf_GetAll(buf, (int *)NULL);
+	str = Buf_GetAll(buf, (size_t *)NULL);
 	vlen = strlen(str);
 
 	v = VarFind(str, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
@@ -1005,7 +1006,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 			 * the only one who sets these things and we sure don't
 			 * put nested invocations in them...
 			 */
-			val = (char *)Buf_GetAll(v->val, (int *)NULL);
+			val = (char *)Buf_GetAll(v->val, (size_t *)NULL);
 
 			if (str[1] == 'D') {
 			    val = VarModify(val, VarHead, (void *)NULL);
@@ -1116,7 +1117,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
      * been dynamically-allocated, so it will need freeing when we
      * return.
      */
-    str = (char *)Buf_GetAll(v->val, (int *)NULL);
+    str = (char *)Buf_GetAll(v->val, (size_t *)NULL);
     if (strchr(str, '$') != (char *)NULL) {
 	str = Var_Subst(NULL, str, ctxt, err);
 	*freePtr = TRUE;
@@ -1252,7 +1253,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 				 * substitution and recurse.
 				 */
 				char	    *cp2;
-				int	    len;
+				size_t len;
 				Boolean	    freeIt;
 
 				cp2 = Var_Parse(cp, ctxt, err, &len, &freeIt);
@@ -1316,7 +1317,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 			    cp++;
 			} else if ((*cp == '$') && (cp[1] != del)) {
 			    char    *cp2;
-			    int	    len;
+			    size_t len;
 			    Boolean freeIt;
 
 			    cp2 = Var_Parse(cp, ctxt, err, &len, &freeIt);
@@ -1463,7 +1464,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 			    Buf_AddByte(buf, (Byte)tolower(*cp));
 
 			Buf_AddByte(buf, (Byte)'\0');
-			newStr = (char *)Buf_GetAll(buf, (int *)NULL);
+			newStr = (char *)Buf_GetAll(buf, (size_t *)NULL);
 			Buf_Destroy(buf, FALSE);
 
 			cp = tstr + 1;
@@ -1503,7 +1504,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
 			    Buf_AddByte(buf, (Byte)toupper(*cp));
 
 			Buf_AddByte(buf, (Byte)'\0');
-			newStr = (char *)Buf_GetAll(buf, (int *)NULL);
+			newStr = (char *)Buf_GetAll(buf, (size_t *)NULL);
 			Buf_Destroy(buf, FALSE);
 
 			cp = tstr + 1;
@@ -1669,7 +1670,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, int *lengthPtr, Boolean *freePtr)
     if (v->flags & VAR_FROM_ENV) {
 	Boolean	  destroy = FALSE;
 
-	if (str != (char *)Buf_GetAll(v->val, (int *)NULL)) {
+	if (str != (char *)Buf_GetAll(v->val, (size_t *)NULL)) {
 	    destroy = TRUE;
 	} else {
 	    /*
@@ -1724,7 +1725,7 @@ Var_Subst(char *var, char *str, GNode *ctxt, Boolean undefErr)
 {
     Buffer  	  buf;	    	    /* Buffer for forming things */
     char    	  *val;		    /* Value to substitute for a variable */
-    int	    	  length;   	    /* Length of the variable invocation */
+    size_t	  length;   	    /* Length of the variable invocation */
     Boolean 	  doFree;   	    /* Set true if val should be freed */
     static Boolean errorReported;   /* Set true if an error has already
 				     * been reported to prevent a plethora
@@ -1862,7 +1863,7 @@ Var_Subst(char *var, char *str, GNode *ctxt, Boolean undefErr)
     }
 
     Buf_AddByte(buf, '\0');
-    str = (char *)Buf_GetAll(buf, (int *)NULL);
+    str = (char *)Buf_GetAll(buf, (size_t *)NULL);
     Buf_Destroy(buf, FALSE);
     return (str);
 }
@@ -1946,7 +1947,7 @@ VarPrintVar(void *vp, void *dummy __unused)
 {
     Var    *v = (Var *) vp;
 
-    printf("%-16s = %s\n", v->name, (char *)Buf_GetAll(v->val, (int *)NULL));
+    printf("%-16s = %s\n", v->name, (char *)Buf_GetAll(v->val, (size_t *)NULL));
     return (0);
 }
 
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 1621b46abcc9..530577e8ee4d 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -62,9 +62,9 @@ typedef struct Var {
 
 typedef struct {
     char    	  *lhs;	    /* String to match */
-    int	    	  leftLen;  /* Length of string */
+    size_t    	  leftLen;  /* Length of string */
     char    	  *rhs;	    /* Replacement string (w/ &'s removed) */
-    int	    	  rightLen; /* Length of replacement */
+    size_t    	  rightLen; /* Length of replacement */
     int	    	  flags;
 } VarPattern;
 
diff --git a/usr.bin/make/var_modify.c b/usr.bin/make/var_modify.c
index 3d51f6a2f2ce..4929284b5d90 100644
--- a/usr.bin/make/var_modify.c
+++ b/usr.bin/make/var_modify.c
@@ -311,7 +311,7 @@ VarNoMatch(const char *word, Boolean addSpace, Buffer buf, void *pattern)
 Boolean
 VarSubstitute(const char *word, Boolean addSpace, Buffer buf, void *patternp)
 {
-    int		  	wordLen;    /* Length of word */
+    size_t	  	wordLen;    /* Length of word */
     const char	 	*cp;	    /* General pointer */
     VarPattern	*pattern = patternp;