From bd355af04fc1df69d4ebb6733be170b9baf0dfb5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 14 Dec 1997 22:24:57 +0000 Subject: Update. 1997-12-14 21:33 Ulrich Drepper * version.h (VERSION): Bump to 2.0.91. * db2/makedb.c (process_input): Fix typo in message. * sunrpc/rpcinfo.c (pmapdump): Unify messages. * elf/dynamic-link.h: Pretty print. * elf/rtld.c: Allow multiple preloading of a shared object. * include/limits.h: Prevent multiple inclusion. * malloc/Makefile (headers): Add mcheck.h. (distribute): Remove it here. * malloc/mcheck.h: Pretty print. * malloc/mtrace.c (mallenv): Make `const'. * malloc/mtrace.pl: Don't print table head for memory leaks if there are none. * manual/memory.texi: Update descriptor of malloc hooks. * posix/Makefile (routines): Add waitid. * posix/sys/types.h [__USE_SVID || __USE_POSIX]: Define id_t based on __id_t. * posix/sys/wait.h: Define idtype_t type. Add prototype for waitid. * signal/signal.h: Move definition of sigval_t to . * sysdeps/generic/waitid.c: Stub for waitid. * sysdeps/generic/bits/siginfo.h: Define sigval_t. Arrange to work the __need_siginfo_t defined. * sysdeps/unix/sysv/linux/bits/siginfo: Likewise. * sysdeps/generic/bits/types.h: Define __id_t. Correct definition of __FDMASK. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/posix/waitid.c: New file. Provided by Zack Weinberg. * rt/aio_misc.c: Rename __aio_free_req to __aio_free_request. * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add missing parameters. * sysdeps/generic/dl-sysdep.c: Don't call __libc_init_secure. * sysdeps/generic/enbl-secure.c: Don't define __libc_uid. * sysdeps/unix/sysv/linux/init-first.c: Define __libc_uid. * sysdeps/unix/sysv/linux/sigqueue.c: Make sure __libc_uid is initialized. * sysdeps/i386/dl-machine.h: Little cleanup. * sysdeps/i386/fpu/bits/mathinline.h: Use __signbit* inline functions. (__finite): Mark function as const. Add inline code for __ieee754_atan2. * sysdeps/libm-ieee754/s_cacoshf.c: Add alternate implementation (but don't use it now). * sysdeps/libm-ieee754/s_catan.c: Use __ieee754_atan2 instead of __atan. * sysdeps/libm-ieee754/s_catanf.c: Likewise. * sysdeps/libm-ieee754/s_catanl.c: Likewise. * sysdeps/libm-ieee754/s_catanh.c: Likewise. Correct sign of real part. * sysdeps/libm-ieee754/s_catanhf.c: Likewise. * sysdeps/libm-ieee754/s_catanhl.c: Likewise. * sysdeps/libm-ieee754/s_clog10.c: Use factor to correct __ieee754_atan2 to base 10. * sysdeps/libm-ieee754/s_clog10f.c: Likewise. * sysdeps/libm-ieee754/s_clog10l.c: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h: Define as old_kernel_sigaction. * sysdeps/unix/sysv/linux/net/if_slip.h: Pretty print. * wctype/Makefile (routines): Add wctype_l. * wctype/wctype.h: Add declaration of __wctype_l. * wctype/wctype_l.c: New file. 1997-12-10 00:38 Ulrich Drepper * locale/C-ctype.c: Correct data for isw* functions. * locale/programs/ld-ctype.c: Write 32bit char classes in correct byte order. * wctype/test_wctype.c: Add test for isw* functions. * wctype/wctype.c: Return value with expected byte order. * sysdeps/generic/_G_config.h: Define _G_HAVE_IO_FILE_OPEN. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. --- wctype/Makefile | 2 +- wctype/test_wctype.c | 22 +++++++++++++++------- wctype/wctype.c | 15 +++++++++------ wctype/wctype.h | 21 +++++++++++---------- wctype/wctype_l.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 24 deletions(-) create mode 100644 wctype/wctype_l.c (limited to 'wctype') diff --git a/wctype/Makefile b/wctype/Makefile index 731b43a..16a7f32 100644 --- a/wctype/Makefile +++ b/wctype/Makefile @@ -24,7 +24,7 @@ subdir := wctype headers := wctype.h distribute := cname-lookup.h routines := wcfuncs wctype iswctype wctrans towctrans wcextra \ - wcfuncs_l iswctype_l towctrans_l + wcfuncs_l iswctype_l towctrans_l wctype_l tests := test_wctype diff --git a/wctype/test_wctype.c b/wctype/test_wctype.c index 300b869..1c9bf5a 100644 --- a/wctype/test_wctype.c +++ b/wctype/test_wctype.c @@ -46,14 +46,22 @@ main (int argc, char *argv[]) for (ch = 0; ch < 256; ++ch) { -#define TEST(test) \ +#define TEST(test) \ do \ - if ((is##test (ch) == 0) != (iswctype (ch, bit_##test) == 0)) \ - { \ - printf ("class `%s' test for character \\%o failed\n", \ - #test, ch); \ - result = 1; \ - } \ + { \ + if ((is##test (ch) == 0) != (iswctype (ch, bit_##test) == 0)) \ + { \ + printf ("`iswctype' class `%s' test " \ + "for character \\%o failed\n", #test, ch); \ + result = 1; \ + } \ + if ((is##test (ch) == 0) != (isw##test (ch) == 0)) \ + { \ + printf ("`isw%s' test for character \\%o failed\n", \ + #test, ch); \ + result = 1; \ + } \ + } \ while (0) TEST (alnum); diff --git a/wctype/wctype.c b/wctype/wctype.c index 01746be..07cb518 100644 --- a/wctype/wctype.c +++ b/wctype/wctype.c @@ -20,21 +20,24 @@ #include #include #include -#include "../locale/localeinfo.h" +#include wctype_t wctype (const char *property) { const char *names; wctype_t result; + size_t proplen = strlen (property); names = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS_NAMES); for (result = 1; result != 0; result <<= 1) { - if (strcmp (property, names) == 0) + size_t nameslen = strlen (names); + + if (proplen == nameslen && memcmp (property, names, proplen) == 0) break; - names = strchr (names, '\0') + 1; + names += nameslen + 1; if (names[0] == '\0') return 0; } @@ -42,9 +45,9 @@ wctype (const char *property) #if __BYTE_ORDER == __BIG_ENDIAN return result; #else -# define SWAPU32(w) \ - (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24)) +#define XSWAPU32(w) \ + ((((w) & 0xff00ff00) >> 8) | (((w) & 0xff00ff) << 8)) - return SWAPU32 (result); + return XSWAPU32 (result); #endif } diff --git a/wctype/wctype.h b/wctype/wctype.h index 91a1678..ffa4b25 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -57,11 +57,7 @@ typedef unsigned long int wctype_t; #endif #ifndef _ISbit -/* These are all the characteristics of characters. - If there get to be more than 16 distinct characteristics, - many things must be changed that use `unsigned short int's. - - The characteristics are stored always in network byte order (big +/* The characteristics are stored always in network byte order (big endian). We define the bit value interpretations here dependent on the machine's byte order. */ @@ -260,25 +256,30 @@ extern int __iswupper_l __P ((wint_t __wc, __locale_t __locale)); extern int __iswxdigit_l __P ((wint_t __wc, __locale_t __locale)); +/* Construct value that describes a class of wide characters identified + by the string argument PROPERTY. */ +extern wctype_t __wctype_l __P ((__const char *__property, + __locale_t __locale)); + /* Determine whether the wide-character WC has the property described by DESC. */ extern int __iswctype_l __P ((wint_t __wc, wctype_t __desc, - __locale_t locale)); + __locale_t __locale)); /* - * Wide-character case-mapping functions: 7.15.3.1. + * Wide-character case-mapping functions. */ /* Converts an uppercase letter to the corresponding lowercase letter. */ -extern wint_t __towlower_l __P ((wint_t __wc, __locale_t locale)); +extern wint_t __towlower_l __P ((wint_t __wc, __locale_t __locale)); /* Converts an lowercase letter to the corresponding uppercase letter. */ -extern wint_t __towupper_l __P ((wint_t __wc, __locale_t locale)); +extern wint_t __towupper_l __P ((wint_t __wc, __locale_t __locale)); /* Map the wide character WC using the mapping described by DESC. */ extern wint_t __towctrans_l __P ((wint_t __wc, wctrans_t __desc, - __locale_t locale)); + __locale_t __locale)); # ifndef __NO_WCTYPE diff --git a/wctype/wctype_l.c b/wctype/wctype_l.c new file mode 100644 index 0000000..6a8d469 --- /dev/null +++ b/wctype/wctype_l.c @@ -0,0 +1,53 @@ +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include + +wctype_t +__wctype_l (const char *property, __locale_t locale) +{ + const char *names; + wctype_t result; + size_t proplen = strlen (property); + + names = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_NAMES)].string; + for (result = 1; result != 0; result <<= 1) + { + size_t nameslen = strlen (names); + + if (proplen == nameslen && memcmp (property, names, proplen) == 0) + break; + + names += nameslen + 1; + if (names[0] == '\0') + return 0; + } + +#if __BYTE_ORDER == __BIG_ENDIAN + return result; +#else +#define XSWAPU32(w) \ + ((((w) & 0xff00ff00) >> 8) | (((w) & 0xff00ff) << 8)) + + return XSWAPU32 (result); +#endif +} -- cgit v1.1