From bb2be83ea8a3ff12e83e5a97e20403520fa4a252 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Sun, 15 Dec 2002 13:53:39 +0000
Subject: [PATCH] Casting to unsigned int in isfoo() causes problems on alpha
 and sparc64.  Change cast back to unsigned char but do a bitwise AND with
 0xff to avoid any sign extension weirdness and to make it impossible for us
 to overflow _C_ctype_.  The bitwise AND is probably not needed and may be
 removed later if this does not trigger compiler bugs.

---
 src/include/ctype.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/include/ctype.h b/src/include/ctype.h
index 13d64c91..d8caec1c 100644
--- a/src/include/ctype.h
+++ b/src/include/ctype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctype.h,v 1.9 2002/12/14 14:26:19 millert Exp $	*/
+/*	$OpenBSD: ctype.h,v 1.10 2002/12/15 13:53:39 millert Exp $	*/
 /*	$NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $	*/
 
 /*
@@ -89,57 +89,57 @@ __END_DECLS
 
 static __inline int isalnum(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & (_U|_L|_N));
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_U|_L|_N)));
 }
 
 static __inline int isalpha(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & (_U|_L));
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_U|_L)));
 }
 
 static __inline int iscntrl(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & _C);
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _C));
 }
 
 static __inline int isdigit(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & _N);
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _N));
 }
 
 static __inline int isgraph(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & (_P|_U|_L|_N));
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_P|_U|_L|_N)));
 }
 
 static __inline int islower(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & _L);
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _L));
 }
 
 static __inline int isprint(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & (_P|_U|_L|_N|_B));
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_P|_U|_L|_N|_B)));
 }
 
 static __inline int ispunct(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & _P);
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _P));
 }
 
 static __inline int isspace(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & _S);
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _S));
 }
 
 static __inline int isupper(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & _U);
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & _U));
 }
 
 static __inline int isxdigit(int c)
 {
-	return (c == EOF ? 0 : (_ctype_ + 1)[(unsigned int)c] & (_N|_X));
+	return (c == EOF ? 0 : ((_ctype_ + 1)[(unsigned char)(c & 0xff)] & (_N|_X)));
 }
 
 static __inline int tolower(int c)