From 6973fc01278d6c8a5f309738d641a68228efe5ed Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 18 Nov 1997 02:50:07 +0000 Subject: Update. 1997-11-18 02:31 Ulrich Drepper * iconv/Makefile: New file. * iconv/gconv.c: New file. * iconv/gconv.h: New file. * iconv/gconv_builtin.c: New file. * iconv/gconv_builtin.h: New file. * iconv/gconv_close.c: New file. * iconv/gconv_conf.c: New file. * iconv/gconv_db.c: New file. * iconv/gconv_dl.c: New file. * iconv/gconv_open.c: New file. * iconv/gconv_simple.c: New file. * iconv/iconv.c: New file. * iconv/iconv.h: New file. * iconv/iconv_close.c: New file. * iconv/iconv_open.c: New file. * include/gconv.h: New file. * Makeconfig: Define gconvdir. * Makefile (subdirs): Add iconv. * string/bits/string2.h: Add optimization for strtok_r. * sysdeps/generic/_G_config.h: Define __need_NULL to get definition for NULL. Reported by H.J. Lu . * configure.in: Correct test for bash2. * locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts. (CFLAGS-locfile.c): Likewise. Suggested by Zack Weinberg . * misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for non-existing entry if the table is full. * posix/regex.h: Pretty print. * stdio-common/printf_fp.c: Don't define NDEBUG if already defined. * sysdeps/posix/ctermid.c: Simplify a bit. * sysdeps/unix/sysv/linux/net/if.h: Pretty print. 1997-11-17 Andreas Jaeger * sysdeps/unix/sysv/linux/sys/quota.h: Add include for instead of . 1997-11-16 Andreas Schwab * math/libm-test.c (asin_test): Add epsilon for asin (0.5). 1997-11-16 17:09 H.J. Lu * libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen, fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0. (_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1. (_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose, fclose): Added to GLIBC_2.1. * libio/Makefile (routines, shared-only-routines): Add oldiofclose. Remove oldfreopen. * libio/freopen.c (freopen): When PIC is defined, call _IO_old_freopen () for old stdio. * libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose. (_IO_fclose, fclose): Use _IO_new_fclose as default version for GLIBC_2.1. * libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it instead of _IO_file_close_it. * libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed to _IO_2_1_stdxxx_. (_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC * libio/libioP.h (_IO_old_do_flush): New. * libio/oldfileops.c (_IO_old_file_close_it, _IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync): Call _IO_old_do_flush () instead of _IO_do_flush (). (_IO_old_file_xsputn): Call _IO_old_do_write () instead of _IO_do_write (). * libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init () instead of _IO_file_init (). Bind old symbols to version GLIBC_2.0. * libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version. (_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to _IO_stdxxx_. (_IO_check_libio): New function in .init. * libio/oldiofclose.c: New file. * libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_, _IO_new_stderr_): Changed to _IO_2_1_stdxxx_. (DEF_STDFILE): Don't use default_symbol_version. * libio/stdio.c (stdin, stdout, stderr): Set to _IO_2_1_stdxxx_._ (_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of stdxxx. * csu/Makefile (distribute): Add init.c. (extra-objs): Add init.o for ELF. (start-installed-name): Add $(objpfx)init.o. * csu/init.c: New file. 1997-11-12 08:02 H.J. Lu * elf/dl-lookup.c (do_lookup): Don't use the hidden base definition as the default. 1997-08-27 Klaus Espenlaub * erand48_r.c (__erand48_r): Implement for 32 bit short int. 1997-11-15 Andreas Jaeger * elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2 (PR 351). 1997-11-16 21:01 Philip Blundell * sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not to preserve condition codes on function call. 1997-11-13 Andreas Jaeger * sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l. 1997-11-14 Andreas Jaeger * math/libm-test.c (asin_test): Add epsilon for float. (tan_test): Add epsilon for float. (log1p_test): Add epsilon for float. (inverse_functions): Add epsilons. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add net/if_packet.h. * sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h. 1997-11-10 Andreas Schwab * md5-crypt/Makefile (extra-objs): Make recursively expanded variable, since $(object-suffixes) is not defined yet. 1997-11-11 Andreas Schwab * db2/Makefile (distribute): db185/db185_int.src -> db185/db185_int.h. 1997-11-11 Andreas Schwab * misc/tst-fdset.c: Don't require the value of FD_ISSET to be exactly one. 1997-11-11 Andreas Schwab * sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level * sysdeps/generic/e_acosl.c: Likewise. * sysdeps/generic/e_asinl.c: Likewise. * sysdeps/generic/e_atan2l.c: Likewise. * sysdeps/generic/e_expl.c: Likewise. * sysdeps/generic/e_fmodl.c: Likewise. * sysdeps/generic/e_j0l.c: Likewise. * sysdeps/generic/e_j1l.c: Likewise. * sysdeps/generic/e_jnl.c: Likewise. * sysdeps/generic/e_lgammal_r.c: Likewise. * sysdeps/generic/e_log10l.c: Likewise. * sysdeps/generic/e_logl.c: Likewise. * sysdeps/generic/e_powl.c: Likewise. * sysdeps/generic/e_sqrtl.c: Likewise. * sysdeps/generic/e_exp2l.c: Likewise. 1997-11-11 Andreas Schwab * Make-dist (+sysdep-names): Remove extra paren. * Makefile (distribute): Add stub-tag.h. * elf/Makefile (distribute): Add atomicity.h. * stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Add net/if_packet.h. * sysdeps/alpha/Dist: Remove setjmp_aux.c. * sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c, net/if_packet.h, scsi/sg.h. 1997-11-13 Andreas Schwab * Makefile (install): Quote $(CC) expansion. 1997-11-14 Andreas Jaeger * sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of working /proc cwd and no restrictions on path length. Following some ideas from Andi Kleen (PR 350). 1997-11-14 19:14 Thorsten Kukuk * nis/nss_compat/compat-grp.c: Remove buggy assert call. 1997-11-14 22:23 Ulrich Drepper * sysdeps/libm-i387/s_fdim.S: New file. * sysdeps/libm-i387/s_fdimf.S: New file. * sysdeps/libm-i387/s_fdiml.S: New file. * sysdeps/libm-i387/i686/s_fdim.S: New file. * sysdeps/libm-i387/i686/s_fdimf.S: New file. * sysdeps/libm-i387/i686/s_fdiml.S: New file. 1997-11-12 Andreas Schwab * string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a pointer to unsigned char. 1997-11-13 Andreas Jaeger * sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function. * sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function. * sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function. 1997-11-12 Andreas Jaeger * sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for ilogb(0/NaN). * sysdeps/libm-ieee754/s_ilogbl.c: Likewise. * sysdeps/libm-ieee754/s_ilogb.c: Likewise. 1997-11-14 05:44 Ulrich Drepper * sysdeps/libm-i387/s_fmin.S: New file. * sysdeps/libm-i387/s_fminf.S: New file. * sysdeps/libm-i387/s_fminl.S: New file. * sysdeps/libm-i387/s_fmax.S: New file. * sysdeps/libm-i387/s_fmaxf.S: New file. * sysdeps/libm-i387/s_fmaxl.S: New file. * sysdeps/libm-i387/i686/s_fmin.S: New file. * sysdeps/libm-i387/i686/s_fminf.S: New file. * sysdeps/libm-i387/i686/s_fminl.S: New file. * sysdeps/libm-i387/i686/s_fmax.S: New file. * sysdeps/libm-i387/i686/s_fmaxf.S: New file. * sysdeps/libm-i387/i686/s_fmaxl.S: New file. 1997-11-14 03:06 Ulrich Drepper * sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/connect.S: Likewise. Reported by Christopher Wiles . See ChangeLog.7 for earlier changes. --- iconv/gconv_conf.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 420 insertions(+) create mode 100644 iconv/gconv_conf.c (limited to 'iconv/gconv_conf.c') diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c new file mode 100644 index 0000000000..d3c13d75c9 --- /dev/null +++ b/iconv/gconv_conf.c @@ -0,0 +1,420 @@ +/* Handle configuration data. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + + 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 +#include +#include +#include + + +/* This is the default path where we look for module lists. */ +static const char default_gconv_path[] = GCONV_PATH; + +/* Name of the file containing the module information in the directories + along the path. */ +static const char gconv_conf_filename[] = "gconv-modules"; + +/* We have a few builtin transformations. */ +static struct gconv_module builtin_modules[] = +{ +#define BUILTIN_TRANSFORMATION(From, ConstPfx, ConstLen, To, Cost, Name, \ + Fct, Init, End) \ + { \ + from_pattern: From, \ + from_constpfx: ConstPfx, \ + from_constpfx_len: ConstLen, \ + from_regex: NULL, \ + to_string: To, \ + cost: Cost, \ + module_name: Name \ + }, + +#include "gconv_builtin.h" +}; + + +/* Function for searching module. */ +static int +module_compare (const void *p1, const void *p2) +{ + struct gconv_module *s1 = (struct gconv_module *) p1; + struct gconv_module *s2 = (struct gconv_module *) p2; + int result; + + if (s1->from_pattern == NULL) + { + if (s2->from_pattern == NULL) + result = strcmp (s1->from_constpfx, s2->from_constpfx); + else + result = -1; + } + else if (s2->from_pattern == NULL) + result = 1; + else + result = strcmp (s1->from_pattern, s2->from_pattern); + + if (result == 0) + result = strcmp (s1->to_string, s2->to_string); + + return result; +} + + +/* Add new alias. */ +static inline void +add_alias (char *rp) +{ + /* We now expect two more string. The strings are normalized + (converted to UPPER case) and strored in the alias database. */ + struct gconv_alias *new_alias; + char *from, *to, *wp; + + while (isspace (*rp)) + ++rp; + from = wp = rp; + while (*rp != '\0' && !isspace (*rp)) + ++rp; + if (*rp == '\0') + /* There is no `to' string on the line. Ignore it. */ + return; + *rp++ = '\0'; + to = wp = rp; + while (isspace (*rp)) + ++rp; + while (*rp != '\0' && !isspace (*rp)) + *wp++ = *rp++; + if (to == wp) + /* No `to' string, ignore the line. */ + return; + *wp++ = '\0'; + + new_alias = (struct gconv_alias *) + malloc (sizeof (struct gconv_alias) + (wp - from)); + new_alias->fromname = memcpy ((char *) new_alias + + sizeof (struct gconv_alias), + from, to - from); + new_alias->toname = memcpy ((char *) new_alias + sizeof (struct gconv_alias) + + (to - from), to, wp - to); + + if (__tsearch (new_alias, &__gconv_alias_db, __gconv_alias_compare) == NULL) + /* Something went wrong, free this entry. */ + free (new_alias); +} + + +/* Add new module. */ +static inline void +add_module (char *rp, const char *directory, size_t dir_len, void **modules, + size_t *nmodules) +{ + /* We expect now + 1. `from' name + 2. `to' name + 3. filename of the module + 4. an optional cost value + */ + struct gconv_module *new_module; + char *from, *to, *module, *wp; + size_t const_len; + int from_is_regex; + int cost; + + while (isspace (*rp)) + ++rp; + from = rp; + from_is_regex = 0; + while (*rp != '\0' && !isspace (*rp)) + { + if (!isalnum (*rp) && *rp != '-' && *rp != '/' && *rp != '.' + && *rp != '_') + from_is_regex = 1; + ++rp; + } + if (*rp == '\0') + return; + *rp++ = '\0'; + to = wp = rp; + while (isspace (*rp)) + ++rp; + while (*rp != '\0' && !isspace (*rp)) + *wp++ = *rp++; + if (*rp == '\0') + return; + *wp++ = '\0'; + do + ++rp; + while (isspace (*rp)); + module = wp; + while (*rp != '\0' && !isspace (*rp)) + *wp++ = *rp++; + if (*rp == '\0') + { + /* There is no cost, use one by default. */ + *wp++ = '\0'; + cost = 1; + } + else + { + /* There might be a cost value. */ + char *endp; + + *wp++ = '\0'; + cost = strtol (rp, &endp, 10); + if (rp == endp) + /* No useful information. */ + cost = 1; + } + + if (module[0] == '\0') + /* No module name given. */ + return; + if (module[0] == '/') + dir_len = 0; + else + /* Increment by one for the slash. */ + ++dir_len; + + /* We've collected all the information, now create an entry. */ + + const_len = 0; + if (from_is_regex) + do + ++const_len; + while (isalnum (from[const_len]) || from[const_len] == '-' + || from[const_len] == '/' || from[const_len] == '.' + || from[const_len] == '_'); + + new_module = (struct gconv_module *) malloc (sizeof (struct gconv_module) + + (wp - from) + const_len + + dir_len); + if (new_module != NULL) + { + if (from_is_regex) + { + new_module->from_pattern = memcpy ((char *) new_module + + sizeof (struct gconv_module), + from, to - from); + new_module->from_constpfx = memcpy ((char *) new_module->from_pattern + + (to - from), + from, const_len); + ((char *) new_module->from_constpfx)[const_len] = '\0'; + new_module->from_constpfx_len = const_len; + ++const_len; + } + else + { + new_module->from_pattern = NULL; + new_module->from_constpfx = memcpy ((char *) new_module + + sizeof (struct gconv_module), + from, to - from); + new_module->from_constpfx_len = to - from - 1; + const_len = to - from; + } + new_module->from_regex = NULL; + + new_module->to_string = memcpy ((char *) new_module->from_constpfx + + const_len + 1, to, module - to); + + new_module->cost = cost; + + if (dir_len == 0) + new_module->module_name = memcpy ((char *) new_module->to_string + + (module - to), + module, wp - module); + else + { + char *tmp; + new_module->module_name = ((char *) new_module->to_string + + (module - to)); + tmp = __mempcpy ((char *) new_module->module_name, + directory, dir_len - 1); + *tmp++ = '/'; + memcpy (tmp, module, wp - module); + } + + if (__tfind (new_module, *modules, module_compare) != NULL) + if (__tsearch (new_module, modules, module_compare) == NULL) + /* Something went wrong while inserting the new module. */ + free (new_module); + else + ++*nmodules; + } +} + + +static void +insert_module (const void *nodep, VISIT value, int level) +{ + if (value == preorder || value == leaf) + __gconv_modules_db[__gconv_nmodules++] = (struct gconv_module *) nodep; +} + +static void +nothing (void *unused __attribute__ ((unused))) +{ +} + + +/* Read the next configuration file. */ +static void +internal_function +read_conf_file (const char *filename, const char *directory, size_t dir_len, + void **modules, size_t *nmodules) +{ + FILE *fp = fopen (filename, "r"); + char *line = NULL; + size_t line_len = 0; + + /* Don't complain if a file is not present or readable, simply silently + ignore it. */ + if (fp == NULL) + return; + + /* Process the known entries of the file. Comments start with `#' and + end with the end of the line. Empty lines are ignored. */ + while (!feof (fp)) + { + char *rp, *endp, *word; + ssize_t n = __getdelim (&line, &line_len, '\n', fp); + if (n < 0) + /* An error occurred. */ + break; + + rp = line; + while (isspace (*rp)) + ++rp; + /* Terminate the line (excluding comments or newline) by an NUL byte + to simplify the following code. */ + endp = strchr (rp, '#'); + if (endp != NULL) + *endp = '\0'; + else + { + endp = strchr (rp, '\n'); + if (endp != NULL) + *endp = '\0'; + } + + /* If this is an empty line go on with the next one. */ + if (rp == endp) + continue; + + word = rp; + while (*rp != '\0' && !isspace (*rp)) + ++rp; + + if (rp - word == sizeof ("alias") - 1 + && memcpy (word, "alias", sizeof ("alias") - 1) == 0) + add_alias (rp); + else if (rp - word == sizeof ("module") - 1 + && memcpy (word, "module", sizeof ("module") - 1) == 0) + add_module (rp, directory, dir_len, modules, nmodules); + /* else */ + /* Otherwise ignore the line. */ + } + + if (line != NULL) + free (line); + fclose (fp); +} + + +/* Read all configuration files found in the user-specified and the default + path. */ +void +__gconv_read_conf (void) +{ + const char *user_path = __secure_getenv ("GCONV_PATH"); + char *gconv_path, *elem; + void *modules = NULL; + size_t nmodules = 0; + + if (user_path == NULL) + /* No user-defined path. Make a modifiable copy of the default path. */ + gconv_path = strdupa (default_gconv_path); + else + { + /* Append the default path to the user-defined path. */ + size_t user_len = strlen (user_path); + char *tmp; + + gconv_path = alloca (user_len + 1 + sizeof (default_gconv_path)); + tmp = __mempcpy (gconv_path, user_path, user_len); + *tmp++ = ':'; + __mempcpy (tmp, default_gconv_path, sizeof (default_gconv_path)); + } + + elem = strtok_r (gconv_path, ":", &gconv_path); + while (elem != NULL) + { + char real_elem[MAXPATHLEN]; + + if (realpath (elem, real_elem) != NULL) + { + size_t elem_len = strlen (real_elem); + char *filename, *tmp; + + filename = alloca (elem_len + 1 + sizeof (gconv_conf_filename)); + tmp = __mempcpy (filename, real_elem, elem_len); + *tmp++ = '/'; + __mempcpy (tmp, gconv_conf_filename, sizeof (gconv_conf_filename)); + + /* Read the next configuration file. */ + read_conf_file (filename, real_elem, elem_len, &modules, &nmodules); + } + + /* Get next element in the path. */ + elem = strtok_r (NULL, ":", &gconv_path); + } + + /* If the configuration files do not contain any valid module specification + remember this by setting the pointer to the module array to NULL. */ + nmodules = sizeof (builtin_modules) / sizeof (struct gconv_module); + if (nmodules == 0) + { + __gconv_modules_db = NULL; + return; + } + + __gconv_modules_db = + (struct gconv_module **) malloc (nmodules * sizeof (struct gconv_module)); + if (__gconv_modules_db == NULL) + /* We cannot do anything. */ + return; + + /* First insert the builtin transformations. */ + while (__gconv_nmodules < (sizeof (builtin_modules) + / sizeof (struct gconv_module))) + { + __gconv_modules_db[__gconv_nmodules] = + &builtin_modules[__gconv_nmodules]; + ++__gconv_nmodules; + } + + /* Insert all module entries into the array. */ + __twalk (modules, insert_module); + + /* No remove the tree data structure. */ + __tdestroy (modules, nothing); +} -- cgit v1.2.3