unsigned char for ctype. ok deraadt

6 files changed, 21 insertions, 20 deletions

diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index 68e8d5b9ef9..e7cbda5f444 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.c,v 1.152 2011/09/20 12:43:45 nicm Exp $	*/
+/*	$OpenBSD: cvs.c,v 1.153 2014/01/08 13:23:55 okan Exp $	*/
 /*
  * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -543,7 +543,7 @@ cvs_var_set(const char *var, const char *val)
 
 	/* sanity check on the name */
 	for (cp = var; *cp != '\0'; cp++)
-		if (!isalnum(*cp) && (*cp != '_')) {
+		if (!isalnum((unsigned char)*cp) && (*cp != '_')) {
 			cvs_log(LP_ERR,
 			    "variable name `%s' contains invalid characters",
 			    var);
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index dd045919cb9..4911c1bf6af 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getlog.c,v 1.96 2013/06/03 17:04:35 jcs Exp $	*/
+/*	$OpenBSD: getlog.c,v 1.97 2014/01/08 13:23:55 okan Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
@@ -464,7 +464,7 @@ date_select(RCSFILE *file, char *date)
 			delim = '\0';
 			last = "\0";
 		} else {
-			while (*last && isspace(*last))
+			while (*last && isspace((unsigned char)*last))
 				last++;
 		}
 
diff --git a/usr.bin/cvs/modules.c b/usr.bin/cvs/modules.c
index 67acb587cfe..95b0c37febf 100644
--- a/usr.bin/cvs/modules.c
+++ b/usr.bin/cvs/modules.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modules.c,v 1.16 2009/03/29 19:17:26 joris Exp $	*/
+/*	$OpenBSD: modules.c,v 1.17 2014/01/08 13:23:55 okan Exp $	*/
 /*
  * Copyright (c) 2008 Joris Vink <joris@openbsd.org>
  *
@@ -62,7 +62,7 @@ modules_parse_line(char *line, int lineno)
 
 	flags = 0;
 	p = val = line;
-	while (!isspace(*p) && *p != '\0')
+	while (!isspace((unsigned char)*p) && *p != '\0')
 		p++;
 
 	if (*p == '\0')
@@ -71,19 +71,19 @@ modules_parse_line(char *line, int lineno)
 	*(p++) = '\0';
 	module = val;
 
-	while (isspace(*p))
+	while (isspace((unsigned char)*p))
 		p++;
 
 	if (*p == '\0')
 		goto bad;
 
 	val = p;
-	while (!isspace(*p) && *p != '\0')
+	while (!isspace((unsigned char)*p) && *p != '\0')
 		p++;
 
 	while (val[0] == '-') {
 		p = val;
-		while (!isspace(*p) && *p != '\0')
+		while (!isspace((unsigned char)*p) && *p != '\0')
 			p++;
 
 		if (*p == '\0')
@@ -117,7 +117,7 @@ modules_parse_line(char *line, int lineno)
 			}
 
 			val = p;
-			while (!isspace(*val) && *val != '\0')
+			while (!isspace((unsigned char)*val) && *val != '\0')
 				val++;
 			if (*val == '\0')
 				goto bad;
@@ -164,7 +164,7 @@ modules_parse_line(char *line, int lineno)
 
 	for (sp = val; *sp != '\0'; sp = dp) {
 		dp = sp;
-		while (!isspace(*dp) && *dp != '\0')
+		while (!isspace((unsigned char)*dp) && *dp != '\0')
 			dp++;
 		if (*dp != '\0')
 			*(dp++) = '\0';
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index ece1a0b16ba..c355c2243ae 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcs.c,v 1.310 2011/05/02 22:22:54 chl Exp $	*/
+/*	$OpenBSD: rcs.c,v 1.311 2014/01/08 13:23:55 okan Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -759,7 +759,7 @@ int
 rcs_sym_check(const char *sym)
 {
 	int ret;
-	const char *cp;
+	const unsigned char *cp;
 
 	ret = 1;
 	cp = sym;
diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c
index 97f1c381a33..ac613b4ac5a 100644
--- a/usr.bin/cvs/rcsnum.c
+++ b/usr.bin/cvs/rcsnum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsnum.c,v 1.54 2012/07/02 21:56:25 tedu Exp $	*/
+/*	$OpenBSD: rcsnum.c,v 1.55 2014/01/08 13:23:55 okan Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -233,7 +233,7 @@ rcsnum_aton(const char *str, char **ep, RCSNUM *nump)
 	nump->rn_id[0] = 0;
 
 	for (sp = str;; sp++) {
-		if (!isdigit(*sp) && (*sp != '.'))
+		if (!isdigit((unsigned char)*sp) && (*sp != '.'))
 			break;
 
 		if (*sp == '.') {
diff --git a/usr.bin/cvs/trigger.c b/usr.bin/cvs/trigger.c
index ef707adee55..5fc306408af 100644
--- a/usr.bin/cvs/trigger.c
+++ b/usr.bin/cvs/trigger.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trigger.c,v 1.20 2011/05/20 19:22:47 nicm Exp $	*/
+/*	$OpenBSD: trigger.c,v 1.21 2014/01/08 13:23:55 okan Exp $	*/
 /*
  * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
  * Copyright (c) 2008 Jonathan Armani <dbd@asystant.net>
@@ -255,7 +255,8 @@ parse_cmd(int type, char *cmd, const char *repo,
 	}
 
 	/* before doing any stuff, check if the command starts with % */
-	for (p = cmd; *p != '%' && !isspace(*p) && *p != '\0'; p++)
+	for (p = cmd;
+	     *p != '%' && !isspace((unsigned char)*p) && *p != '\0'; p++)
 		;
 	if (*p == '%')
 		return (NULL);
@@ -416,13 +417,13 @@ cvs_trigger_getlines(char * file, char * repo)
 
 		lineno++;
 
-		for (p = currentline; isspace(*p); p++)
+		for (p = currentline; isspace((unsigned char)*p); p++)
 			;
 
 		if (*p == '\0' || *p == '#')
 			continue;
 
-		for (q = p; !isspace(*q) && *q != '\0'; q++)
+		for (q = p; !isspace((unsigned char)*q) && *q != '\0'; q++)
 			;
 
 		if (*q == '\0')
@@ -431,7 +432,7 @@ cvs_trigger_getlines(char * file, char * repo)
 		*q++ = '\0';
 		regex = p;
 
-		for (; isspace(*q); q++)
+		for (; isspace((unsigned char)*q); q++)
 			;
 
 		if (*q == '\0')