mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
1243 lines
31 KiB
C
1243 lines
31 KiB
C
/* Generate fastloading iconv module configuration files.
|
|
Copyright (C) 2000-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License version 2 as
|
|
published by the Free Software Foundation.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software Foundation,
|
|
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
#include <argp.h>
|
|
#include <assert.h>
|
|
#include <error.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <libintl.h>
|
|
#include <locale.h>
|
|
#include <mcheck.h>
|
|
#include <search.h>
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdio_ext.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/cdefs.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include "iconvconfig.h"
|
|
|
|
/* Get libc version number. */
|
|
#include "../version.h"
|
|
|
|
#define PACKAGE _libc_intl_domainname
|
|
|
|
|
|
/* The hashing function we use. */
|
|
#include "../intl/hash-string.h"
|
|
|
|
|
|
/* Types used. */
|
|
struct module
|
|
{
|
|
char *fromname;
|
|
struct Strent *fromname_strent;
|
|
char *filename;
|
|
struct Strent *filename_strent;
|
|
const char *directory;
|
|
struct Strent *directory_strent;
|
|
struct module *next;
|
|
int cost;
|
|
struct Strent *toname_strent;
|
|
char toname[0];
|
|
};
|
|
|
|
struct alias
|
|
{
|
|
char *fromname;
|
|
struct Strent *froment;
|
|
struct module *module;
|
|
struct Strent *toent;
|
|
char toname[0];
|
|
};
|
|
|
|
struct name
|
|
{
|
|
const char *name;
|
|
struct Strent *strent;
|
|
int module_idx;
|
|
uint32_t hashval;
|
|
};
|
|
|
|
struct name_info
|
|
{
|
|
const char *canonical_name;
|
|
struct Strent *canonical_strent;
|
|
|
|
struct module *from_internal;
|
|
struct module *to_internal;
|
|
|
|
struct other_conv_list
|
|
{
|
|
int dest_idx;
|
|
struct other_conv
|
|
{
|
|
gidx_t module_idx;
|
|
struct module *module;
|
|
struct other_conv *next;
|
|
} other_conv;
|
|
struct other_conv_list *next;
|
|
} *other_conv_list;
|
|
};
|
|
|
|
|
|
/* Name and version of program. */
|
|
static void print_version (FILE *stream, struct argp_state *state);
|
|
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
|
|
|
|
/* Short description of program. */
|
|
static const char doc[] = N_("\
|
|
Create fastloading iconv module configuration file.");
|
|
|
|
/* Strings for arguments in help texts. */
|
|
static const char args_doc[] = N_("[DIR...]");
|
|
|
|
/* Prototype for option handler. */
|
|
static error_t parse_opt (int key, char *arg, struct argp_state *state);
|
|
|
|
/* Function to print some extra text in the help message. */
|
|
static char *more_help (int key, const char *text, void *input);
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
#define OPT_PREFIX 300
|
|
#define OPT_NOSTDLIB 301
|
|
static const struct argp_option options[] =
|
|
{
|
|
{ "prefix", OPT_PREFIX, "PATH", 0, N_("Prefix used for all file accesses") },
|
|
{ "output", 'o', "FILE", 0, N_("\
|
|
Put output in FILE instead of installed location\
|
|
(--prefix does not apply to FILE)") },
|
|
{ "nostdlib", OPT_NOSTDLIB, NULL, 0,
|
|
N_("Do not search standard directories, only those on the command line") },
|
|
{ NULL, 0, NULL, 0, NULL }
|
|
};
|
|
|
|
/* Data structure to communicate with argp functions. */
|
|
static struct argp argp =
|
|
{
|
|
options, parse_opt, args_doc, doc, NULL, more_help
|
|
};
|
|
|
|
|
|
/* The function doing the actual work. */
|
|
static int handle_dir (const char *dir);
|
|
|
|
/* Add all known builtin conversions and aliases. */
|
|
static void add_builtins (void);
|
|
|
|
/* Create list of all aliases without circular aliases. */
|
|
static void get_aliases (void);
|
|
|
|
/* Create list of all modules. */
|
|
static void get_modules (void);
|
|
|
|
/* Get list of all the names and thereby indexing them. */
|
|
static void generate_name_list (void);
|
|
|
|
/* Collect information about all the names. */
|
|
static void generate_name_info (void);
|
|
|
|
/* Write the output file. */
|
|
static int write_output (void);
|
|
|
|
|
|
/* Prefix to be used for all file accesses. */
|
|
static const char *prefix = "";
|
|
/* Its length. */
|
|
static size_t prefix_len;
|
|
|
|
/* Directory to place output file in. */
|
|
static const char *output_file;
|
|
/* Its length. */
|
|
static size_t output_file_len;
|
|
|
|
/* If true, omit the GCONV_PATH directories and require some arguments. */
|
|
static bool nostdlib;
|
|
|
|
/* Search tree of the modules we know. */
|
|
static void *modules;
|
|
|
|
/* Search tree of the aliases we know. */
|
|
static void *aliases;
|
|
|
|
/* Search tree for name to index mapping. */
|
|
static void *names;
|
|
|
|
/* Number of names we know about. */
|
|
static int nnames;
|
|
|
|
/* List of all aliases. */
|
|
static struct alias **alias_list;
|
|
static size_t nalias_list;
|
|
static size_t nalias_list_max;
|
|
|
|
/* List of all modules. */
|
|
static struct module **module_list;
|
|
static size_t nmodule_list;
|
|
static size_t nmodule_list_max;
|
|
|
|
/* Names and information about them. */
|
|
static struct name_info *name_info;
|
|
static size_t nname_info;
|
|
|
|
/* Number of translations not from or to INTERNAL. */
|
|
static size_t nextra_modules;
|
|
|
|
|
|
/* Names and aliases for the builtin transformations. */
|
|
static struct
|
|
{
|
|
const char *from;
|
|
const char *to;
|
|
} builtin_alias[] =
|
|
{
|
|
#define BUILTIN_ALIAS(alias, real) \
|
|
{ .from = alias, .to = real },
|
|
#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
|
|
MinF, MaxF, MinT, MaxT)
|
|
#include <gconv_builtin.h>
|
|
};
|
|
#undef BUILTIN_ALIAS
|
|
#undef BUILTIN_TRANSFORMATION
|
|
#define nbuiltin_alias (sizeof (builtin_alias) / sizeof (builtin_alias[0]))
|
|
|
|
static struct
|
|
{
|
|
const char *from;
|
|
const char *to;
|
|
const char *module;
|
|
int cost;
|
|
} builtin_trans[] =
|
|
{
|
|
#define BUILTIN_ALIAS(alias, real)
|
|
#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
|
|
MinF, MaxF, MinT, MaxT) \
|
|
{ .from = From, .to = To, .module = Name, .cost = Cost },
|
|
#include <gconv_builtin.h>
|
|
};
|
|
#undef BUILTIN_ALIAS
|
|
#undef BUILTIN_TRANSFORMATION
|
|
#define nbuiltin_trans (sizeof (builtin_trans) / sizeof (builtin_trans[0]))
|
|
|
|
|
|
/* Filename extension for the modules. */
|
|
#ifndef MODULE_EXT
|
|
# define MODULE_EXT ".so"
|
|
#endif
|
|
static const char gconv_module_ext[] = MODULE_EXT;
|
|
|
|
|
|
extern void *xmalloc (size_t n) __attribute_malloc__;
|
|
extern void *xcalloc (size_t n, size_t m) __attribute_malloc__;
|
|
extern void *xrealloc (void *p, size_t n);
|
|
|
|
|
|
/* C string table handling. */
|
|
struct Strtab;
|
|
struct Strent;
|
|
|
|
/* Create new C string table object in memory. */
|
|
extern struct Strtab *strtabinit (void);
|
|
|
|
/* Free resources allocated for C string table ST. */
|
|
extern void strtabfree (struct Strtab *st);
|
|
|
|
/* Add string STR (length LEN is != 0) to C string table ST. */
|
|
extern struct Strent *strtabadd (struct Strtab *st, const char *str,
|
|
size_t len);
|
|
|
|
/* Finalize string table ST and store size in *SIZE and return a pointer. */
|
|
extern void *strtabfinalize (struct Strtab *st, size_t *size);
|
|
|
|
/* Get offset in string table for string associated with SE. */
|
|
extern size_t strtaboffset (struct Strent *se);
|
|
|
|
/* String table we construct. */
|
|
static struct Strtab *strtab;
|
|
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int remaining;
|
|
int status = 0;
|
|
|
|
/* Enable memory use testing. */
|
|
/* mcheck_pedantic (NULL); */
|
|
mtrace ();
|
|
|
|
/* Set locale via LC_ALL. */
|
|
setlocale (LC_ALL, "");
|
|
|
|
/* Set the text message domain. */
|
|
textdomain (_libc_intl_domainname);
|
|
|
|
/* Parse and process arguments. */
|
|
argp_parse (&argp, argc, argv, 0, &remaining, NULL);
|
|
|
|
if (nostdlib && remaining == argc)
|
|
error (2, 0, _("Directory arguments required when using --nostdlib"));
|
|
|
|
/* Initialize the string table. */
|
|
strtab = strtabinit ();
|
|
|
|
/* Handle all directories mentioned. */
|
|
while (remaining < argc)
|
|
status |= handle_dir (argv[remaining++]);
|
|
|
|
if (! nostdlib)
|
|
{
|
|
/* In any case also handle the standard directory. */
|
|
char *path = strdupa (GCONV_PATH), *tp = strsep (&path, ":");
|
|
while (tp != NULL)
|
|
{
|
|
status |= handle_dir (tp);
|
|
|
|
tp = strsep (&path, ":");
|
|
}
|
|
}
|
|
|
|
/* Add the builtin transformations and aliases without overwriting
|
|
anything. */
|
|
add_builtins ();
|
|
|
|
/* Store aliases in an array. */
|
|
get_aliases ();
|
|
|
|
/* Get list of all modules. */
|
|
get_modules ();
|
|
|
|
/* Generate list of all the names we know to handle in some way. */
|
|
generate_name_list ();
|
|
|
|
/* Now we know all the names we will handle, collect information
|
|
about them. */
|
|
generate_name_info ();
|
|
|
|
/* Write the output file, but only if we haven't seen any error. */
|
|
if (status == 0)
|
|
status = write_output ();
|
|
else
|
|
error (1, 0, _("no output file produced because warnings were issued"));
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
/* Handle program arguments. */
|
|
static error_t
|
|
parse_opt (int key, char *arg, struct argp_state *state)
|
|
{
|
|
switch (key)
|
|
{
|
|
case OPT_PREFIX:
|
|
prefix = arg;
|
|
prefix_len = strlen (prefix);
|
|
break;
|
|
case 'o':
|
|
output_file = arg;
|
|
output_file_len = strlen (output_file);
|
|
break;
|
|
case OPT_NOSTDLIB:
|
|
nostdlib = true;
|
|
break;
|
|
default:
|
|
return ARGP_ERR_UNKNOWN;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static char *
|
|
more_help (int key, const char *text, void *input)
|
|
{
|
|
switch (key)
|
|
{
|
|
case ARGP_KEY_HELP_EXTRA:
|
|
/* We print some extra information. */
|
|
return strdup (gettext ("\
|
|
For bug reporting instructions, please see:\n\
|
|
<http://www.gnu.org/software/libc/bugs.html>.\n"));
|
|
default:
|
|
break;
|
|
}
|
|
return (char *) text;
|
|
}
|
|
|
|
|
|
/* Print the version information. */
|
|
static void
|
|
print_version (FILE *stream, struct argp_state *state)
|
|
{
|
|
fprintf (stream, "iconvconfig (GNU %s) %s\n", PACKAGE, VERSION);
|
|
fprintf (stream, gettext ("\
|
|
Copyright (C) %s Free Software Foundation, Inc.\n\
|
|
This is free software; see the source for copying conditions. There is NO\n\
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
|
|
"), "2007");
|
|
fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
|
|
}
|
|
|
|
|
|
static int
|
|
alias_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct alias *a1 = (const struct alias *) p1;
|
|
const struct alias *a2 = (const struct alias *) p2;
|
|
|
|
return strcmp (a1->fromname, a2->fromname);
|
|
}
|
|
|
|
|
|
static void
|
|
new_alias (const char *fromname, size_t fromlen, const char *toname,
|
|
size_t tolen)
|
|
{
|
|
struct alias *newp;
|
|
void **inserted;
|
|
|
|
newp = (struct alias *) xmalloc (sizeof (struct alias) + fromlen + tolen);
|
|
|
|
newp->fromname = mempcpy (newp->toname, toname, tolen);
|
|
memcpy (newp->fromname, fromname, fromlen);
|
|
newp->module = NULL;
|
|
|
|
inserted = (void **) tsearch (newp, &aliases, alias_compare);
|
|
if (inserted == NULL)
|
|
error (EXIT_FAILURE, errno, gettext ("while inserting in search tree"));
|
|
if (*inserted != newp)
|
|
/* Something went wrong, free this entry. */
|
|
free (newp);
|
|
else
|
|
{
|
|
newp->froment = strtabadd (strtab, newp->fromname, fromlen);
|
|
newp->toent = strtabadd (strtab, newp->toname, tolen);
|
|
}
|
|
}
|
|
|
|
|
|
/* Add new alias. */
|
|
static 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. */
|
|
char *from;
|
|
char *to;
|
|
char *wp;
|
|
|
|
while (isspace (*rp))
|
|
++rp;
|
|
from = wp = rp;
|
|
while (*rp != '\0' && !isspace (*rp))
|
|
*wp++ = toupper (*rp++);
|
|
if (*rp == '\0')
|
|
/* There is no `to' string on the line. Ignore it. */
|
|
return;
|
|
*wp++ = '\0';
|
|
to = ++rp;
|
|
while (isspace (*rp))
|
|
++rp;
|
|
while (*rp != '\0' && !isspace (*rp))
|
|
*wp++ = toupper (*rp++);
|
|
if (to == wp)
|
|
/* No `to' string, ignore the line. */
|
|
return;
|
|
*wp++ = '\0';
|
|
|
|
assert (strlen (from) + 1 == (size_t) (to - from));
|
|
assert (strlen (to) + 1 == (size_t) (wp - to));
|
|
|
|
new_alias (from, to - from, to, wp - to);
|
|
}
|
|
|
|
|
|
static void
|
|
append_alias (const void *nodep, VISIT value, int level)
|
|
{
|
|
if (value != leaf && value != postorder)
|
|
return;
|
|
|
|
if (nalias_list_max == nalias_list)
|
|
{
|
|
nalias_list_max += 50;
|
|
alias_list = (struct alias **) xrealloc (alias_list,
|
|
(nalias_list_max
|
|
* sizeof (struct alias *)));
|
|
}
|
|
|
|
alias_list[nalias_list++] = *(struct alias **) nodep;
|
|
}
|
|
|
|
|
|
static void
|
|
get_aliases (void)
|
|
{
|
|
twalk (aliases, append_alias);
|
|
}
|
|
|
|
|
|
static int
|
|
module_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct module *m1 = (const struct module *) p1;
|
|
const struct module *m2 = (const struct module *) p2;
|
|
int result;
|
|
|
|
result = strcmp (m1->fromname, m2->fromname);
|
|
if (result == 0)
|
|
result = strcmp (m1->toname, m2->toname);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Create new module record. */
|
|
static void
|
|
new_module (const char *fromname, size_t fromlen, const char *toname,
|
|
size_t tolen, const char *directory,
|
|
const char *filename, size_t filelen, int cost, size_t need_ext)
|
|
{
|
|
struct module *new_module;
|
|
size_t dirlen = strlen (directory) + 1;
|
|
char *tmp;
|
|
void **inserted;
|
|
|
|
new_module = (struct module *) xmalloc (sizeof (struct module)
|
|
+ fromlen + tolen + filelen
|
|
+ need_ext);
|
|
|
|
new_module->fromname = mempcpy (new_module->toname, toname, tolen);
|
|
|
|
new_module->filename = mempcpy (new_module->fromname, fromname, fromlen);
|
|
|
|
new_module->cost = cost;
|
|
new_module->next = NULL;
|
|
|
|
tmp = mempcpy (new_module->filename, filename, filelen);
|
|
if (need_ext)
|
|
{
|
|
memcpy (tmp - 1, gconv_module_ext, need_ext + 1);
|
|
filelen += need_ext;
|
|
}
|
|
new_module->directory = directory;
|
|
|
|
/* Now insert the new module data structure in our search tree. */
|
|
inserted = (void **) tsearch (new_module, &modules, module_compare);
|
|
if (inserted == NULL)
|
|
error (EXIT_FAILURE, errno, "while inserting in search tree");
|
|
if (*inserted != new_module)
|
|
free (new_module);
|
|
else
|
|
{
|
|
new_module->fromname_strent = strtabadd (strtab, new_module->fromname,
|
|
fromlen);
|
|
new_module->toname_strent = strtabadd (strtab, new_module->toname,
|
|
tolen);
|
|
new_module->filename_strent = strtabadd (strtab, new_module->filename,
|
|
filelen);
|
|
new_module->directory_strent = strtabadd (strtab, directory, dirlen);
|
|
}
|
|
}
|
|
|
|
|
|
/* Add new module. */
|
|
static void
|
|
internal_function
|
|
add_module (char *rp, const char *directory)
|
|
{
|
|
/* We expect now
|
|
1. `from' name
|
|
2. `to' name
|
|
3. filename of the module
|
|
4. an optional cost value
|
|
*/
|
|
char *from;
|
|
char *to;
|
|
char *module;
|
|
char *wp;
|
|
int need_ext;
|
|
int cost;
|
|
|
|
while (isspace (*rp))
|
|
++rp;
|
|
from = rp;
|
|
while (*rp != '\0' && !isspace (*rp))
|
|
{
|
|
*rp = toupper (*rp);
|
|
++rp;
|
|
}
|
|
if (*rp == '\0')
|
|
return;
|
|
*rp++ = '\0';
|
|
to = wp = rp;
|
|
while (isspace (*rp))
|
|
++rp;
|
|
while (*rp != '\0' && !isspace (*rp))
|
|
*wp++ = toupper (*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 || cost < 1)
|
|
/* No useful information. */
|
|
cost = 1;
|
|
}
|
|
|
|
if (module[0] == '\0')
|
|
/* No module name given. */
|
|
return;
|
|
|
|
/* See whether we must add the ending. */
|
|
need_ext = 0;
|
|
if ((size_t) (wp - module) < sizeof (gconv_module_ext)
|
|
|| memcmp (wp - sizeof (gconv_module_ext), gconv_module_ext,
|
|
sizeof (gconv_module_ext)) != 0)
|
|
/* We must add the module extension. */
|
|
need_ext = sizeof (gconv_module_ext) - 1;
|
|
|
|
assert (strlen (from) + 1 == (size_t) (to - from));
|
|
assert (strlen (to) + 1 == (size_t) (module - to));
|
|
assert (strlen (module) + 1 == (size_t) (wp - module));
|
|
|
|
new_module (from, to - from, to, module - to, directory, module, wp - module,
|
|
cost, need_ext);
|
|
}
|
|
|
|
|
|
/* Read the config file and add the data for this directory to that. */
|
|
static int
|
|
handle_dir (const char *dir)
|
|
{
|
|
char *cp;
|
|
FILE *fp;
|
|
char *line = NULL;
|
|
size_t linelen = 0;
|
|
size_t dirlen = strlen (dir);
|
|
|
|
if (dir[dirlen - 1] != '/')
|
|
{
|
|
char *newp = (char *) xmalloc (dirlen + 2);
|
|
dir = memcpy (newp, dir, dirlen);
|
|
newp[dirlen++] = '/';
|
|
newp[dirlen] = '\0';
|
|
}
|
|
|
|
char infile[prefix_len + dirlen + sizeof "gconv-modules"];
|
|
cp = infile;
|
|
if (dir[0] == '/')
|
|
cp = mempcpy (cp, prefix, prefix_len);
|
|
strcpy (mempcpy (cp, dir, dirlen), "gconv-modules");
|
|
|
|
fp = fopen (infile, "r");
|
|
if (fp == NULL)
|
|
{
|
|
error (0, errno, "cannot open `%s'", infile);
|
|
return 1;
|
|
}
|
|
|
|
/* No threads present. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
|
|
while (!feof_unlocked (fp))
|
|
{
|
|
char *rp, *endp, *word;
|
|
ssize_t n = __getdelim (&line, &linelen, '\n', fp);
|
|
|
|
if (n < 0)
|
|
/* An error occurred. */
|
|
break;
|
|
|
|
rp = line;
|
|
/* Terminate the line (excluding comments or newline) with a NUL
|
|
byte to simplify the following code. */
|
|
endp = strchr (rp, '#');
|
|
if (endp != NULL)
|
|
*endp = '\0';
|
|
else
|
|
if (rp[n - 1] == '\n')
|
|
rp[n - 1] = '\0';
|
|
|
|
while (isspace (*rp))
|
|
++rp;
|
|
|
|
/* 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
|
|
&& memcmp (word, "alias", sizeof ("alias") - 1) == 0)
|
|
add_alias (rp);
|
|
else if (rp - word == sizeof ("module") - 1
|
|
&& memcmp (word, "module", sizeof ("module") - 1) == 0)
|
|
add_module (rp, dir);
|
|
/* else */
|
|
/* Otherwise ignore the line. */
|
|
}
|
|
|
|
free (line);
|
|
|
|
fclose (fp);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void
|
|
append_module (const void *nodep, VISIT value, int level)
|
|
{
|
|
struct module *mo;
|
|
|
|
if (value != leaf && value != postorder)
|
|
return;
|
|
|
|
mo = *(struct module **) nodep;
|
|
|
|
if (nmodule_list > 0
|
|
&& strcmp (module_list[nmodule_list - 1]->fromname, mo->fromname) == 0)
|
|
{
|
|
/* Same name. */
|
|
mo->next = module_list[nmodule_list - 1];
|
|
module_list[nmodule_list - 1] = mo;
|
|
|
|
return;
|
|
}
|
|
|
|
if (nmodule_list_max == nmodule_list)
|
|
{
|
|
nmodule_list_max += 50;
|
|
module_list = (struct module **) xrealloc (module_list,
|
|
(nmodule_list_max
|
|
* sizeof (struct module *)));
|
|
}
|
|
|
|
module_list[nmodule_list++] = mo;
|
|
}
|
|
|
|
|
|
static void
|
|
get_modules (void)
|
|
{
|
|
twalk (modules, append_module);
|
|
}
|
|
|
|
|
|
static void
|
|
add_builtins (void)
|
|
{
|
|
size_t cnt;
|
|
|
|
/* Add all aliases. */
|
|
for (cnt = 0; cnt < nbuiltin_alias; ++cnt)
|
|
new_alias (builtin_alias[cnt].from,
|
|
strlen (builtin_alias[cnt].from) + 1,
|
|
builtin_alias[cnt].to,
|
|
strlen (builtin_alias[cnt].to) + 1);
|
|
|
|
/* add the builtin transformations. */
|
|
for (cnt = 0; cnt < nbuiltin_trans; ++cnt)
|
|
new_module (builtin_trans[cnt].from,
|
|
strlen (builtin_trans[cnt].from) + 1,
|
|
builtin_trans[cnt].to,
|
|
strlen (builtin_trans[cnt].to) + 1,
|
|
"", builtin_trans[cnt].module,
|
|
strlen (builtin_trans[cnt].module) + 1,
|
|
builtin_trans[cnt].cost, 0);
|
|
}
|
|
|
|
|
|
static int
|
|
name_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct name *n1 = (const struct name *) p1;
|
|
const struct name *n2 = (const struct name *) p2;
|
|
|
|
return strcmp (n1->name, n2->name);
|
|
}
|
|
|
|
|
|
static struct name *
|
|
new_name (const char *str, struct Strent *strent)
|
|
{
|
|
struct name *newp = (struct name *) xmalloc (sizeof (struct name));
|
|
|
|
newp->name = str;
|
|
newp->strent = strent;
|
|
newp->module_idx = -1;
|
|
newp->hashval = __hash_string (str);
|
|
|
|
++nnames;
|
|
|
|
return newp;
|
|
}
|
|
|
|
|
|
static void
|
|
generate_name_list (void)
|
|
{
|
|
size_t i;
|
|
|
|
/* A name we always need. */
|
|
tsearch (new_name ("INTERNAL", strtabadd (strtab, "INTERNAL",
|
|
sizeof ("INTERNAL"))),
|
|
&names, name_compare);
|
|
|
|
for (i = 0; i < nmodule_list; ++i)
|
|
{
|
|
struct module *runp;
|
|
|
|
if (strcmp (module_list[i]->fromname, "INTERNAL") != 0)
|
|
tsearch (new_name (module_list[i]->fromname,
|
|
module_list[i]->fromname_strent),
|
|
&names, name_compare);
|
|
|
|
for (runp = module_list[i]; runp != NULL; runp = runp->next)
|
|
if (strcmp (runp->toname, "INTERNAL") != 0)
|
|
tsearch (new_name (runp->toname, runp->toname_strent),
|
|
&names, name_compare);
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
name_to_module_idx (const char *name, int add)
|
|
{
|
|
struct name **res;
|
|
struct name fake_name = { .name = name };
|
|
int idx;
|
|
|
|
res = (struct name **) tfind (&fake_name, &names, name_compare);
|
|
if (res == NULL)
|
|
abort ();
|
|
|
|
idx = (*res)->module_idx;
|
|
if (idx == -1 && add)
|
|
/* No module index assigned yet. */
|
|
idx = (*res)->module_idx = nname_info++;
|
|
|
|
return idx;
|
|
}
|
|
|
|
|
|
static void
|
|
generate_name_info (void)
|
|
{
|
|
size_t i;
|
|
int idx;
|
|
|
|
name_info = (struct name_info *) xcalloc (nmodule_list + 1,
|
|
sizeof (struct name_info));
|
|
|
|
/* First add a special entry for the INTERNAL name. This must have
|
|
index zero. */
|
|
idx = name_to_module_idx ("INTERNAL", 1);
|
|
name_info[0].canonical_name = "INTERNAL";
|
|
name_info[0].canonical_strent = strtabadd (strtab, "INTERNAL",
|
|
sizeof ("INTERNAL"));
|
|
assert (nname_info == 1);
|
|
|
|
for (i = 0; i < nmodule_list; ++i)
|
|
{
|
|
struct module *runp;
|
|
|
|
for (runp = module_list[i]; runp != NULL; runp = runp->next)
|
|
if (strcmp (runp->fromname, "INTERNAL") == 0)
|
|
{
|
|
idx = name_to_module_idx (runp->toname, 1);
|
|
name_info[idx].from_internal = runp;
|
|
assert (name_info[idx].canonical_name == NULL
|
|
|| strcmp (name_info[idx].canonical_name,
|
|
runp->toname) == 0);
|
|
name_info[idx].canonical_name = runp->toname;
|
|
name_info[idx].canonical_strent = runp->toname_strent;
|
|
}
|
|
else if (strcmp (runp->toname, "INTERNAL") == 0)
|
|
{
|
|
idx = name_to_module_idx (runp->fromname, 1);
|
|
name_info[idx].to_internal = runp;
|
|
assert (name_info[idx].canonical_name == NULL
|
|
|| strcmp (name_info[idx].canonical_name,
|
|
runp->fromname) == 0);
|
|
name_info[idx].canonical_name = runp->fromname;
|
|
name_info[idx].canonical_strent = runp->fromname_strent;
|
|
}
|
|
else
|
|
{
|
|
/* This is a transformation not to or from the INTERNAL
|
|
encoding. */
|
|
int from_idx = name_to_module_idx (runp->fromname, 1);
|
|
int to_idx = name_to_module_idx (runp->toname, 1);
|
|
struct other_conv_list *newp;
|
|
|
|
newp = (struct other_conv_list *)
|
|
xmalloc (sizeof (struct other_conv_list));
|
|
newp->other_conv.module_idx = to_idx;
|
|
newp->other_conv.module = runp;
|
|
newp->other_conv.next = NULL; /* XXX Allow multiple module sequence */
|
|
newp->dest_idx = to_idx;
|
|
newp->next = name_info[from_idx].other_conv_list;
|
|
name_info[from_idx].other_conv_list = newp;
|
|
assert (name_info[from_idx].canonical_name == NULL
|
|
|| strcmp (name_info[from_idx].canonical_name,
|
|
runp->fromname) == 0);
|
|
name_info[from_idx].canonical_name = runp->fromname;
|
|
name_info[from_idx].canonical_strent = runp->fromname_strent;
|
|
|
|
++nextra_modules;
|
|
}
|
|
}
|
|
|
|
/* Now add the module index information for all the aliases. */
|
|
for (i = 0; i < nalias_list; ++i)
|
|
{
|
|
struct name fake_name = { .name = alias_list[i]->toname };
|
|
struct name **tonamep;
|
|
|
|
tonamep = (struct name **) tfind (&fake_name, &names, name_compare);
|
|
if (tonamep != NULL)
|
|
{
|
|
struct name *newp = new_name (alias_list[i]->fromname,
|
|
alias_list[i]->froment);
|
|
newp->module_idx = (*tonamep)->module_idx;
|
|
tsearch (newp, &names, name_compare);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
is_prime (unsigned long int candidate)
|
|
{
|
|
/* No even number and none less than 10 will be passed here. */
|
|
unsigned long int divn = 3;
|
|
unsigned long int sq = divn * divn;
|
|
|
|
while (sq < candidate && candidate % divn != 0)
|
|
{
|
|
++divn;
|
|
sq += 4 * divn;
|
|
++divn;
|
|
}
|
|
|
|
return candidate % divn != 0;
|
|
}
|
|
|
|
|
|
static uint32_t
|
|
next_prime (uint32_t seed)
|
|
{
|
|
/* Make it definitely odd. */
|
|
seed |= 1;
|
|
|
|
while (!is_prime (seed))
|
|
seed += 2;
|
|
|
|
return seed;
|
|
}
|
|
|
|
|
|
/* Format of the output file.
|
|
|
|
Offset Length Description
|
|
0000 4 Magic header bytes
|
|
0004 2 Offset of string table (stoff)
|
|
0006 2 Offset of name hashing table (hoff)
|
|
0008 2 Hashing table size (hsize)
|
|
000A 2 Offset of module table (moff)
|
|
000C 2 Offset of other conversion module table (ooff)
|
|
|
|
stoff ??? String table
|
|
|
|
hoff 8*hsize Array of tuples
|
|
string table offset
|
|
module index
|
|
|
|
moff ??? Array of tuples
|
|
canonical name offset
|
|
from-internal module dir name offset
|
|
from-internal module name off
|
|
to-internal module dir name offset
|
|
to-internal module name offset
|
|
offset into other conversion table
|
|
|
|
ooff ??? One or more of
|
|
number of steps/modules
|
|
one or more of tuple
|
|
canonical name offset for output
|
|
module dir name offset
|
|
module name offset
|
|
(following last entry with step count 0)
|
|
*/
|
|
static int
|
|
write_output (void)
|
|
{
|
|
int fd;
|
|
char *string_table;
|
|
size_t string_table_size;
|
|
struct gconvcache_header header;
|
|
struct hash_entry *hash_table;
|
|
size_t hash_size;
|
|
struct module_entry *module_table;
|
|
char *extra_table;
|
|
char *cur_extra_table;
|
|
size_t n;
|
|
int idx;
|
|
struct iovec iov[6];
|
|
static const gidx_t null_word;
|
|
size_t total;
|
|
char finalname[prefix_len + sizeof GCONV_MODULES_CACHE];
|
|
char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1)
|
|
+ strlen (".XXXXXX")];
|
|
|
|
/* Function to insert the names. */
|
|
auto void
|
|
name_insert (const void *nodep, VISIT value, int level)
|
|
{
|
|
struct name *name;
|
|
unsigned int idx;
|
|
unsigned int hval2;
|
|
|
|
if (value != leaf && value != postorder)
|
|
return;
|
|
|
|
name = *(struct name **) nodep;
|
|
idx = name->hashval % hash_size;
|
|
hval2 = 1 + name->hashval % (hash_size - 2);
|
|
|
|
while (hash_table[idx].string_offset != 0)
|
|
if ((idx += hval2) >= hash_size)
|
|
idx -= hash_size;
|
|
|
|
hash_table[idx].string_offset = strtaboffset (name->strent);
|
|
|
|
assert (name->module_idx != -1);
|
|
hash_table[idx].module_idx = name->module_idx;
|
|
}
|
|
|
|
/* Open the output file. */
|
|
if (output_file == NULL)
|
|
{
|
|
assert (GCONV_MODULES_CACHE[0] == '/');
|
|
strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len),
|
|
GCONV_MODULES_CACHE),
|
|
".XXXXXX");
|
|
strcpy (mempcpy (finalname, prefix, prefix_len), GCONV_MODULES_CACHE);
|
|
}
|
|
else
|
|
strcpy (mempcpy (tmpfname, output_file, output_file_len), ".XXXXXX");
|
|
fd = mkstemp (tmpfname);
|
|
if (fd == -1)
|
|
return 1;
|
|
|
|
/* Create the string table. */
|
|
string_table = strtabfinalize (strtab, &string_table_size);
|
|
|
|
/* Create the hashing table. We know how many strings we have.
|
|
Creating a perfect hash table is not reasonable here. Therefore
|
|
we use open hashing and a table size which is the next prime 40%
|
|
larger than the number of strings. */
|
|
hash_size = next_prime (nnames * 1.4);
|
|
hash_table = (struct hash_entry *) xcalloc (hash_size,
|
|
sizeof (struct hash_entry));
|
|
/* Fill the hash table. */
|
|
twalk (names, name_insert);
|
|
|
|
/* Create the section for the module list. */
|
|
module_table = (struct module_entry *) xcalloc (sizeof (struct module_entry),
|
|
nname_info);
|
|
|
|
/* Allocate memory for the non-INTERNAL conversions. The allocated
|
|
memory can be more than is actually needed. */
|
|
extra_table = (char *) xcalloc (sizeof (struct extra_entry)
|
|
+ sizeof (gidx_t)
|
|
+ sizeof (struct extra_entry_module),
|
|
nextra_modules);
|
|
cur_extra_table = extra_table;
|
|
|
|
/* Fill in the module information. */
|
|
for (n = 0; n < nname_info; ++n)
|
|
{
|
|
module_table[n].canonname_offset =
|
|
strtaboffset (name_info[n].canonical_strent);
|
|
|
|
if (name_info[n].from_internal == NULL)
|
|
{
|
|
module_table[n].fromdir_offset = 0;
|
|
module_table[n].fromname_offset = 0;
|
|
}
|
|
else
|
|
{
|
|
module_table[n].fromdir_offset =
|
|
strtaboffset (name_info[n].from_internal->directory_strent);
|
|
module_table[n].fromname_offset =
|
|
strtaboffset (name_info[n].from_internal->filename_strent);
|
|
}
|
|
|
|
if (name_info[n].to_internal == NULL)
|
|
{
|
|
module_table[n].todir_offset = 0;
|
|
module_table[n].toname_offset = 0;
|
|
}
|
|
else
|
|
{
|
|
module_table[n].todir_offset =
|
|
strtaboffset (name_info[n].to_internal->directory_strent);
|
|
module_table[n].toname_offset =
|
|
strtaboffset (name_info[n].to_internal->filename_strent);
|
|
}
|
|
|
|
if (name_info[n].other_conv_list != NULL)
|
|
{
|
|
struct other_conv_list *other = name_info[n].other_conv_list;
|
|
|
|
/* Store the reference. We add 1 to distinguish the entry
|
|
at offset zero from the case where no extra modules are
|
|
available. The file reader has to account for the
|
|
offset. */
|
|
module_table[n].extra_offset = 1 + cur_extra_table - extra_table;
|
|
|
|
do
|
|
{
|
|
struct other_conv *runp;
|
|
struct extra_entry *extra;
|
|
|
|
/* Allocate new entry. */
|
|
extra = (struct extra_entry *) cur_extra_table;
|
|
cur_extra_table += sizeof (struct extra_entry);
|
|
extra->module_cnt = 0;
|
|
|
|
runp = &other->other_conv;
|
|
do
|
|
{
|
|
cur_extra_table += sizeof (struct extra_entry_module);
|
|
extra->module[extra->module_cnt].outname_offset =
|
|
runp->next == NULL
|
|
? other->dest_idx : runp->next->module_idx;
|
|
extra->module[extra->module_cnt].dir_offset =
|
|
strtaboffset (runp->module->directory_strent);
|
|
extra->module[extra->module_cnt].name_offset =
|
|
strtaboffset (runp->module->filename_strent);
|
|
++extra->module_cnt;
|
|
|
|
runp = runp->next;
|
|
}
|
|
while (runp != NULL);
|
|
|
|
other = other->next;
|
|
}
|
|
while (other != NULL);
|
|
|
|
/* Final module_cnt is zero. */
|
|
*((gidx_t *) cur_extra_table) = 0;
|
|
cur_extra_table += sizeof (gidx_t);
|
|
}
|
|
}
|
|
|
|
/* Clear padding. */
|
|
memset (&header, 0, sizeof (struct gconvcache_header));
|
|
|
|
header.magic = GCONVCACHE_MAGIC;
|
|
|
|
iov[0].iov_base = &header;
|
|
iov[0].iov_len = sizeof (struct gconvcache_header);
|
|
total = iov[0].iov_len;
|
|
|
|
header.string_offset = total;
|
|
iov[1].iov_base = string_table;
|
|
iov[1].iov_len = string_table_size;
|
|
total += iov[1].iov_len;
|
|
|
|
idx = 2;
|
|
if ((string_table_size & (sizeof (gidx_t) - 1)) != 0)
|
|
{
|
|
iov[2].iov_base = (void *) &null_word;
|
|
iov[2].iov_len = (sizeof (gidx_t)
|
|
- (string_table_size & (sizeof (gidx_t) - 1)));
|
|
total += iov[2].iov_len;
|
|
++idx;
|
|
}
|
|
|
|
header.hash_offset = total;
|
|
header.hash_size = hash_size;
|
|
iov[idx].iov_base = hash_table;
|
|
iov[idx].iov_len = hash_size * sizeof (struct hash_entry);
|
|
total += iov[idx].iov_len;
|
|
++idx;
|
|
|
|
header.module_offset = total;
|
|
iov[idx].iov_base = module_table;
|
|
iov[idx].iov_len = nname_info * sizeof (struct module_entry);
|
|
total += iov[idx].iov_len;
|
|
++idx;
|
|
|
|
assert ((size_t) (cur_extra_table - extra_table)
|
|
<= ((sizeof (struct extra_entry) + sizeof (gidx_t)
|
|
+ sizeof (struct extra_entry_module))
|
|
* nextra_modules));
|
|
header.otherconv_offset = total;
|
|
iov[idx].iov_base = extra_table;
|
|
iov[idx].iov_len = cur_extra_table - extra_table;
|
|
total += iov[idx].iov_len;
|
|
++idx;
|
|
|
|
if ((size_t) TEMP_FAILURE_RETRY (writev (fd, iov, idx)) != total
|
|
/* The file was created with mode 0600. Make it world-readable. */
|
|
|| fchmod (fd, 0644) != 0
|
|
/* Rename the file, possibly replacing an old one. */
|
|
|| rename (tmpfname, output_file ?: finalname) != 0)
|
|
{
|
|
int save_errno = errno;
|
|
close (fd);
|
|
unlink (tmpfname);
|
|
error (EXIT_FAILURE, save_errno,
|
|
gettext ("cannot generate output file"));
|
|
}
|
|
|
|
close (fd);
|
|
|
|
return 0;
|
|
}
|