From 4bca4c174852bfc348f99e85684fc8f65631d125 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 7 Apr 1998 09:21:28 +0000 Subject: Update. 1998-04-07 08:51 Ulrich Drepper * iconv/gconv.c: Take care for NULL arguments. * iconv/gconv_dl.c: Make find_func function global. * iconv/gconv_int.h: Add prototype for __gconv_find_func. Add prototypes for ASCII conversion functions. * iconv/gconv_simple.c: Add ASCII conversion functions. * locale/C-ctype.c: Correct charset name. * wcsmbs/Makefile (distribute): Add wcsmbsload.h. (routines): Remove wmemrtowcs and wmemrtombs, add wcsnlen and wcsmbsload. * wcsmbs/btowc.c: Rewrite to use iconv functionality. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * wcsmbs/wchar.h: Add prototype for __wcslen, wcsnlen. Remove prototypes for wmemr*. * wcsmbs/wcslen.c: Rename to __wcslen and make wcslen weak alias. * wcsmbs/wcsnlen.c: New file. * wcsmbs/wcsmbsload.c: New file. * wcsmbs/wcsmbsload.h: New file. * manual/filesys.texi: Mention risks of tmpnam and mktemp. * manual/install.texi: Describe some more critical points. * string/string.h: Add prototype for __strnlen. * string/strnlen.c: Rename to __strnlen and make strnlen weak alias. * sysdeps/posix/mktemp.c: Rewrite to allow many more files and much less predictable names. * sysdeps/posix/mkstemp.c: Likewise. 1998-04-05 Andreas Jaeger * manual/libc.texinfo (Top): Change "file namespace" to "local namespace". * manual/socket.texi: Change file namespace to local namespace. (Out-of-Band Data): Remove unneeded variable link. (Host Address Functions): Use uint32_t consequently and add a number of clarifications for IPv4/IPv6, classless addresses. (Internet Namespace): Added some paragraphs about IPv6. Based on suggestions by Francesco Potorti` . 1998-04-05 Philip Blundell Update for draft-ietf-ipngwg-bsd-api-new-01.txt: * resolv/netdb.h (getnameinfo): Use `socklen_t' not `size_t'. (NI_NUMERICHOST, et al.): Tidy up and add comments. (AI_NUMERICHOST): Define. (getnodebyname): New prototype. (AI_V4MAPPED, et al.): New constants. * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h (SA_LEN): New macro.< * sysdeps/generic/bits/sockaddr.h (SA_LEN): Likewise. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add sa_len for socket. * sysdeps/unix/sysv/linux/sa_len.c: New file. * sysdeps/unix/sysv/linux/Dist: Add sa_len.c. * sysdeps/unix/sysv/linux/bits/socket.h: Make multiple #inclusion safe. * sysdeps/generic/bits/sockunion.h: New file, defining sockaddr_union. * sysdeps/unix/sysv/linux/bits/sockunion.h: Likewise. * socket/Makefile (headers): Add bits/sockunion.h. * socket/sys/socket.h: Include * inet/netinet/in.h: Include rather than , to avoid getting sockaddr_union defined. * sysdeps/generic/bits/socket.h: Allow inclusion from netinet.in.h. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Remove use of SIOCGIFCOUNT (2.2.x kernels won't have it). 1998-04-06 21:21 Ulrich Drepper * sysdeps/mach/hurd/bits/ioctls.h: Allow inclusion from hurd/ioctl.h. * sysdeps/mach/hurd/dl-sysdep.c: Use __ptr_t not caddr_t. * iconv/gconv_conf.c: Define MAXPATHLEN if not available before. Patches by UCHIYAMA Yasushi . 1998-04-05 Philip Blundell * manual/socket.texi (Socket Addresses): Fix a typo. (Interface Naming): New section. 1998-04-05 23:29 Zack Weinberg * configure.in: Check for CC using $ac_tool_prefix, to handle cross-compilation. Use AC_CHECK_TOOL to find MiG. * config.make.in: Add MIG to be substituted. * mach/Machrules: Don't define MIG variable. Patch by Gordon Matzigkeit . 1998-04-05 Mark Kettenis * elf/dl-load.c (decompose_rpath): Use local_strdup instead of strdupa to copy rpath. 1998-04-05 Andreas Schwab * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-04-05 Andreas Schwab * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-04-05 Andreas Schwab * configure.in: Fix gcc version check. * aclocal.m4 (AC_PROG_CHECK_VER): Rewritten to make less confusing. 1998-03-31 Mark Kettenis * sysdeps/unix/bsd/unlockpt.c (unlockpt): Call __ptsname_r instead of ptsname_r. * stdlib/stdlib.h: Change prototype of ptsname_r to make it more like ttyname_r. * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): Likewise. * sysdeps/generic/ptsname.c (__ptsname_r): Likewise. * sysdeps/unix/grantpt.c (grantpt): Change check of return value of __ptsname_r accordingly. * login/openpty.c (openpty): Likewise. 1998-06-04 18:47 H.J. Lu * libio/fileops.c (_IO_file_xsgetn): Adjust pointers. 1998-04-06 13:58 Andreas Schwab * Makeconfig (libtypes): Redo H.J. Lu's change of 1998-03-27. * Makerules: Readd missing rule for $(objpfx)stamp.oS. 1998-04-06 Thorsten Kukuk * nis/ypclnt.c: Don't give YPERR_RPC back, use the do_ypcall return value for better error checking. --- wcsmbs/wcsmbsload.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 wcsmbs/wcsmbsload.c (limited to 'wcsmbs/wcsmbsload.c') diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c new file mode 100644 index 0000000000..cf854d9125 --- /dev/null +++ b/wcsmbs/wcsmbsload.c @@ -0,0 +1,132 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1998. + + 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 +#include + + +/* Last loaded locale for LC_CTYPE. We initialize for the C locale + which is enabled at startup. */ +extern const struct locale_data _nl_C_LC_CTYPE; +const struct locale_data *__wcsmbs_last_locale = &_nl_C_LC_CTYPE; + + +/* These are the descriptions for the default conversion functions. */ +static struct gconv_step to_wc = +{ + shlib_handle: NULL, + modname: NULL, + counter: INT_MAX, + from_name: "ANSI_X3.4-1968", + to_name: "ISO-10646/UCS4/", + fct: __gconv_transform_ascii_ucs4, + init_fct: NULL, + end_fct: NULL, + data: NULL +}; + +static struct gconv_step to_mb = +{ + shlib_handle: NULL, + modname: NULL, + counter: INT_MAX, + from_name: "ISO-10646/UCS4/", + to_name: "ANSI_X3.4-1968", + fct: __gconv_transform_ucs4_ascii, + init_fct: NULL, + end_fct: NULL, + data: NULL +}; + + +/* For the default locale we only have to handle ANSI_X3.4-1968. */ +struct gconv_fcts __wcsmbs_gconv_fcts = +{ + towc: &to_wc, + tomb: &to_mb +}; + + +static inline struct gconv_step * +getfct (const char *to, const char *from) +{ + size_t nsteps; + struct gconv_step *result; + + if (__gconv_find_transform (to, from, &result, &nsteps) != GCONV_OK) + /* Loading the conversion step is not possible. */ + return NULL; + + /* We must only have one step in this conversion. */ + if (nsteps != 1) + return NULL; + + return result; +} + + +/* Load conversion functions for the currently selected locale. */ +void +__wcsmbs_load_conv (const struct locale_data *new_category) +{ + /* We must modify global data. */ + __libc_lock_define_initialized (static, lock) + + /* Acquire the lock. */ + __libc_lock_lock (lock); + + /* We should repest the test since while we waited some other thread + might have run this function. */ + if (__wcsmbs_last_locale != new_category) + { + if (new_category->name == _nl_C_name) /* Yes, pointer comparison. */ + { + failed: + __wcsmbs_gconv_fcts.towc = &to_wc; + __wcsmbs_gconv_fcts.tomb = &to_mb; + } + else + { + /* We must find the real functions. */ + const char *charset_name; + + /* Get name of charset of the locale. */ + charset_name = new_category->values[_NL_ITEM_INDEX(CODESET)].string; + + __wcsmbs_gconv_fcts.tomb = getfct (charset_name, "ISO-10646/UCS4/"); + __wcsmbs_gconv_fcts.towc = getfct ("ISO-10646/UCS4/", charset_name); + + /* If any of the conversion functions is not available we don't + use any since this would mean we cannot convert back and + forth.*/ + if (__wcsmbs_gconv_fcts.towc == NULL + || __wcsmbs_gconv_fcts.tomb == NULL) + goto failed; + } + + /* Set last-used variable for current locale. */ + __wcsmbs_last_locale = new_category; + } + + __libc_lock_unlock (lock); +} -- cgit 1.4.1