Implement the missing <wctype.h> functions: isw*() (iswalnum() etc.),

towlower() and towupper() required by ISO C90 Amd. 1.

iswascii(), iswhexnumber(), iswideogram(), iswnumber(), iswphonogram(),
iswrune() and iswspecial() have also been implemented for consistency
with the BSD extensions in <ctype.h>.

include/wctype.h

@@ -56,16 +56,11 @@ typedef unsigned long	wctype_t;
 #endif
 
 __BEGIN_DECLS
-int	iswctype(wint_t, wctype_t);
-wint_t	towctrans(wint_t, wctrans_t);
-wctrans_t wctrans(const char *);
-wctype_t wctype(const char *);
-#if 0
-/* XXX: not implemented */
 int	iswalnum(wint_t);
 int	iswalpha(wint_t);
 int	iswblank(wint_t);
 int	iswcntrl(wint_t);
+int	iswctype(wint_t, wctype_t);
 int	iswdigit(wint_t);
 int	iswgraph(wint_t);
 int	iswlower(wint_t);
@@ -74,11 +69,47 @@ int	iswpunct(wint_t);
 int	iswspace(wint_t);
 int	iswupper(wint_t);
 int	iswxdigit(wint_t);
+wint_t	towctrans(wint_t, wctrans_t);
 wint_t	towlower(wint_t);
 wint_t	towupper(wint_t);
+wctrans_t wctrans(const char *);
+wctype_t wctype(const char *);
+
+#if __BSD_VISIBLE
+wint_t	iswascii(wint_t);
+wint_t	iswhexnumber(wint_t);
+wint_t	iswideogram(wint_t);
+wint_t	iswnumber(wint_t);
+wint_t	iswphonogram(wint_t);
+wint_t	iswrune(wint_t);
+wint_t	iswspecial(wint_t);
 #endif
 __END_DECLS
 
+#define iswalnum(wc)	__istype((wc), _CTYPE_A|_CTYPE_D)
+#define iswalpha(wc)	__istype((wc), _CTYPE_A)
+#define iswblank(wc)	__istype((wc), _CTYPE_B)
+#define iswcntrl(wc)	__istype((wc), _CTYPE_C)
 #define iswctype(wc, charclass) __istype((wc), (charclass))
+#define iswdigit(wc)	__istype((wc), _CTYPE_D)
+#define iswgraph(wc)	__istype((wc), _CTYPE_G)
+#define iswlower(wc)	__istype((wc), _CTYPE_L)
+#define iswprint(wc)	__istype((wc), _CTYPE_R)
+#define iswpunct(wc)	__istype((wc), _CTYPE_P)
+#define iswspace(wc)	__istype((wc), _CTYPE_S)
+#define iswupper(wc)	__istype((wc), _CTYPE_U)
+#define iswxdigit(wc)	__istype((wc), _CTYPE_X)
+#define towlower(wc)	__tolower(wc)
+#define towupper(wc)	__toupper(wc)
+
+#if __BSD_VISIBLE
+#define iswascii(wc)	(((wc) & ~0x7F) == 0)
+#define iswhexnumber(wc) __istype((wc), _CTYPE_X)
+#define iswideogram(wc)	__istype((wc), _CTYPE_I)
+#define iswnumber(wc)	__istype((wc), _CTYPE_D)
+#define iswphonogram(wc) __istype((wc), _CTYPE_Q)
+#define iswrune(wc)	__istype((wc), 0xFFFFFF00L)
+#define iswspecial(wc)	__istype((wc), _CTYPE_T)
+#endif
 
 #endif		/* _WCTYPE_H_ */

lib/libc/locale/iswctype.c

@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Borman at Krystal Technologies.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <wctype.h>
+
+#undef iswalnum
+int
+iswalnum(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_A|_CTYPE_D));
+}
+
+#undef iswalpha
+int
+iswalpha(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_A));
+}
+
+#undef iswascii
+int
+iswascii(wc)
+	wint_t wc;
+{
+	return (((wc) & ~0x7F) == 0);
+}
+
+#undef iswblank
+int
+iswblank(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_B));
+}
+
+#undef iswcntrl
+int
+iswcntrl(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_C));
+}
+
+#undef iswdigit
+int
+iswdigit(wc)
+	wint_t wc;
+{
+	return (__isctype((wc), _CTYPE_D));
+}
+
+#undef iswgraph
+int
+iswgraph(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_G));
+}
+
+#undef iswhexnumber 
+int
+iswhexnumber(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_X));
+}
+
+#undef iswideogram
+int
+iswideogram(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_I));
+}
+
+#undef iswlower
+int
+iswlower(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_L));
+}
+
+#undef iswnumber
+int
+iswnumber(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_D));
+}
+
+#undef iswphonogram	
+int
+iswphonogram(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_Q));
+}
+
+#undef iswprint
+int
+iswprint(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_R));
+}
+
+#undef iswpunct
+int
+iswpunct(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_P));
+}
+
+#undef iswrune
+int
+iswrune(wc)
+	wint_t wc;
+{
+	return (__istype((wc), 0xFFFFFF00L));
+}
+
+#undef iswspace
+int
+iswspace(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_S));
+}
+
+#undef iswspecial
+int
+iswspecial(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_T));
+}
+
+#undef iswupper
+int
+iswupper(wc)
+	wint_t wc;
+{
+	return (__istype((wc), _CTYPE_U));
+}
+
+#undef iswxdigit
+int
+iswxdigit(wc)
+	wint_t wc;
+{
+	return (__isctype((wc), _CTYPE_X));
+}
+
+#undef towlower
+wint_t
+towlower(wc)
+	wint_t wc;
+{
+        return (__tolower(wc));
+}
+
+#undef towupper
+wint_t
+towupper(wc)
+	wint_t wc;
+{
+        return (__toupper(wc));
+}