aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-01 13:55:18 +0000
committerRoland McGrath <roland@gnu.org>1996-05-01 13:55:18 +0000
commit75cd5204dd829d849a6e41380a64cf61d7f406d0 (patch)
tree8d821a60b9fd42bf4965b49faf5e6d13f7cebee3 /locale
parent5bd44955948a63ea9a71726fb2b8b54b970aeb66 (diff)
downloadglibc-75cd5204dd829d849a6e41380a64cf61d7f406d0.zip
glibc-75cd5204dd829d849a6e41380a64cf61d7f406d0.tar.gz
glibc-75cd5204dd829d849a6e41380a64cf61d7f406d0.tar.bz2
Wed May 1 09:10:04 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/strftime.c: Use canonical autoconf nugget for time.h+sys/time.h include. Mon Apr 29 02:48:26 1996 Ulrich Drepper <drepper@cygnus.com> * ctype/ctype-info.c: (__ctype_width): New variable. (__ctype_names): Initialize correctly without offset. * locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c, locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Change copyright. * locale/C-ctype.c (_nl_C_LC_CTYPE_class32): Correct endianess for initialization value. * locale/lc-ctype.c (current): Add parameter for offset. (__ctype32_b, __ctype_width): Add initialization for these variables. * locale/programs/charmap.c: Finish support for WIDTH information. (new_width): New function. * locale/programs/charset.h (width_rule): new data structure. (charset_t): Add elements for width information. * locale/programs/ld-ctype.c (locale_ctype_t): Add element for width information. (allocate_arrays): Add new argument for charset. (ctype_finish): Make sure all characters named in charset width table are known to name table. (ctype_output): Correct handling of class and map name information and write out width information. (find_idx): Prepare for being called with NULL pointer as TABLE argument. This means only allocate name entry. (allocate_arrays): Correct handling of array element -1. Because EOF == -1 the value of element 127 must *not* be mirrored here. Fill width information from charset tables. * locale/programs/localedef.c (main): Correct loop over all categories after change of order from Thu Mar 28 14:22:51 1996. Add new charset argument to call of `write_all_categories'. * locale/programs/locales.h (ctype_finish, ctype_output): New charset argument. * locale/programs/locfile.c (write_all_categories): Call `ctype_output' with additional argument charset. * posix/getconf.c (vars): Add _POSIX_SYNC_IO, _POSIX_ASYNC_IO, and _POSIX_PRIO_IO definitions. * posix/posix2_lim.h: Add definition of _POSIX2_CHARCLASS_NAME_MAX and CHARCLASS_NAME_MAX. * posix/unistd.h: Document _POSIX_SYNC_IO, _POSIX_ASYNC_IO, and _POSIX_PRIO_IO. * stdlib/grouping.h: Prepare for use in wide string functions. * stdlib/stdlib.h: Correct prototypes for __strto*_internal functions. * stdlib/strtod.c: Extend for use as `wcsto{f,d,ld}'. * stdlib/strtol.c: Extend for use as `wcsto{l,ul,q,uq}'. * string/strcoll.c: Extend for use as `wcscoll'. * string/strxfrm.c: Extend for use as `wcsxfrm'. * sysdeps/generic/confname.h: Add definition of _PC_SYNC_IO, _PC_ASYNC_IO, _PC_PRIO_IO and _SC_CHARCLASS_NAME_MAX. * sysdeps/generic/stpncpy.c: Correct return value. * sysdeps/posix/fpathconf.c: Add handling of _PC_SYNC_IO, _PC_ASYNC_IO, and _PC_PRIO_IO. * sysdeps/posix/sysconf.c: Add handling of _SC_REALTIME_SIGNALS, _SC_PRIORITY_SCHEDULING, _SC_TIMERS, _SC_ASYNCHRONOUS_IO, _SC_PRIORITIZED_IO, _SC_SYNCHRONIZED_IO, _SC_FSYNC, _SC_MAPPED_FILES, _SC_MEMLOCK, _SC_MEMLOCK_RANGE, _SC_MEMORY_PROTECTION, _SC_MESSAGE_PASSING, _SC_SEMAPHORES, _SC_SHARED_MEMORY_OBJECTS, and _SC_CHARCLASS_NAME_MAX. * sysdeps/stub/sysconf.c: Ditto. * sysdeps/unix/sysv/sysv4/sysconf.c: Ditto. * sysdeps/unix/sysv/linux/Dist: Add sys/sysctl.h. * sysdeps/unix/sysv/linux/Makefile [subdir == misc] (sysdep_routines): Add s_sysctl and sysctl. * sysdeps/unix/sysv/linux/sys/mman.h: Add declaration of mremap. * sysdeps/unix/sysv/linux/sys/socket.h: New file. Wrapper around kernel header. * sysdeps/unix/sysv/linux/sys/sysctl.h: New file. Define interface to `sysctl' function. * sysdeps/unix/sysv/linux/syscalls.list: Add mremap and _sysctl. * sysdeps/unix/sysv/linux/sysconf.c: Add handling of _SC_CHARCLASS_NAME_MAX. * sysdeps/unix/sysv/linux/sysctl.c: new file. Implement caller of _sysctl system call. * sysvipc/Makefile (routines): Add ftok. * sysvipc/ftok.c: use variable `proj_id' not `id'. Patch by David Mosberger-Tang. * wcsmbs/Makefile (routines): Add wcpcpy, wcpncpy, wcstol, wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll, wcsxfrm, wcwidth, and wcswidth. * wcsmbs/wchar.h: Add declarations for wcpcpy, wcpncpy, wcstol, wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll, wcsxfrm, wcwidth, and wcswidth. Declare internal interfaces for wcsto* functions. [OPTIMIZE]: Define inline functions for wcsto* functions to call internal interface functions. * wcsmbs/wcpcpy.c, wcsmbs/wcpncpy.c: New files. Implement non- standard function equivalent to stpcpy/stpncpy. * wcsmbs/wcscoll.c: Implement `wcscoll' function by using `strcoll' implementation. * wcsmbs/wcscpy.c, wcsmbs/wcsncpy.c: Use wint_t instead of wchar_t. * wcsmbs/wcstod.c: Implement `wcstod' function by using `strtod' implementation. * wcsmbs/wcstof.c: Same for `wcstof'. * wcsmbs/wcstold.c: Same for `strtold'. * wcsmbs/wcstol.c: Implement `wcstol' function by using `strtol' implementation. * wcsmbs/wcstoq.c: Same for `wcstoq'. * wcsmbs/wcstoul.c: Same for `wcstoul'. * wcsmbs/wcstouq.c: Same for `wcstouq'. * wcsmbs/wcswidth.c: Implement `wcswidth' function from X/Open CAE. * wcsmbs/wcwidth.c: Ditto for `wcwidth'. * wcsmbs/wcwidth.h: Common function for definitions of above two functions. * wcsmbs/wcsxfrm.c: Implement `wcsxfrm function by using `strxfrm implementation. * wctype/wctype.c: Remove case for `wctype_t' being 16 bit type. * wctype/wctype.h (wint_t): Protect against multiple definition. (wctype_t): Always define as `unsigned long int'. * wctype.h: New file. Wrapper around wctype/wctype.h. * hurd/hurdstartup.c (_hurd_split_args): Function removed. (_hurd_startup): Use argz functions. * hurd/hurdexec.c: Use argz functions.
Diffstat (limited to 'locale')
-rw-r--r--locale/C-collate.c23
-rw-r--r--locale/C-ctype.c191
-rw-r--r--locale/C-messages.c23
-rw-r--r--locale/C-monetary.c23
-rw-r--r--locale/C-numeric.c23
-rw-r--r--locale/C-time.c23
-rw-r--r--locale/lc-ctype.c19
-rw-r--r--locale/programs/charmap.c69
-rw-r--r--locale/programs/charset.h12
-rw-r--r--locale/programs/ld-ctype.c178
-rw-r--r--locale/programs/localedef.c4
-rw-r--r--locale/programs/locales.h129
-rw-r--r--locale/programs/locfile.c6
-rw-r--r--locale/programs/locfile.h2
14 files changed, 473 insertions, 252 deletions
diff --git a/locale/C-collate.c b/locale/C-collate.c
index 7211eb1..ec467fc 100644
--- a/locale/C-collate.c
+++ b/locale/C-collate.c
@@ -1,8 +1,21 @@
-/* Generated by GNU locale 0.1.
- Copyright (C) 1995 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. */
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+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 "localeinfo.h"
diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index 8bf6bee..95ac311 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -1,4 +1,21 @@
-/* Generated by GNU locale 0.1. */
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+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 "localeinfo.h"
#include <endian.h>
@@ -70,92 +87,92 @@ const char _nl_C_LC_CTYPE_class[768] =
/* 0xfa */ "\002\000" "\002\000" "\002\000" "\002\000" "\002\000" "\002\000"
;
const char _nl_C_LC_CTYPE_class32[1024] =
- /* 0x00 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x03 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x06 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x09 */ "\003\040\000\000" "\002\040\000\000" "\002\040\000\000"
- /* 0x0c */ "\002\040\000\000" "\002\040\000\000" "\002\000\000\000"
- /* 0x0f */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x12 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x15 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x18 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x1b */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x1e */ "\002\000\000\000" "\002\000\000\000" "\001\140\000\000"
- /* 0x21 */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x24 */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x27 */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x2a */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x2d */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x30 */ "\010\330\000\000" "\010\330\000\000" "\010\330\000\000"
- /* 0x33 */ "\010\330\000\000" "\010\330\000\000" "\010\330\000\000"
- /* 0x36 */ "\010\330\000\000" "\010\330\000\000" "\010\330\000\000"
- /* 0x39 */ "\010\330\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x3c */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x3f */ "\004\300\000\000" "\004\300\000\000" "\010\325\000\000"
- /* 0x42 */ "\010\325\000\000" "\010\325\000\000" "\010\325\000\000"
- /* 0x45 */ "\010\325\000\000" "\010\325\000\000" "\010\305\000\000"
- /* 0x48 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
- /* 0x4b */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
- /* 0x4e */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
- /* 0x51 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
- /* 0x54 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
- /* 0x57 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
- /* 0x5a */ "\010\305\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x5d */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x60 */ "\004\300\000\000" "\010\326\000\000" "\010\326\000\000"
- /* 0x63 */ "\010\326\000\000" "\010\326\000\000" "\010\326\000\000"
- /* 0x66 */ "\010\326\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x69 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x6c */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x6f */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x72 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x75 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x78 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
- /* 0x7b */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
- /* 0x7e */ "\004\300\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x81 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x84 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x87 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x8a */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x8d */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x90 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x93 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x96 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x99 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x9c */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0x9f */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xa2 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xa5 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xa8 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xab */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xae */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xb1 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xb4 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xb7 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xba */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xbd */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xc0 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xc3 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xc6 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xc9 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xcc */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xcf */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xd2 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xd5 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xd8 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xdb */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xde */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xe1 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xe4 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xe7 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xea */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xed */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xf0 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xf3 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xf6 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xf9 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xfc */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
- /* 0xff */ "\002\000\000\000"
+ /* 0x00 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x03 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x06 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x09 */ "\000\000\003\040" "\000\000\002\040" "\000\000\002\040"
+ /* 0x0c */ "\000\000\002\040" "\000\000\002\040" "\000\000\002\000"
+ /* 0x0f */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x12 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x15 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x18 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x1b */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x1e */ "\000\000\002\000" "\000\000\002\000" "\000\000\001\140"
+ /* 0x21 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x24 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x27 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x2a */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x2d */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x30 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
+ /* 0x33 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
+ /* 0x36 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
+ /* 0x39 */ "\000\000\010\330" "\000\000\004\300" "\000\000\004\300"
+ /* 0x3c */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x3f */ "\000\000\004\300" "\000\000\004\300" "\000\000\010\325"
+ /* 0x42 */ "\000\000\010\325" "\000\000\010\325" "\000\000\010\325"
+ /* 0x45 */ "\000\000\010\325" "\000\000\010\325" "\000\000\010\305"
+ /* 0x48 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+ /* 0x4b */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+ /* 0x4e */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+ /* 0x51 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+ /* 0x54 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+ /* 0x57 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+ /* 0x5a */ "\000\000\010\305" "\000\000\004\300" "\000\000\004\300"
+ /* 0x5d */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x60 */ "\000\000\004\300" "\000\000\010\326" "\000\000\010\326"
+ /* 0x63 */ "\000\000\010\326" "\000\000\010\326" "\000\000\010\326"
+ /* 0x66 */ "\000\000\010\326" "\000\000\010\306" "\000\000\010\306"
+ /* 0x69 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+ /* 0x6c */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+ /* 0x6f */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+ /* 0x72 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+ /* 0x75 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+ /* 0x78 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+ /* 0x7b */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+ /* 0x7e */ "\000\000\004\300" "\000\000\002\000" "\000\000\002\000"
+ /* 0x81 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x84 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x87 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x8a */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x8d */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x90 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x93 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x96 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x99 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x9c */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0x9f */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xa2 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xa5 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xa8 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xab */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xae */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xb1 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xb4 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xb7 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xba */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xbd */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xc0 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xc3 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xc6 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xc9 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xcc */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xcf */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xd2 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xd5 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xd8 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xdb */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xde */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xe1 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xe4 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xe7 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xea */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xed */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xf0 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xf3 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xf6 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xf9 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xfc */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+ /* 0xff */ "\000\000\002\000"
;
#if BYTE_ORDER == LITTLE_ENDIAN
const char _nl_C_LC_CTYPE_toupper[1536] =
diff --git a/locale/C-messages.c b/locale/C-messages.c
index 6f89919..b118c13 100644
--- a/locale/C-messages.c
+++ b/locale/C-messages.c
@@ -1,8 +1,21 @@
-/* Generated by GNU locale 0.1.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. */
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+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 "localeinfo.h"
diff --git a/locale/C-monetary.c b/locale/C-monetary.c
index 1859422..befb429 100644
--- a/locale/C-monetary.c
+++ b/locale/C-monetary.c
@@ -1,8 +1,21 @@
-/* Generated by GNU locale 0.1.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. */
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+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 "localeinfo.h"
diff --git a/locale/C-numeric.c b/locale/C-numeric.c
index 5d68a89..feb20c8 100644
--- a/locale/C-numeric.c
+++ b/locale/C-numeric.c
@@ -1,8 +1,21 @@
-/* Generated by GNU locale 0.1.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. */
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+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 "localeinfo.h"
diff --git a/locale/C-time.c b/locale/C-time.c
index 6fb5e3e..4bab361 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -1,8 +1,21 @@
-/* Generated by GNU locale 0.1.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. */
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+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 "localeinfo.h"
diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c
index 4b7dcc5..2eeedf8 100644
--- a/locale/lc-ctype.c
+++ b/locale/lc-ctype.c
@@ -43,14 +43,17 @@ _nl_postload_ctype (void)
#define paste(a,b) paste1(a,b)
#define paste1(a,b) a##b
-#define current(unsigned,x) \
- ((const unsigned int *) _NL_CURRENT (LC_CTYPE, paste(_NL_CTYPE_,x)) \
- + 128)
+#define current(type,x,offset) \
+ ((const type *) _NL_CURRENT (LC_CTYPE, paste(_NL_CTYPE_,x)) + offset)
+ extern const unsigned int *__ctype32_b;
extern const unsigned int *__ctype_names;
-
- __ctype_b = current (unsigned short, CLASS);
- __ctype_toupper = current (, bo (TOUPPER));
- __ctype_tolower = current (, bo (TOLOWER));
- __ctype_names = current (unsigned, bo (NAMES));
+ extern const unsigned char *__ctype_width;
+
+ __ctype_b = current (unsigned short int, CLASS, 128);
+ __ctype_toupper = current (int, bo (TOUPPER), 128);
+ __ctype_tolower = current (int, bo (TOLOWER), 128);
+ __ctype32_b = current (unsigned int, CLASS32, 0);
+ __ctype_names = current (unsigned int, bo (NAMES), 0);
+ __ctype_width = current (unsigned char, WIDTH, 0);
}
diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 2b71821..f938d79 100644
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -47,7 +47,9 @@ void *xmalloc (size_t __n);
/* Prototypes for local functions. */
static struct charset_t *parse_charmap (const char *filename);
-
+static void new_width (struct linereader *cmfile, struct charset_t *result,
+ const char *from, const char *to,
+ unsigned long int width);
struct charset_t *
@@ -123,6 +125,8 @@ parse_charmap (const char *filename)
/* Allocate room for result. */
result = (struct charset_t *) xmalloc (sizeof (struct charset_t));
memset (result, '\0', sizeof (struct charset_t));
+ /* The default DEFAULT_WIDTH is 1. */
+ result->width_default = 1;
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
@@ -399,6 +403,10 @@ argument to <%s> must be a single character"),
case 91:
/* Waiting for WIDTH... */
+ if (nowtok == tok_eol)
+ /* Ignore empty lines. */
+ continue;
+
if (nowtok == tok_width_default)
{
state = 92;
@@ -474,7 +482,10 @@ only WIDTH definitions are allowed to follow the CHARMAP definition"));
case 94:
if (nowtok == tok_ellipsis)
- state = 95;
+ {
+ state = 95;
+ continue;
+ }
case 96:
if (nowtok != tok_number)
@@ -482,8 +493,11 @@ only WIDTH definitions are allowed to follow the CHARMAP definition"));
"WIDTH");
else
{
- /* XXX Store width for chars. */
+ /* Store width for chars. */
+ new_width (cmfile, result, from_name, to_name, now->val.num);
+
from_name = NULL;
+ to_name = NULL;
}
lr_ignore_rest (cmfile, nowtok == tok_number);
@@ -507,8 +521,6 @@ only WIDTH definitions are allowed to follow the CHARMAP definition"));
now->val.str.start,
now->val.str.len);
- lr_ignore_rest (cmfile, 1);
-
state = 96;
continue;
@@ -591,3 +603,50 @@ only WIDTH definitions are allowed to follow the CHARMAP definition"));
return result;
}
+
+
+static void
+new_width (struct linereader *cmfile, struct charset_t *result,
+ const char *from, const char *to, unsigned long int width)
+{
+ unsigned int from_val, to_val;
+
+ from_val = charset_find_value (result, from, strlen (from));
+ if (from_val == ILLEGAL_CHAR_VALUE)
+ {
+ lr_error (cmfile, _("unknown character `%s'"), from);
+ return;
+ }
+
+ if (to == NULL)
+ to_val = from_val;
+ else
+ {
+ to_val = charset_find_value (result, to, strlen (to));
+ if (to_val == ILLEGAL_CHAR_VALUE)
+ {
+ lr_error (cmfile, _("unknown character `%s'"), to);
+ return;
+ }
+ }
+
+ if (result->nwidth_rules >= result->nwidth_rules_max)
+ {
+ size_t new_size = result->nwidth_rules + 32;
+ struct width_rule *new_rules =
+ (struct width_rule *) obstack_alloc (&result->mem_pool,
+ (new_size
+ * sizeof (struct width_rule)));
+
+ memcpy (new_rules, result->width_rules,
+ result->nwidth_rules_max * sizeof (struct width_rule));
+
+ result->width_rules = new_rules;
+ result->nwidth_rules_max = new_size;
+ }
+
+ result->width_rules[result->nwidth_rules].from = from_val;
+ result->width_rules[result->nwidth_rules].to = to_val;
+ result->width_rules[result->nwidth_rules].width = (unsigned int) width;
+ ++result->nwidth_rules;
+}
diff --git a/locale/programs/charset.h b/locale/programs/charset.h
index 222d468..1e8819c 100644
--- a/locale/programs/charset.h
+++ b/locale/programs/charset.h
@@ -26,11 +26,23 @@ Boston, MA 02111-1307, USA. */
#include "linereader.h"
+struct width_rule
+{
+ unsigned int from;
+ unsigned int to;
+ unsigned int width;
+};
+
+
struct charset_t
{
const char *code_set_name;
int mb_cur_min;
int mb_cur_max;
+
+ struct width_rule *width_rules;
+ size_t nwidth_rules;
+ size_t nwidth_rules_max;
int width_default;
struct obstack mem_pool;
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index c1cc8e5..99e9ebe 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -107,6 +107,7 @@ struct locale_ctype_t
u32_t **map_el;
u32_t *class_name_ptr;
u32_t *map_name_ptr;
+ unsigned char *width;
};
@@ -120,7 +121,8 @@ static u32_t *find_idx (struct locale_ctype_t *ctype, u32_t **table,
size_t *max, size_t *act, unsigned int idx);
static void set_class_defaults (struct locale_ctype_t *ctype,
struct charset_t *charset);
-static void allocate_arrays (struct locale_ctype_t *ctype);
+static void allocate_arrays (struct locale_ctype_t *ctype,
+ struct charset_t *charset);
void
@@ -321,20 +323,33 @@ character %s'%s' in class `%s' must not be in class `%s'"),
valid_table[cnt].name);
else
ELEM (ctype, class_collection, , space_value) |= BIT (tok_print);
+
+ /* Now that the tests are done make sure the name array contains all
+ characters which are handled in the WIDTH section of the
+ character set definition file. */
+ if (charset->width_rules != NULL)
+ for (cnt = 0; cnt < charset->nwidth_rules; ++cnt)
+ {
+ size_t inner;
+ for (inner = charset->width_rules[cnt].from;
+ inner <= charset->width_rules[cnt].to; ++inner)
+ (void) find_idx (ctype, NULL, NULL, NULL, inner);
+ }
}
void
-ctype_output (struct localedef_t *locale, const char *output_path)
+ctype_output (struct localedef_t *locale, struct charset_t *charset,
+ const char *output_path)
{
struct locale_ctype_t *ctype = locale->categories[LC_CTYPE].ctype;
const size_t nelems = (_NL_ITEM_INDEX (_NL_NUM_LC_CTYPE)
+ 2 * (ctype->map_collection_nr - 2));
- struct iovec iov[2 + nelems + (ctype->nr_charclass + 1)
- + (ctype->map_collection_nr + 1)];
+ struct iovec iov[2 + nelems + ctype->nr_charclass
+ + ctype->map_collection_nr];
struct locale_file data;
u32_t idx[nelems];
- size_t elem, cnt, offset;
+ size_t elem, cnt, offset, total;
if ((locale->binary & (1 << LC_CTYPE)) != 0)
@@ -349,7 +364,7 @@ ctype_output (struct localedef_t *locale, const char *output_path)
/* Now prepare the output: Find the sizes of the table we can use. */
- allocate_arrays (ctype);
+ allocate_arrays (ctype, charset);
data.magic = LIMAGIC (LC_CTYPE);
data.n = nelems;
@@ -369,8 +384,10 @@ ctype_output (struct localedef_t *locale, const char *output_path)
{
#define CTYPE_DATA(name, base, len) \
case _NL_ITEM_INDEX (name): \
- iov[2 + elem].iov_base = base; \
- iov[2 + elem].iov_len = len; \
+ iov[2 + elem + offset].iov_base = base; \
+ iov[2 + elem + offset].iov_len = len; \
+ if (elem + 1 < nelems) \
+ idx[elem + 1] = idx[elem] + iov[2 + elem + offset].iov_len; \
break
CTYPE_DATA (_NL_CTYPE_CLASS,
@@ -412,15 +429,46 @@ ctype_output (struct localedef_t *locale, const char *output_path)
CTYPE_DATA (_NL_CTYPE_HASH_LAYERS,
&ctype->plane_cnt, sizeof (u32_t));
- CTYPE_DATA (_NL_CTYPE_CLASS_NAMES,
- ctype->class_name_ptr,
- ctype->nr_charclass * sizeof (u32_t));
- CTYPE_DATA (_NL_CTYPE_MAP_NAMES,
- ctype->map_name_ptr,
- ctype->map_collection_nr * sizeof (u32_t));
+ case _NL_ITEM_INDEX (_NL_CTYPE_CLASS_NAMES):
+ /* The class name array. */
+ total = 0;
+ for (cnt = 0; cnt < ctype->nr_charclass; ++cnt, ++offset)
+ {
+ iov[2 + elem + offset].iov_base
+ = (void *) ctype->classnames[cnt];
+ iov[2 + elem + offset].iov_len
+ = strlen (ctype->classnames[cnt]) + 1;
+ total += iov[2 + elem + offset].iov_len;
+ }
+ iov[2 + elem + offset].iov_base = (void *) "";
+ iov[2 + elem + offset].iov_len = 1;
+ ++total;
+
+ if (elem + 1 < nelems)
+ idx[elem + 1] = idx[elem] + total;
+ break;
+
+ case _NL_ITEM_INDEX (_NL_CTYPE_MAP_NAMES):
+ /* The class name array. */
+ total = 0;
+ for (cnt = 0; cnt < ctype->map_collection_nr; ++cnt, ++offset)
+ {
+ iov[2 + elem + offset].iov_base
+ = (void *) ctype->mapnames[cnt];
+ iov[2 + elem + offset].iov_len
+ = strlen (ctype->mapnames[cnt]) + 1;
+ total += iov[2 + elem + offset].iov_len;
+ }
+ iov[2 + elem + offset].iov_base = (void *) "";
+ iov[2 + elem + offset].iov_len = 1;
+ ++total;
+
+ if (elem + 1 < nelems)
+ idx[elem + 1] = idx[elem] + total;
+ break;
CTYPE_DATA (_NL_CTYPE_WIDTH,
- NULL, 0); /* Not yet implemented. */
+ ctype->width, ctype->plane_size * ctype->plane_cnt);
default:
assert (! "unknown CTYPE element");
@@ -431,49 +479,23 @@ ctype_output (struct localedef_t *locale, const char *output_path)
size_t nr = (elem - _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE)) >> 1;
if (((elem - _NL_ITEM_INDEX (_NL_NUM_LC_CTYPE)) & 1) == 0)
- iov[2 + elem].iov_base = ctype->map_eb[nr];
+ iov[2 + elem + offset].iov_base = ctype->map_eb[nr];
else
- iov[2 + elem].iov_base = ctype->map_el[nr];
-
- iov[2 + elem].iov_len = ((ctype->plane_size * ctype->plane_cnt + 128)
- * sizeof (u32_t));
- }
-
- if (elem + 1 < nelems)
- idx[elem + 1] = idx[elem] + iov[2 + elem].iov_len;
- }
-
- offset = idx[elem - 1] + iov[2 + elem - 1].iov_len;
-
- /* The class name array. */
- for (cnt = 0; cnt < ctype->nr_charclass; ++cnt, ++elem)
- {
- iov[2 + elem].iov_base = (void *) ctype->classnames[cnt];
- iov[2 + elem].iov_len = strlen (ctype->classnames[cnt]) + 1;
-
- ctype->class_name_ptr[cnt] = offset;
- offset += iov[2 + elem].iov_len;
- }
- iov[2 + elem].iov_base = (void *) "";
- iov[2 + elem].iov_len = 1;
- ++elem;
+ iov[2 + elem + offset].iov_base = ctype->map_el[nr];
- /* The map name array. */
- for (cnt = 0; cnt < ctype->map_collection_nr; ++cnt, ++elem)
- {
- iov[2 + elem].iov_base = (void *) ctype->mapnames[cnt];
- iov[2 + elem].iov_len = strlen (ctype->mapnames[cnt]) + 1;
+ iov[2 + elem + offset].iov_len = ((ctype->plane_size
+ * ctype->plane_cnt + 128)
+ * sizeof (u32_t));
- ctype->map_name_ptr[cnt] = offset;
- offset += iov[2 + elem].iov_len;
+ if (elem + 1 < nelems)
+ idx[elem + 1] = idx[elem] + iov[2 + elem + offset].iov_len;
+ }
}
- iov[2 + elem].iov_base = (void *) "";
- iov[2 + elem].iov_len = 1;
- ++elem;
- assert (elem == nelems + ctype->nr_charclass + ctype->map_collection_nr + 2);
+ assert (2 + elem + offset == (nelems + ctype->nr_charclass
+ + ctype->map_collection_nr + 2));
- write_locale_data (output_path, "LC_CTYPE", 2 + elem, iov);
+ write_locale_data (output_path, "LC_CTYPE", 2 + elem + offset, iov);
}
@@ -813,6 +835,8 @@ implementation limit: no more than %d character maps allowed"),
}
+/* We have to be prepared that TABLE, MAX, and ACT can be NULL. This
+ is possible if we only want ot extend the name array. */
static u32_t *
find_idx (struct locale_ctype_t *ctype, u32_t **table, size_t *max,
size_t *act, unsigned int idx)
@@ -820,7 +844,7 @@ find_idx (struct locale_ctype_t *ctype, u32_t **table, size_t *max,
size_t cnt;
if (idx < 256)
- return &(*table)[idx];
+ return table == NULL ? NULL : &(*table)[idx];
for (cnt = 256; cnt < ctype->charnames_act; ++cnt)
if (ctype->charnames[cnt] == idx)
@@ -840,6 +864,10 @@ find_idx (struct locale_ctype_t *ctype, u32_t **table, size_t *max,
ctype->charnames[ctype->charnames_act++] = idx;
}
+ if (table == NULL)
+ /* We have done everything we are asked to do. */
+ return NULL;
+
if (cnt >= *act)
{
if (cnt >= *max)
@@ -1126,7 +1154,7 @@ character `%s' not defined while needed as default value"),
static void
-allocate_arrays (struct locale_ctype_t *ctype)
+allocate_arrays (struct locale_ctype_t *ctype, struct charset_t *charset)
{
size_t idx;
@@ -1182,6 +1210,7 @@ Computing table size for character classes might take a while..."),
fprintf (stderr, _(" done\n"));
+
#if __BYTE_ORDER == __LITTLE_ENDIAN
# define NAMES_B1 ctype->names_el
# define NAMES_B2 ctype->names_eb
@@ -1246,8 +1275,9 @@ Computing table size for character classes might take a while..."),
ctype->ctype_b[128 + ctype->charnames[idx]]
= TRANS (ctype->class_collection[idx]);
- /* Mirror first 128 entries. */
- for (idx = 0; idx < 128; ++idx)
+ /* Mirror first 127 entries. We must take care that entry -1 is not
+ mirrored because EOF == -1. */
+ for (idx = 0; idx < 127; ++idx)
ctype->ctype_b[idx] = ctype->ctype_b[256 + idx];
/* The 32 bit array contains all characters. */
@@ -1292,10 +1322,13 @@ Computing table size for character classes might take a while..."),
MAP_B1[idx][128 + ctype->charnames[idx2]] =
ctype->map_collection[idx][idx2];
- /* Mirror first 128 entries. */
- for (idx2 = 0; idx2 < 128; ++idx2)
+ /* Mirror first 127 entries. We must take care not to map entry
+ -1 because EOF == -1. */
+ for (idx2 = 0; idx2 < 127; ++idx2)
MAP_B1[idx][idx2] = MAP_B1[idx][256 + idx2];
+ /* EOF must map to EOF. */
+ MAP_B1[idx][127] = EOF;
/* And now the other byte order. */
for (idx2 = 0; idx2 < ctype->plane_size * ctype->plane_cnt + 128; ++idx2)
@@ -1307,4 +1340,33 @@ Computing table size for character classes might take a while..."),
* sizeof (u32_t));
ctype->map_name_ptr = (u32_t *) xmalloc (ctype->map_collection_nr
* sizeof (u32_t));
+
+ /* Array for width information. Because the expected width are very
+ small we use only one single byte. This save space and we need
+ not provide the information twice with both endianesses. */
+ ctype->width = (unsigned char *) xmalloc (ctype->plane_size
+ * ctype->plane_cnt);
+ /* Initialize with default width value. */
+ memset (ctype->width, charset->width_default,
+ ctype->plane_size * ctype->plane_cnt);
+ if (charset->width_rules != NULL)
+ {
+ size_t cnt;
+
+ for (cnt = 0; cnt < charset->nwidth_rules; ++cnt)
+ if (charset->width_rules[cnt].width != charset->width_default)
+ for (idx = charset->width_rules[cnt].from;
+ idx <= charset->width_rules[cnt].to; ++idx)
+ {
+ size_t nr = idx % ctype->plane_size;
+ size_t depth = 0;
+
+ while (NAMES_B1[nr + depth * ctype->plane_size] != nr)
+ ++depth;
+ assert (depth < ctype->plane_cnt);
+
+ ctype->width[nr + depth * ctype->plane_size]
+ = charset->width_rules[cnt].width;
+ }
+ }
}
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index a98bac4..72eb2d3 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -231,7 +231,7 @@ main (int argc, char *argv[])
for (act_add_locdef = copy_list; act_add_locdef != NULL;
act_add_locdef = act_add_locdef->next)
{
- for (cat = LC_COLLATE; cat <= LC_MESSAGES; ++cat)
+ for (cat = LC_CTYPE; cat <= LC_MESSAGES; ++cat)
if ((act_add_locdef->mask & (1 << cat)) != 0)
{
act_add_locdef->mask &= ~(1 << cat);
@@ -335,7 +335,7 @@ cannot `stat' locale file `%s'"),
error (4, cannot_write_why, _("cannot write output files to `%s'"),
output_path);
else
- write_all_categories (localedef, output_path);
+ write_all_categories (localedef, charset, output_path);
}
else
error (4, 0, _("no output file produced because warning were issued"));
diff --git a/locale/programs/locales.h b/locale/programs/locales.h
index 3c7676b..a992642 100644
--- a/locale/programs/locales.h
+++ b/locale/programs/locales.h
@@ -79,129 +79,130 @@ charclass_to_bit (enum token_t tok)
/* Remember name of newly created charclass. */
void ctype_startup (struct linereader *lr, struct localedef_t *locale,
- struct charset_t *__charset);
-void ctype_finish (struct localedef_t *__locale, struct charset_t *__charset);
+ struct charset_t *charset);
+void ctype_finish (struct localedef_t *locale, struct charset_t *charset);
-void ctype_output (struct localedef_t *locale, const char *output_path);
+void ctype_output (struct localedef_t *locale, struct charset_t *charset,
+ const char *output_path);
int ctype_is_charclass (struct linereader *lr, struct localedef_t *locale,
- const char *__name);
+ const char *name);
void ctype_class_new (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, struct token *__code,
- struct charset_t *__charset);
+ enum token_t tok, struct token *code,
+ struct charset_t *charset);
void ctype_class_start (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, const char *__name,
- struct charset_t *__charset);
+ enum token_t tok, const char *name,
+ struct charset_t *charset);
void ctype_class_from (struct linereader *lr, struct localedef_t *locale,
- struct token *__code, struct charset_t *__charset);
+ struct token *code, struct charset_t *charset);
void ctype_class_to (struct linereader *lr, struct localedef_t *locale,
- struct token *__code, struct charset_t *__charset);
+ struct token *code, struct charset_t *charset);
void ctype_class_end (struct linereader *lr, struct localedef_t *locale);
int ctype_is_charmap (struct linereader *lr, struct localedef_t *locale,
- const char *__name);
+ const char *name);
void ctype_map_new (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, struct token *__code,
- struct charset_t *__charset);
+ enum token_t tok, struct token *code,
+ struct charset_t *charset);
void ctype_map_start (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, const char *__name,
- struct charset_t *__charset);
+ enum token_t tok, const char *name,
+ struct charset_t *charset);
void ctype_map_from (struct linereader *lr, struct localedef_t *locale,
- struct token *__code, struct charset_t *__charset);
+ struct token *code, struct charset_t *charset);
void ctype_map_to (struct linereader *lr, struct localedef_t *locale,
- struct token *__code, struct charset_t *__charset);
+ struct token *code, struct charset_t *charset);
void ctype_map_end (struct linereader *lr, struct localedef_t *locale);
/* Handle LC_COLLATE category. */
-void collate_startup (struct linereader *__lr, struct localedef_t *__locale,
- struct charset_t *__charset);
+void collate_startup (struct linereader *lr, struct localedef_t *locale,
+ struct charset_t *charset);
-void collate_finish (struct localedef_t *__locale,
- struct charset_t *__charset);
+void collate_finish (struct localedef_t *locale,
+ struct charset_t *charset);
void collate_output (struct localedef_t *locale, const char *output_path);
-void collate_element_to (struct linereader *__lr, struct localedef_t *__locale,
- struct token *__code, struct charset_t *__charset);
-void collate_element_from (struct linereader *__lr,
- struct localedef_t *__locale, struct token *__code,
- struct charset_t *__charset);
-void collate_symbol (struct linereader *__lr, struct localedef_t *__locale,
- struct token *__code, struct charset_t *__charset);
-void collate_new_order (struct linereader *__lr, struct localedef_t *__locale,
- enum coll_sort_rule __sort_rule);
-void collate_build_arrays (struct linereader *__lr,
- struct localedef_t *__locale);
-int collate_order_elem (struct linereader *__lr, struct localedef_t *__locale,
- struct token *__code, struct charset_t *__charset);
-int collate_weight_bsymbol (struct linereader *__lr,
- struct localedef_t *__locale,
- struct token *__code, struct charset_t *__charset);
-int collate_next_weight (struct linereader *__lr,
- struct localedef_t *__locale);
-int collate_simple_weight (struct linereader *__lr,
- struct localedef_t *__locale,
- struct token *__code, struct charset_t *__charset);
-void collate_end_weight (struct linereader *__lr,
- struct localedef_t *__locale);
+void collate_element_to (struct linereader *lr, struct localedef_t *locale,
+ struct token *code, struct charset_t *charset);
+void collate_element_from (struct linereader *lr,
+ struct localedef_t *locale, struct token *code,
+ struct charset_t *charset);
+void collate_symbol (struct linereader *lr, struct localedef_t *locale,
+ struct token *code, struct charset_t *charset);
+void collate_new_order (struct linereader *lr, struct localedef_t *locale,
+ enum coll_sort_rule sort_rule);
+void collate_build_arrays (struct linereader *lr,
+ struct localedef_t *locale);
+int collate_order_elem (struct linereader *lr, struct localedef_t *locale,
+ struct token *code, struct charset_t *charset);
+int collate_weight_bsymbol (struct linereader *lr,
+ struct localedef_t *locale,
+ struct token *code, struct charset_t *charset);
+int collate_next_weight (struct linereader *lr,
+ struct localedef_t *locale);
+int collate_simple_weight (struct linereader *lr,
+ struct localedef_t *locale,
+ struct token *code, struct charset_t *charset);
+void collate_end_weight (struct linereader *lr,
+ struct localedef_t *locale);
/* Handle LC_MONETARY category. */
-void monetary_startup (struct linereader *__lr, struct localedef_t *__locale,
- struct charset_t *__charset);
+void monetary_startup (struct linereader *lr, struct localedef_t *locale,
+ struct charset_t *charset);
-void monetary_finish (struct localedef_t *__locale);
+void monetary_finish (struct localedef_t *locale);
void monetary_output (struct localedef_t *locale, const char *output_path);
void monetary_add (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, struct token *__code,
- struct charset_t *__charset);
+ enum token_t tok, struct token *code,
+ struct charset_t *charset);
/* Handle LC_NUMERIC category. */
-void numeric_startup (struct linereader *__lr, struct localedef_t *__locale,
- struct charset_t *__charset);
+void numeric_startup (struct linereader *lr, struct localedef_t *locale,
+ struct charset_t *charset);
-void numeric_finish (struct localedef_t *__locale);
+void numeric_finish (struct localedef_t *locale);
void numeric_output (struct localedef_t *locale, const char *output_path);
void numeric_add (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, struct token *__code,
- struct charset_t *__charset);
+ enum token_t tok, struct token *code,
+ struct charset_t *charset);
/* Handle LC_TIME category. */
-void time_startup (struct linereader *__lr, struct localedef_t *__locale,
- struct charset_t *__charset);
+void time_startup (struct linereader *lr, struct localedef_t *locale,
+ struct charset_t *charset);
-void time_finish (struct localedef_t *__locale);
+void time_finish (struct localedef_t *locale);
void time_output (struct localedef_t *locale, const char *output_path);
void time_add (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, struct token *__code,
- struct charset_t *__charset);
+ enum token_t tok, struct token *code,
+ struct charset_t *charset);
/* Handle LC_MESSAGES category. */
-void messages_startup (struct linereader *__lr, struct localedef_t *__locale,
- struct charset_t *__charset);
+void messages_startup (struct linereader *lr, struct localedef_t *locale,
+ struct charset_t *charset);
-void messages_finish (struct localedef_t *__locale);
+void messages_finish (struct localedef_t *locale);
void messages_output (struct localedef_t *locale, const char *output_path);
void messages_add (struct linereader *lr, struct localedef_t *locale,
- enum token_t __tok, struct token *__code,
- struct charset_t *__charset);
+ enum token_t tok, struct token *code,
+ struct charset_t *charset);
#endif /* locales.h */
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index cb98a5d..89dc6bb 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA. */
#include <fcntl.h>
#include <locale.h>
#include <malloc.h>
+#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -913,10 +914,11 @@ check_all_categories (struct localedef_t *locale, struct charset_t *charset)
void
-write_all_categories (struct localedef_t *locale, const char *output_path)
+write_all_categories (struct localedef_t *locale, struct charset_t *charset,
+ const char *output_path)
{
/* Call all functions to write locale data. */
- ctype_output (locale, output_path);
+ ctype_output (locale, charset, output_path);
collate_output (locale, output_path);
monetary_output (locale, output_path);
numeric_output (locale, output_path);
diff --git a/locale/programs/locfile.h b/locale/programs/locfile.h
index e337e96..a0fe06b 100644
--- a/locale/programs/locfile.h
+++ b/locale/programs/locfile.h
@@ -66,7 +66,7 @@ void check_all_categories (struct localedef_t *locale,
struct charset_t *charset);
void write_all_categories (struct localedef_t *locale,
- const char *output_path);
+ struct charset_t *charset, const char *output_path);
void write_locale_data (const char *output_path, const char *category,